mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:11:03 +00:00
147c5fa2eb
- Bug 1150437 - Make gmp-clearkey consistently Apache2 licensed. r=edwin,jwwang,kentuckyfriedtakahe (3c954c73dd) - Bug 1223486 - Ensure WrapTexCoord returns 0.0 instead of 1.0 when given a negative whole number. r=Bas (b4af8eb524) - Bug 1160914 - Make gmp-clearkey's decoders threadsafe refcounted, to handle DecodingComplete while GMPVideoHost::CreateFrame() is waiting. r=edwin (03359c7730) - Bug 1206763 - Enable SkiaGL canvas on gonk r=mattwoodrow (1588079b23) - Decouple CairoImage from ImageContainer. (bug 1222910, r=roc) (a93a4dad82) - Decouple D3D11ShareHandleImage from ImageContainer. (bug 1222910, r=mattwoodrow) (9642ef1c53) - Bug 1194753 - Wait longer when decoding the first frame of D3D9 DXVA video before deciding it is invalid. r=cpearce (865fe1d2f3) - Decouple D3D9SurfaceImage from ImageContainer. (bug 1222910, r=mattwoodrow) (55bc5abffc) - Bug 1191534 - Implement BlitImageToFramebuffer for IOSurface. r=jgilbert (0da6aff77f) - Decouple EGLImageImage from ImageContainer. (bug 1222910, r=snorp) (cffb7aadcb) - Decouple SurfaceTextureImage from ImageContainer. (bug 1222910, r=snorp) (5b920014d0) - Decouple MacIOSurfaceImage from ImageContainer. (bug 1222910, r=mstange) (ffab69155c) - Decouple SharedRGBImage and PlanarYCbCrImage from ImageContainer. (bug 1222910, r=mattwoodrow) (a9f6e23788) - Remove Gonk usage of ImageContainer::CreateImage. (bug 1222910, r=sotaro) (3f460b901d) - Remove CreateImage() from ImageContainer, ImageFactory, and ImageClient. (bug 1222910, r=roc) (873d5d5e47) - Bug 1212795: P1. Ensure the check if HW acceleration is allowed is performed on the main thread. r=jwwang (7cac257e5a) - Bug 1137529: Prefer Apple's VDA hardware acceleration for Hi-Def videos. r=rillian (a3ffc48e5e) - Bug 1212795: P2. Ensure all frameworks required for video decoding on mac are loaded. r=jwwang (b903b94c60) - Bug 1212795: P3. Make AppleDecoderModule detects if the required modules are loaded. r=jwwang (fb132e36b0) - Bug 1221991 - [1.3] Make SupportsMimeType a const function. r=jya (2450030808) - Bug 1221991 - [2.3] Split DecoderLoop into functions, simplify decoding state and clean up style. r=snorp (7c0e665cf7) - Bug 1221991 - [3.1] Manage module state via accessor functions. r=snorp (491b00f74b) - Bug 1221991 - [4.2] Add AndroidDecoderModule logging. r=snorp (7213505016) - Bug 1153110: Don't prefer VDA for 720p and above. r=rillian (50d5fbfa7c) - remove PR_LOGGING (44f4efbaa2) - Bug 1169653 - Limit use of the speech recognition API in JS to certified apps or apps with the proper flags set. r=smaug (c93a8949b8) - Bug 1133633: Part2. Enable async decoding on mac. r=mattmoodrow (c9740168bd) - Bug 1154896: Report decoding errors back to MP4Reader. r=rillian (26291f72e1) - Bug 1154896: Part2. Ignore kVTDecodeInfo_FrameDropped flag. r=rillian (bfca4c264e) - Bug 1198094: P1. Limit rate at which InputExhausted could be called by mac decoder. r=rillian (e5819c1666) - Bug 1214678 - Allow Apple media decoders to work on iOS r=jya (c475eff0be) - Bug 1219140 - Remove AskMediaCodecAndWait() r=bwu (dbe8d364ec) - fix includes (432c3419b0) - adapted Bug 1159509 - Support audio AMR-NB for Gonk in MP4Reader. r=jya (adaddc5c21) - Bug 1154512 - Remove MediaTaskQueue::SyncDispatch() from PDM. r=cpearce (5bddd082bd) - Bug 1204622 - release codec listener at reader task queue. r=jya (72b062b5d7) - Bug 1097498 - Wait fence for the graphic buffer. r=sotaro (c72f301939) - Bug 1198664 - Refactor: move common behaviors to base class. r=bwu,jya (a754813c5b) - Bug 1198664 - Use looper to process decoder tasks. r=bwu (768315de13) - Bug 1174721 - Use AudioCompactor for GonkAudioDecoderManager. r=sotaro (768e68c946) - Bug 1199809 - Refactor: use RAII to help manage output buffer lifecycle. r=sotaro (9a6e0dceb7) - Bug 1133955 - Record the last seek time to decide the direction to seek. r=sotaro (d0bcdbe68b) - Bug 1210045 - Fix GonkVideoDecoderManager shutdown during initialization r=bwu (b379248ff1) - Bug 1214997 - Use MozPromise in MediaCodecProxy and OMXCodecProxy r=bwu (ab9a92d640) - Bug 1199809 - Make a copy of output buffer after flush(). r=sotaro (17465ecaea) - Bug 1216895 - assert that decoder methods are run on correct thread. r=jya (b8c106c2ca) - Bug 1185018 - Part 1 of 1 - Made speech recognition services language dependent and removed assumption of a single service. r=smaug (f83acf82b4) - Bug 1207416: Add Telemetry for time spent in different Load states in WebRTC r=gcp (e3959b6760) - Bug 1219480 - Replace PRLogModuleInfo with LazyLogModule in the media directory. r=rillian (a9b13ef334) - Bug 1196558: Don't assert should output task not be dispatched. r=edwin (a2569bca73) - Bug 1199193: Ensure DrainComplete() is called once all decoded frames have been output. r=rillian (760fb42753) - Bug 1079621 - Change non-fatal errors to warnings. r=rillian (20c85e7e56) - Bug 1185234 - Implement SpeechRecognition::interimResults. r=smaug (b3d635d8c0) - Bug 1171850 - Remove 'models' dir from MODELSPS_DEST as the dir 'models' now comes from MODELSPS_FILES. r=gps (5515511e3a) - Bug 1183503 - Rename model and dictionary files for recognition in preparation for localization. r=smaug (32c78610af) - Bug 1185235 - Implement SpeechRecognition::maxAlternatives. r=smaug (91eac7f30f) - Bug 1177514 - Remove final text of 'ERROR' on recognition error, should be signaled by SpeechRecognitionError. r=smaug (c8d7b198e0) - Bug 1187791 - Part 1 of 1 - SpeechRecognition::maxAlternatives can't throw; so, rm webidl throws specifier. r=smaug (e295b2bde5) - Bug 1213131: [vpx] Configure libvpx decoder to use multi-threads decoding. r=kentuckyfriedtakahe (f38ba0ef82) - Bug 1206845: Prevent overflows in MediaCache. r=roc (e8a228dcd3) - Bug 1205825 - part 1 - don't reacquire the media cache's monitor in MediaCacheStream::FlushPartialBlockInternal; r=roc (6342592be3) - Bug 1205825 - part 2 - call Get*CachedData*Internal variants from MediaCacheStream::GetCachedRanges; r=roc (f229c8f757)
285 lines
11 KiB
C++
285 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/. */
|
|
|
|
#include "MediaStreamGraphImpl.h"
|
|
#include "mozilla/MathAlgorithms.h"
|
|
#include "mozilla/unused.h"
|
|
|
|
#include "AudioSegment.h"
|
|
#include "VideoSegment.h"
|
|
#include "nsContentUtils.h"
|
|
#include "nsIAppShell.h"
|
|
#include "nsIObserver.h"
|
|
#include "nsPrintfCString.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "nsWidgetsCID.h"
|
|
#include "prerror.h"
|
|
#include "mozilla/Logging.h"
|
|
#include "mozilla/Attributes.h"
|
|
#include "TrackUnionStream.h"
|
|
#include "ImageContainer.h"
|
|
#include "AudioChannelService.h"
|
|
#include "AudioNodeEngine.h"
|
|
#include "AudioNodeStream.h"
|
|
#include "AudioNodeExternalInputStream.h"
|
|
#include "webaudio/MediaStreamAudioDestinationNode.h"
|
|
#include <algorithm>
|
|
#include "DOMMediaStream.h"
|
|
#include "GeckoProfiler.h"
|
|
#ifdef MOZ_WEBRTC
|
|
#include "AudioOutputObserver.h"
|
|
#endif
|
|
|
|
using namespace mozilla::layers;
|
|
using namespace mozilla::dom;
|
|
using namespace mozilla::gfx;
|
|
|
|
namespace mozilla {
|
|
|
|
#ifdef STREAM_LOG
|
|
#undef STREAM_LOG
|
|
#endif
|
|
|
|
LazyLogModule gTrackUnionStreamLog("TrackUnionStream");
|
|
#define STREAM_LOG(type, msg) MOZ_LOG(gTrackUnionStreamLog, type, msg)
|
|
|
|
TrackUnionStream::TrackUnionStream(DOMMediaStream* aWrapper) :
|
|
ProcessedMediaStream(aWrapper), mNextAvailableTrackID(1)
|
|
{
|
|
}
|
|
|
|
void TrackUnionStream::RemoveInput(MediaInputPort* aPort)
|
|
{
|
|
STREAM_LOG(LogLevel::Debug, ("TrackUnionStream %p removing input %p", this, aPort));
|
|
for (int32_t i = mTrackMap.Length() - 1; i >= 0; --i) {
|
|
if (mTrackMap[i].mInputPort == aPort) {
|
|
STREAM_LOG(LogLevel::Debug, ("TrackUnionStream %p removing trackmap entry %d", this, i));
|
|
EndTrack(i);
|
|
mTrackMap.RemoveElementAt(i);
|
|
}
|
|
}
|
|
ProcessedMediaStream::RemoveInput(aPort);
|
|
}
|
|
void TrackUnionStream::ProcessInput(GraphTime aFrom, GraphTime aTo, uint32_t aFlags)
|
|
{
|
|
if (IsFinishedOnGraphThread()) {
|
|
return;
|
|
}
|
|
nsAutoTArray<bool,8> mappedTracksFinished;
|
|
nsAutoTArray<bool,8> mappedTracksWithMatchingInputTracks;
|
|
for (uint32_t i = 0; i < mTrackMap.Length(); ++i) {
|
|
mappedTracksFinished.AppendElement(true);
|
|
mappedTracksWithMatchingInputTracks.AppendElement(false);
|
|
}
|
|
bool allFinished = !mInputs.IsEmpty();
|
|
bool allHaveCurrentData = !mInputs.IsEmpty();
|
|
for (uint32_t i = 0; i < mInputs.Length(); ++i) {
|
|
MediaStream* stream = mInputs[i]->GetSource();
|
|
if (!stream->IsFinishedOnGraphThread()) {
|
|
// XXX we really should check whether 'stream' has finished within time aTo,
|
|
// not just that it's finishing when all its queued data eventually runs
|
|
// out.
|
|
allFinished = false;
|
|
}
|
|
if (!stream->HasCurrentData()) {
|
|
allHaveCurrentData = false;
|
|
}
|
|
bool trackAdded = false;
|
|
for (StreamBuffer::TrackIter tracks(stream->GetStreamBuffer());
|
|
!tracks.IsEnded(); tracks.Next()) {
|
|
bool found = false;
|
|
for (uint32_t j = 0; j < mTrackMap.Length(); ++j) {
|
|
TrackMapEntry* map = &mTrackMap[j];
|
|
if (map->mInputPort == mInputs[i] && map->mInputTrackID == tracks->GetID()) {
|
|
bool trackFinished;
|
|
StreamBuffer::Track* outputTrack = mBuffer.FindTrack(map->mOutputTrackID);
|
|
found = true;
|
|
if (!outputTrack || outputTrack->IsEnded() ||
|
|
!mInputs[i]->PassTrackThrough(tracks->GetID())) {
|
|
trackFinished = true;
|
|
} else {
|
|
CopyTrackData(tracks.get(), j, aFrom, aTo, &trackFinished);
|
|
}
|
|
mappedTracksFinished[j] = trackFinished;
|
|
mappedTracksWithMatchingInputTracks[j] = true;
|
|
break;
|
|
}
|
|
}
|
|
if (!found && mInputs[i]->PassTrackThrough(tracks->GetID())) {
|
|
bool trackFinished = false;
|
|
trackAdded = true;
|
|
uint32_t mapIndex = AddTrack(mInputs[i], tracks.get(), aFrom);
|
|
CopyTrackData(tracks.get(), mapIndex, aFrom, aTo, &trackFinished);
|
|
mappedTracksFinished.AppendElement(trackFinished);
|
|
mappedTracksWithMatchingInputTracks.AppendElement(true);
|
|
}
|
|
}
|
|
if (trackAdded) {
|
|
for (MediaStreamListener* l : mListeners) {
|
|
l->NotifyFinishedTrackCreation(Graph());
|
|
}
|
|
}
|
|
}
|
|
for (int32_t i = mTrackMap.Length() - 1; i >= 0; --i) {
|
|
if (mappedTracksFinished[i]) {
|
|
EndTrack(i);
|
|
} else {
|
|
allFinished = false;
|
|
}
|
|
if (!mappedTracksWithMatchingInputTracks[i]) {
|
|
mTrackMap.RemoveElementAt(i);
|
|
}
|
|
}
|
|
if (allFinished && mAutofinish && (aFlags & ALLOW_FINISH)) {
|
|
// All streams have finished and won't add any more tracks, and
|
|
// all our tracks have actually finished and been removed from our map,
|
|
// so we're finished now.
|
|
FinishOnGraphThread();
|
|
} else {
|
|
mBuffer.AdvanceKnownTracksTime(GraphTimeToStreamTimeWithBlocking(aTo));
|
|
}
|
|
if (allHaveCurrentData) {
|
|
// We can make progress if we're not blocked
|
|
mHasCurrentData = true;
|
|
}
|
|
}
|
|
|
|
uint32_t TrackUnionStream::AddTrack(MediaInputPort* aPort, StreamBuffer::Track* aTrack,
|
|
GraphTime aFrom)
|
|
{
|
|
TrackID id = aTrack->GetID();
|
|
if (id > mNextAvailableTrackID &&
|
|
mUsedTracks.BinaryIndexOf(id) == mUsedTracks.NoIndex) {
|
|
// Input id available. Mark it used in mUsedTracks.
|
|
mUsedTracks.InsertElementSorted(id);
|
|
} else {
|
|
// Input id taken, allocate a new one.
|
|
id = mNextAvailableTrackID;
|
|
|
|
// Update mNextAvailableTrackID and prune any mUsedTracks members it now
|
|
// covers.
|
|
while (1) {
|
|
if (!mUsedTracks.RemoveElementSorted(++mNextAvailableTrackID)) {
|
|
// Not in use. We're done.
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Round up the track start time so the track, if anything, starts a
|
|
// little later than the true time. This means we'll have enough
|
|
// samples in our input stream to go just beyond the destination time.
|
|
StreamTime outputStart = GraphTimeToStreamTimeWithBlocking(aFrom);
|
|
|
|
nsAutoPtr<MediaSegment> segment;
|
|
segment = aTrack->GetSegment()->CreateEmptyClone();
|
|
for (uint32_t j = 0; j < mListeners.Length(); ++j) {
|
|
MediaStreamListener* l = mListeners[j];
|
|
l->NotifyQueuedTrackChanges(Graph(), id, outputStart,
|
|
MediaStreamListener::TRACK_EVENT_CREATED,
|
|
*segment,
|
|
aPort->GetSource(), aTrack->GetID());
|
|
}
|
|
segment->AppendNullData(outputStart);
|
|
StreamBuffer::Track* track =
|
|
&mBuffer.AddTrack(id, outputStart, segment.forget());
|
|
STREAM_LOG(LogLevel::Debug, ("TrackUnionStream %p adding track %d for input stream %p track %d, start ticks %lld",
|
|
this, id, aPort->GetSource(), aTrack->GetID(),
|
|
(long long)outputStart));
|
|
|
|
TrackMapEntry* map = mTrackMap.AppendElement();
|
|
map->mEndOfConsumedInputTicks = 0;
|
|
map->mEndOfLastInputIntervalInInputStream = -1;
|
|
map->mEndOfLastInputIntervalInOutputStream = -1;
|
|
map->mInputPort = aPort;
|
|
map->mInputTrackID = aTrack->GetID();
|
|
map->mOutputTrackID = track->GetID();
|
|
map->mSegment = aTrack->GetSegment()->CreateEmptyClone();
|
|
return mTrackMap.Length() - 1;
|
|
}
|
|
|
|
void TrackUnionStream::EndTrack(uint32_t aIndex)
|
|
{
|
|
StreamBuffer::Track* outputTrack = mBuffer.FindTrack(mTrackMap[aIndex].mOutputTrackID);
|
|
if (!outputTrack || outputTrack->IsEnded())
|
|
return;
|
|
STREAM_LOG(LogLevel::Debug, ("TrackUnionStream %p ending track %d", this, outputTrack->GetID()));
|
|
for (uint32_t j = 0; j < mListeners.Length(); ++j) {
|
|
MediaStreamListener* l = mListeners[j];
|
|
StreamTime offset = outputTrack->GetSegment()->GetDuration();
|
|
nsAutoPtr<MediaSegment> segment;
|
|
segment = outputTrack->GetSegment()->CreateEmptyClone();
|
|
l->NotifyQueuedTrackChanges(Graph(), outputTrack->GetID(), offset,
|
|
MediaStreamListener::TRACK_EVENT_ENDED,
|
|
*segment,
|
|
mTrackMap[aIndex].mInputPort->GetSource(),
|
|
mTrackMap[aIndex].mInputTrackID);
|
|
}
|
|
outputTrack->SetEnded();
|
|
}
|
|
|
|
void TrackUnionStream::CopyTrackData(StreamBuffer::Track* aInputTrack,
|
|
uint32_t aMapIndex, GraphTime aFrom, GraphTime aTo,
|
|
bool* aOutputTrackFinished)
|
|
{
|
|
TrackMapEntry* map = &mTrackMap[aMapIndex];
|
|
StreamBuffer::Track* outputTrack = mBuffer.FindTrack(map->mOutputTrackID);
|
|
MOZ_ASSERT(outputTrack && !outputTrack->IsEnded(), "Can't copy to ended track");
|
|
|
|
MediaSegment* segment = map->mSegment;
|
|
MediaStream* source = map->mInputPort->GetSource();
|
|
|
|
GraphTime next;
|
|
*aOutputTrackFinished = false;
|
|
for (GraphTime t = aFrom; t < aTo; t = next) {
|
|
MediaInputPort::InputInterval interval = map->mInputPort->GetNextInputInterval(t);
|
|
interval.mEnd = std::min(interval.mEnd, aTo);
|
|
StreamTime inputEnd = source->GraphTimeToStreamTimeWithBlocking(interval.mEnd);
|
|
StreamTime inputTrackEndPoint = STREAM_TIME_MAX;
|
|
|
|
if (aInputTrack->IsEnded() &&
|
|
aInputTrack->GetEnd() <= inputEnd) {
|
|
inputTrackEndPoint = aInputTrack->GetEnd();
|
|
*aOutputTrackFinished = true;
|
|
}
|
|
|
|
if (interval.mStart >= interval.mEnd) {
|
|
break;
|
|
}
|
|
StreamTime ticks = interval.mEnd - interval.mStart;
|
|
next = interval.mEnd;
|
|
|
|
StreamTime outputStart = outputTrack->GetEnd();
|
|
|
|
if (interval.mInputIsBlocked) {
|
|
// Maybe the input track ended?
|
|
segment->AppendNullData(ticks);
|
|
STREAM_LOG(LogLevel::Verbose, ("TrackUnionStream %p appending %lld ticks of null data to track %d",
|
|
this, (long long)ticks, outputTrack->GetID()));
|
|
} else if (InMutedCycle()) {
|
|
segment->AppendNullData(ticks);
|
|
} else {
|
|
if (source->IsSuspended()) {
|
|
segment->AppendNullData(aTo - aFrom);
|
|
} else {
|
|
MOZ_ASSERT(outputTrack->GetEnd() == GraphTimeToStreamTimeWithBlocking(interval.mStart),
|
|
"Samples missing");
|
|
StreamTime inputStart = source->GraphTimeToStreamTimeWithBlocking(interval.mStart);
|
|
segment->AppendSlice(*aInputTrack->GetSegment(),
|
|
std::min(inputTrackEndPoint, inputStart),
|
|
std::min(inputTrackEndPoint, inputEnd));
|
|
}
|
|
}
|
|
ApplyTrackDisabling(outputTrack->GetID(), segment);
|
|
for (uint32_t j = 0; j < mListeners.Length(); ++j) {
|
|
MediaStreamListener* l = mListeners[j];
|
|
l->NotifyQueuedTrackChanges(Graph(), outputTrack->GetID(),
|
|
outputStart, 0, *segment);
|
|
}
|
|
outputTrack->GetSegment()->AppendFrom(segment);
|
|
}
|
|
}
|
|
} // namespace mozilla
|