mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 14:55:47 +00:00
58786e1ea7
This patch makes the following changes to the macros.
- Removes PROFILER_LABEL_FUNC. It's only suitable for use in functions outside
classes, due to PROFILER_FUNCTION_NAME not getting class names, and it was
mostly misused.
- Removes PROFILER_FUNCTION_NAME. It's no longer used, and __func__ is
universally available now anyway.
- Combines the first two string literal arguments of PROFILER_LABEL and
PROFILER_LABEL_DYNAMIC into a single argument. There was no good reason for
them to be separate, and it forced a '::' in the label, which isn't always
appropriate. Also, the meaning of the "name_space" argument was interpreted
in an interesting variety of ways.
- Adds an "AUTO_" prefix to PROFILER_LABEL and PROFILER_LABEL_DYNAMIC, to make
it clearer they construct RAII objects rather than just being function calls.
(I myself have screwed up the scoping because of this in the past.)
- Fills in the 'js::ProfileEntry::Category::' qualifier within the macro, so
the caller doesn't need to. This makes a *lot* more of the uses fit onto a
single line.
The patch also makes the following changes to the macro uses (beyond those
required by the changes described above).
- Fixes a bunch of labels that had gotten out of sync with the name of the
class and/or function that encloses them.
- Removes a useless PROFILER_LABEL use within a trivial scope in
EventStateManager::DispatchMouseOrPointerEvent(). It clearly wasn't serving
any useful purpose. It also serves as extra evidence that the AUTO_ prefix is
a good idea.
- Tweaks DecodePool::SyncRunIf{Preferred,Possible} so that the labelling is
done within them, instead of at their callsites, because that's a more
standard way of doing things.
--HG--
extra : rebase_source : 318d1bc6fc1425a94aacbf489dd46e4f83211de4
84 lines
2.8 KiB
C++
84 lines
2.8 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "WebMWriter.h"
|
|
#include "EbmlComposer.h"
|
|
#include "GeckoProfiler.h"
|
|
#include "OpusTrackEncoder.h"
|
|
|
|
namespace mozilla {
|
|
|
|
WebMWriter::WebMWriter(uint32_t aTrackTypes) : ContainerWriter()
|
|
{
|
|
mMetadataRequiredFlag = aTrackTypes;
|
|
mEbmlComposer = new EbmlComposer();
|
|
}
|
|
|
|
WebMWriter::~WebMWriter()
|
|
{
|
|
// Out-of-line dtor so mEbmlComposer nsAutoPtr can delete a complete type.
|
|
}
|
|
|
|
nsresult
|
|
WebMWriter::WriteEncodedTrack(const EncodedFrameContainer& aData,
|
|
uint32_t aFlags)
|
|
{
|
|
AUTO_PROFILER_LABEL("WebMWriter::WriteEncodedTrack", OTHER);
|
|
for (uint32_t i = 0 ; i < aData.GetEncodedFrames().Length(); i++) {
|
|
mEbmlComposer->WriteSimpleBlock(aData.GetEncodedFrames().ElementAt(i).get());
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
WebMWriter::GetContainerData(nsTArray<nsTArray<uint8_t> >* aOutputBufs,
|
|
uint32_t aFlags)
|
|
{
|
|
AUTO_PROFILER_LABEL("WebMWriter::GetContainerData", OTHER);
|
|
mEbmlComposer->ExtractBuffer(aOutputBufs, aFlags);
|
|
if (aFlags & ContainerWriter::FLUSH_NEEDED) {
|
|
mIsWritingComplete = true;
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
WebMWriter::SetMetadata(TrackMetadataBase* aMetadata)
|
|
{
|
|
MOZ_ASSERT(aMetadata);
|
|
AUTO_PROFILER_LABEL("WebMWriter::SetMetadata", OTHER);
|
|
|
|
if (aMetadata->GetKind() == TrackMetadataBase::METADATA_VP8) {
|
|
VP8Metadata* meta = static_cast<VP8Metadata*>(aMetadata);
|
|
MOZ_ASSERT(meta, "Cannot find vp8 encoder metadata");
|
|
mEbmlComposer->SetVideoConfig(meta->mWidth, meta->mHeight,
|
|
meta->mDisplayWidth, meta->mDisplayHeight);
|
|
mMetadataRequiredFlag = mMetadataRequiredFlag & ~ContainerWriter::CREATE_VIDEO_TRACK;
|
|
}
|
|
|
|
if (aMetadata->GetKind() == TrackMetadataBase::METADATA_VORBIS) {
|
|
VorbisMetadata* meta = static_cast<VorbisMetadata*>(aMetadata);
|
|
MOZ_ASSERT(meta, "Cannot find vorbis encoder metadata");
|
|
mEbmlComposer->SetAudioConfig(meta->mSamplingFrequency, meta->mChannels);
|
|
mEbmlComposer->SetAudioCodecPrivateData(meta->mData);
|
|
mMetadataRequiredFlag = mMetadataRequiredFlag & ~ContainerWriter::CREATE_AUDIO_TRACK;
|
|
}
|
|
|
|
if (aMetadata->GetKind() == TrackMetadataBase::METADATA_OPUS) {
|
|
OpusMetadata* meta = static_cast<OpusMetadata*>(aMetadata);
|
|
MOZ_ASSERT(meta, "Cannot find Opus encoder metadata");
|
|
mEbmlComposer->SetAudioConfig(meta->mSamplingFrequency, meta->mChannels);
|
|
mEbmlComposer->SetAudioCodecPrivateData(meta->mIdHeader);
|
|
mMetadataRequiredFlag = mMetadataRequiredFlag & ~ContainerWriter::CREATE_AUDIO_TRACK;
|
|
}
|
|
|
|
if (!mMetadataRequiredFlag) {
|
|
mEbmlComposer->GenerateHeader();
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace mozilla
|