mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
605fde2bb1
- Bug 1236120: [ffmpeg] Use demuxed dimensions to determine picture size and offset. r=gerald (f336c84d0d) - Bug 851530: Part 1 - Added support for decoding uLaw and aLaw enconded wave files. r=jya (72683b69f2) - Bug 851530: Part 2 - Added test cases for uLaw and aLaw wave files. r=jya (ddf431bd28) - Bug 524109 - Added support for 24 bit wav files. r=cpearce (ebfac16a20) - Bug 864780 - Changed handling of the format chunk to skip any extension. r=cpearce (40903839a8) - Bug 1229742: P1. Only clear EOS flag if we have new data. r=gerald (83e69375e4) - Bug 1229742: P2. Don't reject data promise if new data is pending. r=gerald (89d8222809) - Bug 1237809: P2. Detect change of display size. r=cpearce (ec529e2732) - Bug 1237809: [h264] P1. Ensure correct video dimensions are passed to the decoder. r=cpearce (eb241cad10) - Bug 1237809: P3. Ensure element dimensions are up to date. r=jwwang (541e6e74d7) - Bug 1244639: P1. Don't assume MP3 decoding always starts at 0. r=cpearce (b62c27bd04) - Bug 1244639: P2. Don't clamp audio time to seek time if there's no video track. r=cpearce (4720bacc24) - Bug 1205927 - Part 1: [MediaEncoder] Support *.3g2 with EVRC audio format. r=ayang (bbd8aff9d9) - Bug 1205927 - Part 2: Add audio-capture:3gpp2 perimission for certificated and privileged application. r=ayang (63b337e2ab) - Bug 1198157 - Call |NotifyEndOfStream| if the encoder can't been initialized after 30 seconds. r=jwwang (2c21203d36) - minor NL (14d757753b) - Bug 1182426 - Add some asserts to VP8TrackEncoder for sanity. r=roc (79ff4869ca) - Bug 1154213 - Handle timestamps of video/webm vorbis track encoding. r=mreavy, r=rjesup (a9897e4873) - Bug 1137151: Marked destructor of |MuxerOperation| as protected, r=sotaro (94fdcf6457) - Bug 1210232 - Let MP4Decoder handle 3GPP files on B2G. r=cpearce (95a77023ad) - Bug 1227790 - Update GMP API to include new MediaKeyStatus types. r=jwwang (1a6933f2df) - bits of Bug 1186375 - Add GMP EME (6b99660146) - Bug 1221825: Fix logging arguments. r=cpearce (5261e34713) - Bug 1244442 - Warn about Proxy.create and Proxy.createFunction. r=Waldo (718aa94f5b) - fix spaces (720e2114f7) - re-apply Bug 1231224 part 7 - Fix some more places to handle OOM. r=jonco (a4af46894b) - Bug 1246122 - Don't crash in InvokeInterruptCallback if there are no JS scripts on the stack. r=shu (9702df89bc) - Bug 1246607: Recover from OOM in AddClearDefiniteGetterSetterForPrototypeChain; r=jandem (d83c6c6c9b) - Bug 1236546 - Don't deoptimize in ObjectGroup::defaultNewGroup when we have a null proto. r=bhackett (1c2ecc3d09) - Bug 1249588 - Remove unnecessary type information from RegExpObject. r=jandem (9126e17d94) - Bug 1245965 - Fix an OOM in ObjectGroup::newPlainObject; r=till (5192c25b53) - Bug 1240527: Fix tracing of RegExpStaticsObject; r=nbp (b37f2167a5) - Bug 1248094 - Followup to fix a typo; r=fitzgen (8afec429d9) - Bug 1248726 - Simplify PCLocationMap even further; r=fitzgen (39f0b54a04) - Bug 1241311 - Pre-tenure SavedFrame objects. r=terrence (b703f3d78e) - Bug 1241249 - Add an SPS pseudo entry for JS stack capturing; r=shu (c2ae4ee5c2) - Bug 1247299 - Force SavedFrame columns to be 0 in JS_MORE_DETERMINISTIC builds; r=sfink (09b9038448) - Bug 1241701 - Add about:memory reporting for js::SavedStacks::pcLocationMap. r=njn (b663d911fc) - Bug 1166234 - Throw on accessing optimized out values when using Debugger.Frame.prototype.eval. (r=jimb) (19b43b137b) - Bug 1232655 - Fix DebugScopeProxy::has to not lookup .this on non-function scopes. r=shu (3959e98752) - Bug 1216261 - Fix OOM handling of DebugScopes. (r=jonco) (0f8b856ee6) - reorder after mispatch (c292050275) - Bug 1235656 - Followup: Allow extended functions with guessed atoms in self-hosted code. (rs=arai) (a67286cd52) - Bug 1245048: Check call to GetPrototype; r=till (35dbbdc025) - Bug 1132630 - Renumber steps in Function.prototype.bind. r=till (9f11a5a086) - Bug 1246131 - Provide 'dbg(msg)' debug printing utility function for self-hosted code. r=jandem (f436eeb481) - Bug 1246131 - Part 2: Let opt builds compile again, even on a CLOSED TREE. r=bustage (8483b77541) - Bug 1247934 - Handle receiving unboxed exports array from self hosted module code r=shu (fb9c296909) - Bug 1246134 - Fix loading of external self-hosted JS using MOZ_SELFHOSTEDJS. r=efaust (c96059b40a) - Bug 1220502 - ignore not visible text nodes for tree update, r=tbsaunde, roc (eed078abc6) - Bug 1242989 - keep content insertions in a hash, r=tbsaunde (d58fc948a6) - bug 1228400 - null check tabChild before notifying the parent process about new child documents r=davidb (09512e6287) - Bug 1239051 - Labels should expose labeled controllers action. r=tbsaunde (c0d4d801a9) - bug 1243077 - make xpcAccessible::GetFirstChild() work with proxies r=davidb (f539fafe93) - bug 1243077 - make xpcAccessible::GetLastChild() work with proxied accessibles r=davidb (13716f7cc0) - bug 1243077 - implement xpcAccessible::GetChildCount() for proxied accessibles (b8f4598834) - bug 1243077 - make xpcAccessible::GetChildAt() work with proxied accessibles r=davidb (cce0924f7b) - bug 1243077 - make xpcAccessible::GetChildren() work with proxied accessibles r=davidb (a9ec2b1588) - bug 1243077 - remove an unnecessary AddRef() from xpcAccessible::GetChildren() (89a58ac2e0) - bug 1243077 - support proxied accessibles in xpcAccessible::GetRole() r=davidb (2d2a2926c7) - Bug 1246768 - part 1: argument conversion for Atomics.isLockFree in runtime. r=bbouvier (17f3498b84) - Bug 1246750 - fix argument ordering to futexWakeOrRequeue + test cases. r=bbouvier (31825e7096) - Bug 1238911 - initialize canWait with false from constructor, avoid using the variable without initialization. r=lhansen (f4657b3950) - Bug 1235373 - Add an assert to check validity of pointers: mElement->GetPrimaryFrame() and frame. r=surkov (18023f9238) - Bug 1241534 - Use TraceRoot for InterpreterFrame fields. r=terrence (98996dc497) - Bug 1246112 - Fix a bogus assert in InterpreterFrame::initExecuteFrame. r=su (2093ba8a44) - Bug 1243241 - Make RDTSC monotonic. r=jandem (1450a97a94) - Bug 1243242 - Don't make structured cloning O(n**2) in the size of the transferables array. r=sfink (aa38dee282)
356 lines
11 KiB
C++
356 lines
11 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/. */
|
|
|
|
#ifndef TrackEncoder_h_
|
|
#define TrackEncoder_h_
|
|
|
|
#include "mozilla/ReentrantMonitor.h"
|
|
|
|
#include "AudioSegment.h"
|
|
#include "EncodedFrameContainer.h"
|
|
#include "StreamBuffer.h"
|
|
#include "TrackMetadataBase.h"
|
|
#include "VideoSegment.h"
|
|
#include "MediaStreamGraph.h"
|
|
|
|
namespace mozilla {
|
|
|
|
/**
|
|
* Base class of AudioTrackEncoder and VideoTrackEncoder. Lifetimes managed by
|
|
* MediaEncoder. Most methods can only be called on the MediaEncoder's thread,
|
|
* but some subclass methods can be called on other threads when noted.
|
|
*
|
|
* NotifyQueuedTrackChanges is called on subclasses of this class from the
|
|
* MediaStreamGraph thread, and AppendAudioSegment/AppendVideoSegment is then
|
|
* called to store media data in the TrackEncoder. Later on, GetEncodedTrack is
|
|
* called on MediaEncoder's thread to encode and retrieve the encoded data.
|
|
*/
|
|
class TrackEncoder
|
|
{
|
|
public:
|
|
TrackEncoder();
|
|
|
|
virtual ~TrackEncoder() {}
|
|
|
|
/**
|
|
* Notified by the same callbcak of MediaEncoder when it has received a track
|
|
* change from MediaStreamGraph. Called on the MediaStreamGraph thread.
|
|
*/
|
|
virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
|
|
StreamTime aTrackOffset,
|
|
uint32_t aTrackEvents,
|
|
const MediaSegment& aQueuedMedia) = 0;
|
|
|
|
/**
|
|
* Notified by the same callback of MediaEncoder when it has been removed from
|
|
* MediaStreamGraph. Called on the MediaStreamGraph thread.
|
|
*/
|
|
void NotifyEvent(MediaStreamGraph* aGraph,
|
|
MediaStreamListener::MediaStreamGraphEvent event)
|
|
{
|
|
if (event == MediaStreamListener::MediaStreamGraphEvent::EVENT_REMOVED) {
|
|
NotifyEndOfStream();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Creates and sets up meta data for a specific codec, called on the worker
|
|
* thread.
|
|
*/
|
|
virtual already_AddRefed<TrackMetadataBase> GetMetadata() = 0;
|
|
|
|
/**
|
|
* Encodes raw segments. Result data is returned in aData, and called on the
|
|
* worker thread.
|
|
*/
|
|
virtual nsresult GetEncodedTrack(EncodedFrameContainer& aData) = 0;
|
|
|
|
/**
|
|
* True if the track encoder has encoded all source segments coming from
|
|
* MediaStreamGraph. Call on the worker thread.
|
|
*/
|
|
bool IsEncodingComplete() { return mEncodingComplete; }
|
|
|
|
/**
|
|
* Notifies from MediaEncoder to cancel the encoding, and wakes up
|
|
* mReentrantMonitor if encoder is waiting on it.
|
|
*/
|
|
void NotifyCancel()
|
|
{
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
mCanceled = true;
|
|
mReentrantMonitor.NotifyAll();
|
|
}
|
|
|
|
virtual void SetBitrate(const uint32_t aBitrate) {}
|
|
|
|
protected:
|
|
/**
|
|
* Notifies track encoder that we have reached the end of source stream, and
|
|
* wakes up mReentrantMonitor if encoder is waiting for any source data.
|
|
*/
|
|
virtual void NotifyEndOfStream() = 0;
|
|
|
|
/**
|
|
* A ReentrantMonitor to protect the pushing and pulling of mRawSegment which
|
|
* is declared in its subclasses, and the following flags: mInitialized,
|
|
* EndOfStream and mCanceled. The control of protection is managed by its
|
|
* subclasses.
|
|
*/
|
|
ReentrantMonitor mReentrantMonitor;
|
|
|
|
/**
|
|
* True if the track encoder has encoded all source data.
|
|
*/
|
|
bool mEncodingComplete;
|
|
|
|
/**
|
|
* True if flag of EOS or any form of indicating EOS has set in the codec-
|
|
* encoder.
|
|
*/
|
|
bool mEosSetInEncoder;
|
|
|
|
/**
|
|
* True if the track encoder has initialized successfully, protected by
|
|
* mReentrantMonitor.
|
|
*/
|
|
bool mInitialized;
|
|
|
|
/**
|
|
* True if the TrackEncoder has received an event of TRACK_EVENT_ENDED from
|
|
* MediaStreamGraph, or the MediaEncoder is removed from its source stream,
|
|
* protected by mReentrantMonitor.
|
|
*/
|
|
bool mEndOfStream;
|
|
|
|
/**
|
|
* True if a cancellation of encoding is sent from MediaEncoder, protected by
|
|
* mReentrantMonitor.
|
|
*/
|
|
bool mCanceled;
|
|
|
|
// How many times we have tried to initialize the encoder.
|
|
uint32_t mInitCounter;
|
|
StreamTime mNotInitDuration;
|
|
};
|
|
|
|
class AudioTrackEncoder : public TrackEncoder
|
|
{
|
|
public:
|
|
AudioTrackEncoder()
|
|
: TrackEncoder()
|
|
, mChannels(0)
|
|
, mSamplingRate(0)
|
|
, mAudioBitrate(0)
|
|
{}
|
|
|
|
void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
|
|
StreamTime aTrackOffset,
|
|
uint32_t aTrackEvents,
|
|
const MediaSegment& aQueuedMedia) override;
|
|
|
|
template<typename T>
|
|
static
|
|
void InterleaveTrackData(nsTArray<const T*>& aInput,
|
|
int32_t aDuration,
|
|
uint32_t aOutputChannels,
|
|
AudioDataValue* aOutput,
|
|
float aVolume)
|
|
{
|
|
if (aInput.Length() < aOutputChannels) {
|
|
// Up-mix. This might make the mChannelData have more than aChannels.
|
|
AudioChannelsUpMix(&aInput, aOutputChannels, SilentChannel::ZeroChannel<T>());
|
|
}
|
|
|
|
if (aInput.Length() > aOutputChannels) {
|
|
DownmixAndInterleave(aInput, aDuration,
|
|
aVolume, aOutputChannels, aOutput);
|
|
} else {
|
|
InterleaveAndConvertBuffer(aInput.Elements(), aDuration, aVolume,
|
|
aOutputChannels, aOutput);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Interleaves the track data and stores the result into aOutput. Might need
|
|
* to up-mix or down-mix the channel data if the channels number of this chunk
|
|
* is different from aOutputChannels. The channel data from aChunk might be
|
|
* modified by up-mixing.
|
|
*/
|
|
static void InterleaveTrackData(AudioChunk& aChunk, int32_t aDuration,
|
|
uint32_t aOutputChannels,
|
|
AudioDataValue* aOutput);
|
|
|
|
/**
|
|
* De-interleaves the aInput data and stores the result into aOutput.
|
|
* No up-mix or down-mix operations inside.
|
|
*/
|
|
static void DeInterleaveTrackData(AudioDataValue* aInput, int32_t aDuration,
|
|
int32_t aChannels, AudioDataValue* aOutput);
|
|
/**
|
|
* Measure size of mRawSegment
|
|
*/
|
|
size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
|
|
|
|
void SetBitrate(const uint32_t aBitrate) override
|
|
{
|
|
mAudioBitrate = aBitrate;
|
|
}
|
|
protected:
|
|
/**
|
|
* Number of samples per channel in a pcm buffer. This is also the value of
|
|
* frame size required by audio encoder, and mReentrantMonitor will be
|
|
* notified when at least this much data has been added to mRawSegment.
|
|
*/
|
|
virtual int GetPacketDuration() { return 0; }
|
|
|
|
/**
|
|
* Initializes the audio encoder. The call of this method is delayed until we
|
|
* have received the first valid track from MediaStreamGraph, and the
|
|
* mReentrantMonitor will be notified if other methods is waiting for encoder
|
|
* to be completely initialized. This method is called on the MediaStreamGraph
|
|
* thread.
|
|
*/
|
|
virtual nsresult Init(int aChannels, int aSamplingRate) = 0;
|
|
|
|
/**
|
|
* Appends and consumes track data from aSegment, this method is called on
|
|
* the MediaStreamGraph thread. mReentrantMonitor will be notified when at
|
|
* least GetPacketDuration() data has been added to mRawSegment, wake up other
|
|
* method which is waiting for more data from mRawSegment.
|
|
*/
|
|
nsresult AppendAudioSegment(const AudioSegment& aSegment);
|
|
|
|
/**
|
|
* Notifies the audio encoder that we have reached the end of source stream,
|
|
* and wakes up mReentrantMonitor if encoder is waiting for more track data.
|
|
*/
|
|
void NotifyEndOfStream() override;
|
|
|
|
/**
|
|
* The number of channels are used for processing PCM data in the audio encoder.
|
|
* This value comes from the first valid audio chunk. If encoder can't support
|
|
* the channels in the chunk, downmix PCM stream can be performed.
|
|
* This value also be used to initialize the audio encoder.
|
|
*/
|
|
int mChannels;
|
|
|
|
/**
|
|
* The sampling rate of source audio data.
|
|
*/
|
|
int mSamplingRate;
|
|
|
|
/**
|
|
* A segment queue of audio track data, protected by mReentrantMonitor.
|
|
*/
|
|
AudioSegment mRawSegment;
|
|
|
|
uint32_t mAudioBitrate;
|
|
};
|
|
|
|
class VideoTrackEncoder : public TrackEncoder
|
|
{
|
|
public:
|
|
VideoTrackEncoder()
|
|
: TrackEncoder()
|
|
, mFrameWidth(0)
|
|
, mFrameHeight(0)
|
|
, mDisplayWidth(0)
|
|
, mDisplayHeight(0)
|
|
, mTrackRate(0)
|
|
, mTotalFrameDuration(0)
|
|
, mVideoBitrate(0)
|
|
{}
|
|
|
|
/**
|
|
* Notified by the same callback of MediaEncoder when it has received a track
|
|
* change from MediaStreamGraph. Called on the MediaStreamGraph thread.
|
|
*/
|
|
void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
|
|
StreamTime aTrackOffset,
|
|
uint32_t aTrackEvents,
|
|
const MediaSegment& aQueuedMedia) override;
|
|
/**
|
|
* Measure size of mRawSegment
|
|
*/
|
|
size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
|
|
|
|
void SetBitrate(const uint32_t aBitrate) override
|
|
{
|
|
mVideoBitrate = aBitrate;
|
|
}
|
|
protected:
|
|
/**
|
|
* Initialized the video encoder. In order to collect the value of width and
|
|
* height of source frames, this initialization is delayed until we have
|
|
* received the first valid video frame from MediaStreamGraph;
|
|
* mReentrantMonitor will be notified after it has successfully initialized,
|
|
* and this method is called on the MediaStramGraph thread.
|
|
*/
|
|
virtual nsresult Init(int aWidth, int aHeight, int aDisplayWidth,
|
|
int aDisplayHeight, TrackRate aTrackRate) = 0;
|
|
|
|
/**
|
|
* Appends source video frames to mRawSegment. We only append the source chunk
|
|
* if it is unique to mLastChunk. Called on the MediaStreamGraph thread.
|
|
*/
|
|
nsresult AppendVideoSegment(const VideoSegment& aSegment);
|
|
|
|
/**
|
|
* Tells the video track encoder that we've reached the end of source stream,
|
|
* and wakes up mReentrantMonitor if encoder is waiting for more track data.
|
|
* Called on the MediaStreamGraph thread.
|
|
*/
|
|
void NotifyEndOfStream() override;
|
|
|
|
/**
|
|
* The width of source video frame, ceiled if the source width is odd.
|
|
*/
|
|
int mFrameWidth;
|
|
|
|
/**
|
|
* The height of source video frame, ceiled if the source height is odd.
|
|
*/
|
|
int mFrameHeight;
|
|
|
|
/**
|
|
* The display width of source video frame.
|
|
*/
|
|
int mDisplayWidth;
|
|
|
|
/**
|
|
* The display height of source video frame.
|
|
*/
|
|
int mDisplayHeight;
|
|
|
|
/**
|
|
* The track rate of source video.
|
|
*/
|
|
TrackRate mTrackRate;
|
|
|
|
/**
|
|
* The total duration of frames in encoded video in StreamTime, kept track of
|
|
* in subclasses.
|
|
*/
|
|
StreamTime mTotalFrameDuration;
|
|
|
|
/**
|
|
* The last unique frame we've sent to track encoder, kept track of in
|
|
* subclasses.
|
|
*/
|
|
VideoFrame mLastFrame;
|
|
|
|
/**
|
|
* A segment queue of audio track data, protected by mReentrantMonitor.
|
|
*/
|
|
VideoSegment mRawSegment;
|
|
|
|
uint32_t mVideoBitrate;
|
|
};
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif
|