mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1263951 - Avoid trying to initialize new GMP instances once the browser enters shutdown. r=cpearce (3ca153c7f4) - Bug 1268714 - Check for failure result or a failed nsresult from SendLoadGMP. r=mccr8 (928546a72a) - remove redundant decl (0c7c81e384) - Bug 1161339 - Add gtest calling rust code. r=cajbir (9c0a4982d7) - Bug 1269249: [MSE] P1. Clamp range to media source duration when media source is ended. r=jwwang (dfc42686b5) - Bug 1269178: P4. Add mochitest. r=gerald (37fe5f9232) - Bug 1269249: [MSE] P2. Add mochitest verifying behavior. r=jwwang (f50fb0d648) - Bug 1245052 - various media b2g build errors r=jya (1fc0f3b8f1) - Bug 1239598 - Fix potential deadlock and race condition r=bechen (dfebc1b9c5) - Bug 1185931 - Add assert(mDecoderStateMachine). r=jwwang (16a79dd863) - bits of Bug 1160695 (a595535a04) - Bug 1205209 - Check whether mStreamSource is null in MediaOmxReader. r=bechen (3e380b282d) - Bug 1210286 - Fall back to converting SourceSurfaces (RGB) to NV12 in OMXCodecWrapper. r=jolin (b9e26a43ee) - Bug 1090015 - Suppress multichar warnings in the OMX code. r=kinetik (13cea78721) - missing bit of Bug 1137151: Remove ref-counting from |OMXVideoEncoder| (0abf3cccf3) - Bug 1239610 - Remove GonkNativeWindowClient usage from OmxDecoder r=jolin (a1ccc2a40e) - missing bit of 1198576 (c3284a3002) - Bug 1267637: P1. Consider invalid an AudioData with more than 8 audio channels. r=gerald (9bacf3fa8d) - Bug 1267637: P2. Ignore outright audio track considered invalid. r=gerald (d34b468c87) - Bug 1267637: [opus] P3. Reject audio data with unsupported audio configuration. r=gerald (90be7f8e3a) - Bug 1267637: [vorbis] P4. Reject audio data with unsupported audio configuration. r=gerald (2321df4669) - Bug 1267637: [AT] P6. Reject audio data with unsupported channel configuration. r=gerald (48756a764b) - Bug 1267637: [ffmpeg] P7. Reject audio data with unsupported channel configuration. r=gerald (bbf90018b5) - Bug 1267637: [gonk] P8. Reject audio data with unsupported channel configuration. r=gerald (44043594f0) - Bug 1199809 - Remove all references to unused task queue. r=jya (829bb54ce7) - Bug 1199809 - Don't schedule decoder I/O task when there will be more input. r=bwu (284c8b28d4) - Bug 1215441 - Skip flush before Init() is completed. r=sotaro (f59f4ae450) - Bug 1207214 - Assert decoder attaches EOS flag to final output buffer. r=sotaro (da0fc1f41b) - Bug 1217220 - use output timestamp to decide which item needs to be removed from waiting list. r=jya (b056c21000) - Bug 1222919 - Make ProcessFlush() virtual. r=jya (bea87e8e8a) - Bug 1259366 - Flush after eos of android::MediaCodec r=jolin (c8e1e038ad) - Bug 1199809 - Reset last decoded frame time on looper thread to avoid race condition. r=jya (1d56c95439) - cleanup (83701e29ea) - Bug 1267637: [wmf] P9. Reject audio data with unsupported channel configuration. r=gerald (c1f32cf152) - Bug 1264925: Force D3D9 when attempting to decode VP8 or VP9. r=mattwoodrow (2a7d853fe6) - Bug 1162899 - Use sync message for in-process mozHasPendingMessage. r=fabrice (d28430d0b2) - Bug 1235484 - Part 1: Refine radio state check in MmsService. r=bevistseng (5f00e3ec79) - remove android, fix some missing tests (01b371eb39) - Bug 1259148 - Notify content when the notification permission pop-up is dismissed by the user. r=past,wchen (ca2dfbf92f) - Bug 1267357 Cycle collect NotificationPermissionRequest::mCallback. r=mccr8 (6d0086af08) - Bug 1265828 - Remove persistent notifications from storage. r=wchen (230d6f8458) - Bug 1254816 - Use IgnoredErrorResult instead of ErrorResult for rv in nsDOMOfflineResourceList::Length(). r=bz (581f5c69db) - Bug 1140478: Free the string returned by PrintJSStack(), in android shutdown logging function. r=jorendorff (ebf6ef80d1) - Bug 1191137 - fix Mulet and responsive design mode to send key events properly r=ochameau,jryans (d47db5bf2b) - Bug 1267096 - Return early if we have no global when creating a Promise. r=smaug (d4075f38fe) - Bug 1146418 - Promise API entry points should use NS_ASSERT_OWNINGTHREAD, r=baku (a43b49c451) - Bug 1262069: Wrap promise resolution values before storing. r=bz (66ebb63ce1) - Bug 1246073 - Fix unique constraint errors in the H2 backend when resubscribing. r=dragana (43c67dc6bc) - Bug 1266433 - Clean up nsIPushNotifier static casts. r=dragana (eef5497c75) - Bug 1266433 - Update the comments in the Push XPIDL interfaces. r=me (35cd32c385) - Bug 1266433 - Indicate push subscriptions created by privileged code. r=dragana (824381dd69) - Bug 1242436 - default value of ok = true in order to check the return of SendPush and SendPushSubscriptionChange. r=kitcambridge (da55effde0) - Bug 1267889 - Always steal the error result in PushMessage::Json. r=dragana (a66bf171b6) - Bug 1243778 - PushRecord::getLastVisit cannot rely on the Places url index anymore. r=kitcambridge (07c3bdc4db) - Bug 1260499 - Handle incoming messages before push service is initialized. r=nalexander,jchen (d60ccda56b) - Bug 1265915 - Remove adaptive pings from the Push WebSocket backend. r=dragana (c8de7d5dd3) - Bug 1262559: Fix misspelled comment in dom/push/PushServiceWebSocket.jsm; r=jdm (a9d869773d) - Bug 1265914 - Remove Push UDP wake-up. r=dragana (128cf912bb) - Bug 1261634 - Update whitespace skipping for meta csp. r=dveditz (c6abb5c502) - Bug 1227813 - CSP: Ignore unsafe-inline within style-src if hash or nonce specified. r=kmckinley (ab1db6e779) - Bug 1192840 - Fix CSP report content-type. r=ckerschb (81c55b28f0) - Bug 1262635 - Don't strip URIs of ftp: when sending reports. r=dveditz (77e9aacac1) - Bug 1216365 - nsMixedContentBlocker should use innerMostURI for aContentLocation. r=tanvi (9134c28268) - Bug 1260153 - remove unreachable code in nsMixedContentBlocker. if/else blocks above all return. r=ckerschb (da297bf7ff) - Bug 1202374 - "Can't open apps any more". r=lissyx+mozillians (ed090dbfce) - Bug 1216498 - Bump SettinsDB version in order to enable pin the web. r=mhenretty (e2d0e9986f) - Bug 1226906 - Bump Settings BD version. r=gwagner (e063a2d482) - Bug 1119727 - Make Settings Soft Lockup threshold configurable. r=gwagner (1f5d9d3a50) - var-let (48c1155a0e) - bit of Backed out 2 changesets (bug 1202902) (828b6981a8) - Bug 1228673 - Clean-up 'Then' before ~MediaTimer. r=jya (e51663a94b) - align tests (0fbfa6f14b) - Bug 1152236: OMX codec should use AnnexB as input format. r=jya (fc7ed581ac) - Bug 1153895 - Support audio AMR-WB for Gonk in MP4Reader. r=jya (d9a530979e) - Bug 1174623 - Support mp3 in Gonk PDM. r=sotaro (1f6efd4397) - Bug 1174166 - Support H.263 in Gonk PDM. r=sotaro (5634e66ce3) - Bug 1251155 - Remove GLContext from VideoDataDecoder r=snorp (814629fcd9) - Bug 1262456 - [2.1] Replace queue adapter with deque. r=snorp (80587b789d) - Bug 1262456 - [1.1] Prevent interruption of the decoder shutdown procedure and early shutdown return. r=snorp (98b97f0b48) - Bug 1248792 - [1.2] Replace MediaRawData raw pointers with RefPtr. r=snorp (c1c62c4dc6) - Bug 1226730 - [1.1] Provide sample rate instead of bit depth in audio format creation. r=snorp (86e50d757f) - Bug 1244292 - [1.2] Release decoder on init failure. r=snorp (48b18cf8dd) - Bug 1267637: [android] P5. Reject audio data with unsupported audio configuration. r=gerald (cf74f43c71) - Bug 1230784 - Don't copy SurfaceTexture contents when presenting video on Android r=esawin,jya (fbd0ffd1ea) - Bug 1230768. r=jesup (1619923f64) - Bug 1205164 - Make sure ShmemPool high water mark is logged in all allocators. r=jesup (1fa4710751) - Bug 1205164 - Fix ShmemPool detection of failed allocations. r=jesup (070327ef38) - Bug 1247933 - do not perform null check on aClient since we know for sure it's a valid pointert. r=sotaro (1ac12b4091) - Bug 1200903 - Fix MediaSystemResourceService::RemoveRequests() r=cpearce (13676b47c7) - Bug 1250083 - make sure value attributed to usPerDataChunk is floating point value. r=cpearce (af9c3bd65d) - Bug 1250497: Initalised Values used in WaveDemuxer.cpp. r=cpearce (36a24774ed) - Bug 1250293 - Fixed Coverity warning in WaveDemuxer.cpp. r=cpearce (f5a690fac4) - bug 1220042 make AlignedTArray base class inheritance private r=jwwang (3dd9efaa68) - Bug 877662 - Add AlignmentUtils.h r=padenot (82b7563dd7) - bug 930257 schedule Analyser inactive check when sending last null chunk r=padenot (61e9b5cf0f) - bug 1197028 add MOZ_IMPLICIT for AudioBlock constructor from base AudioChunk on CLOSED TREE (0e2a86c6b5) - bug 1203380 add custom AudioBlock copy constructor and make AudioChunk conversion constructor explicit r=padenot (56f2e37d5b) - bug 1205540 initialize mBufferFormat when constructing silent block r=padenot (078feb4af4) - bug 1203380 ClearDownstreamMark() before returning AsMutableChunk() r=padenot (56ea1f589f) - bug 1203380 tighten not-sharing assertion in ChannelFloatsForWrite() r=padenot (368e354a06) - bug 1203380 add custom assignment operator to AudioBlock r=padenot (31f9f914d1) - Bug 877662 - Align audio buffer allocations to 16 byte boundaries r=padenot (5f33e9dd0e) - Bug 1173016 - Bustage fix: mark BasicWaveformCache's ctor as `explicit`, on a CLOSED TREE. (bb28bb93fc) - Bug 1265397 - Add a length attribute to OfflineAudioContext. r=smaug (3c2cf2aee6) - bug 1255618 remove AudioContext from global window at unlink r=Ehsan (5332c8b42b) - bug 1222202 implement query interface to nsIMemoryReporter r=bz (e6662d2ba8) - Bug 1259831 - Remove the auto-suspend logic for AudioContext. r=karlt (3376fb3209) - Bug 1232326 - Uninitialised value use in AudioBufferInPlaceScale. r=dminor. (548cbbfa52) - Bug 1240054 - Only rebuild BandLimitedTables if more partials are required r=padenot (39bf05e142) - Bug 1216081 - OscillatorNodeEngine::mFinalFrequency is used uninitialised. r=padenot. (5989729ec6) - Bug 1265405 - Use a dictionary to specify how PeriodicWave should be normalized (or not); r=padenot (f43e3f17ba) - Bug 1267096 - Check the return value of Promise::Create in AudioContext::StartRendering. r=smaug (5efca6cfe8) - Bug 1267579 - Unexpected result when using OscillatorNode with custom wave shape; r=padenot (ed62d1b496) - Bug 1209904 - Optimize OscillatorNode when its frequency is not changin and it's using ::ComputeCustom. r=karlt (9a2246cc3f) - Bug 877662 - Use SSE2 versions of AudioNodeEngine functions r=padenot (1efa0b2cf3) - Bug 877662 - Add an SSE2 implementation of AudioNodeEngine.cpp functions. r=ehsan (ce5ff146e5) - Bug 877662 - Update SSE2 versions of AudioNodeEngine functions r=padenot (ded51f436e) - Bug 1266405 - AudioBufferSourceNode::CopyFromBuffer should not borrow unaligned buffers; r=padenot (a2880e5c97) - bug 1227411 add some initial logging of AudioNode API use r=padenot (6d0febaf34) - bug 1199561 delay offline buffer allocation until non-null input is received r=padenot (38d56f3e89) - Bug 1110344 - Replace float by double in AudioTimelineEvent ctor to prevent a rounding issue. r=padenot (c358371cfa) - Bug 1231124 - addded mCurve to constructor. r=smaug (572fed89d6) - Bug 1232646 - initialize 3 variables: mCurve, mTimeConstant, mDuration. r=cpearce (e36b3dbb71) - Bug 1069825 - Check if we compare two automation curves occuring at the same time during overlap checking. r=padenot (35624be622) - bug 1227411 add WEB_AUDIO_API_LOG r=padenot (89de67e91b) - bug 1189168 avoid main thread assertion accessing mNode in SizeOfIncludingThis() r=padenot (370df2ff5b) - Bug 1266047 - Fix crash in mozilla::AudioBufferAddWithScale_SSE r=padenot (388de2edf6) - Bug 1266772 - Unbreak FreeBSD build after bug 881587. r=dminor (e194878792) - Bug 1266112 - Remove unnecessary alignment checks from AudioNodeEngine.cpp; r=padenot (284ac98016) - Bug 881587 - Add SSE2 version of AudioNodeEngine.cpp routines added in bug 815643. r=tterribe (5532515d07) - Bug 881587 - Use SSE2 version of AudioNodeEngine.cpp routines added in bug 815643. r=padenot (82100493a4) - Bug 1105513 - Add a NEON version for AudioBlockPanStereoToStereo when aIsOnTheLeft is an array r=padenot (b102beb60d) - Bug 1203836 - Properly handle silent chunks in AudioNodeExternalInputStream. r=karlt (0597e5c122) - Bug 1265131, part 1 - update moz.build for Skia m51. r=jrmuizel (745537cf9b) - Bug 1265131, part 2 - update SkiaGLGlue for Skia m51. r=jrmuizel (71a3ffc91e) - Bug 1265131, part 3 - update Moz2d for Skia m51. r=jrmuizel (2129a455cb) - Bug 1262745 - Fix tests for Canvas CSS/SVG Filters. r=mstange (93d3652ac0) - Bug 1265131, part 4 - fix tests for Skia m51 update. r=jrmuizel (964ea5c037) - Bug 1265131, part 5 - update Skia to m51 branch. r=jrmuizel (42da76e40e) - Bug 1268816 - allow Skia to use C++11 features on platforms that have them. r=froydnj (ff7d9e46b6) - Bug 1268816 - follow-up to fix #ifdef -> #if. r=me (b81d86c173) - Bug 1267180. Don't draw emojis as paths when they are too big. r=lsalzman (61c3bd732c) - Bug 1269247 - check that SkPaint has a typeface before using it. r=mchang (cf873c19b0) - bug 1249738 - make sScreenConfigurationObservers a function static r=dhylands (ab698385c4) - bug 1249738 - make sBatteryObservers a function static r=dhylands (eb205b1b64) - bits of Bug 1265131, part 5 (1340103927) - Bug 1248224 - backport of Skia GrPathUtils::QuadUVMatrix assertion fix. r=jrmuizel (bcf81bf241) - bug 1249738 - make sNetworkObservers a function static r=dhylands (a5d03d4425)
This commit is contained in:
@@ -4,12 +4,8 @@
|
||||
|
||||
#include "AndroidDecoderModule.h"
|
||||
#include "AndroidBridge.h"
|
||||
#include "GLBlitHelper.h"
|
||||
#include "GLContext.h"
|
||||
#include "GLContextEGL.h"
|
||||
#include "GLContextProvider.h"
|
||||
#include "AndroidSurfaceTexture.h"
|
||||
#include "GLImages.h"
|
||||
#include "GLLibraryEGL.h"
|
||||
|
||||
#include "MediaData.h"
|
||||
#include "MediaInfo.h"
|
||||
@@ -121,7 +117,6 @@ public:
|
||||
|
||||
void Cleanup() override
|
||||
{
|
||||
mGLContext = nullptr;
|
||||
}
|
||||
|
||||
nsresult Input(MediaRawData* aSample) override
|
||||
@@ -129,79 +124,13 @@ public:
|
||||
return MediaCodecDataDecoder::Input(aSample);
|
||||
}
|
||||
|
||||
bool WantCopy() const
|
||||
{
|
||||
// Allocating a texture is incredibly slow on PowerVR and may fail on
|
||||
// emulators, see bug 1190379.
|
||||
return mGLContext->Vendor() != GLVendor::Imagination &&
|
||||
mGLContext->Renderer() != GLRenderer::AndroidEmulator;
|
||||
}
|
||||
|
||||
EGLImage CopySurface(layers::Image* img)
|
||||
{
|
||||
mGLContext->MakeCurrent();
|
||||
|
||||
GLuint tex = CreateTextureForOffscreen(mGLContext, mGLContext->GetGLFormats(),
|
||||
img->GetSize());
|
||||
|
||||
auto helper = mGLContext->BlitHelper();
|
||||
const gl::OriginPos destOrigin = gl::OriginPos::TopLeft;
|
||||
if (!helper->BlitImageToTexture(img, img->GetSize(), tex,
|
||||
LOCAL_GL_TEXTURE_2D, destOrigin))
|
||||
{
|
||||
mGLContext->fDeleteTextures(1, &tex);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
EGLint attribs[] = {
|
||||
LOCAL_EGL_IMAGE_PRESERVED_KHR, LOCAL_EGL_TRUE,
|
||||
LOCAL_EGL_NONE, LOCAL_EGL_NONE
|
||||
};
|
||||
|
||||
EGLContext eglContext = static_cast<GLContextEGL*>(mGLContext.get())->GetEGLContext();
|
||||
EGLImage eglImage = sEGLLibrary.fCreateImage(
|
||||
EGL_DISPLAY(), eglContext, LOCAL_EGL_GL_TEXTURE_2D_KHR,
|
||||
reinterpret_cast<EGLClientBuffer>(tex), attribs);
|
||||
mGLContext->fDeleteTextures(1, &tex);
|
||||
|
||||
return eglImage;
|
||||
}
|
||||
|
||||
nsresult PostOutput(BufferInfo::Param aInfo, MediaFormat::Param aFormat,
|
||||
const TimeUnit& aDuration) override
|
||||
{
|
||||
if (!EnsureGLContext()) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
RefPtr<layers::Image> img =
|
||||
new SurfaceTextureImage(mSurfaceTexture.get(), mConfig.mDisplay,
|
||||
gl::OriginPos::BottomLeft);
|
||||
|
||||
if (WantCopy()) {
|
||||
EGLImage eglImage = CopySurface(img);
|
||||
if (!eglImage) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
EGLSync eglSync = nullptr;
|
||||
if (sEGLLibrary.IsExtensionSupported(GLLibraryEGL::KHR_fence_sync) &&
|
||||
mGLContext->IsExtensionSupported(GLContext::OES_EGL_sync))
|
||||
{
|
||||
MOZ_ASSERT(mGLContext->IsCurrent());
|
||||
eglSync = sEGLLibrary.fCreateSync(EGL_DISPLAY(),
|
||||
LOCAL_EGL_SYNC_FENCE,
|
||||
nullptr);
|
||||
MOZ_ASSERT(eglSync);
|
||||
mGLContext->fFlush();
|
||||
} else {
|
||||
NS_WARNING("No EGL fence support detected, rendering artifacts may occur!");
|
||||
}
|
||||
|
||||
img = new layers::EGLImageImage(eglImage, eglSync, mConfig.mDisplay,
|
||||
gl::OriginPos::TopLeft, true /* owns */);
|
||||
}
|
||||
|
||||
nsresult rv;
|
||||
int32_t flags;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->Flags(&flags), rv);
|
||||
@@ -231,20 +160,9 @@ public:
|
||||
}
|
||||
|
||||
protected:
|
||||
bool EnsureGLContext()
|
||||
{
|
||||
if (mGLContext) {
|
||||
return true;
|
||||
}
|
||||
|
||||
mGLContext = GLContextProvider::CreateHeadless(CreateContextFlags::NONE);
|
||||
return mGLContext;
|
||||
}
|
||||
|
||||
layers::ImageContainer* mImageContainer;
|
||||
const VideoInfo& mConfig;
|
||||
RefPtr<AndroidSurfaceTexture> mSurfaceTexture;
|
||||
RefPtr<GLContext> mGLContext;
|
||||
};
|
||||
|
||||
class AudioDataDecoder : public MediaCodecDataDecoder
|
||||
@@ -283,6 +201,10 @@ public:
|
||||
int32_t numChannels;
|
||||
NS_ENSURE_SUCCESS(rv =
|
||||
aFormat->GetInteger(NS_LITERAL_STRING("channel-count"), &numChannels), rv);
|
||||
AudioConfig::ChannelLayout layout(numChannels);
|
||||
if (!layout.IsValid()) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
int32_t sampleRate;
|
||||
NS_ENSURE_SUCCESS(rv =
|
||||
@@ -391,9 +313,12 @@ AndroidDecoderModule::CreateAudioDecoder(
|
||||
|
||||
MediaFormat::LocalRef format;
|
||||
|
||||
LOG("CreateAudioFormat with mimeType=%s, mRate=%d, channels=%d",
|
||||
aConfig.mMimeType.Data(), aConfig.mRate, aConfig.mChannels);
|
||||
|
||||
NS_ENSURE_SUCCESS(MediaFormat::CreateAudioFormat(
|
||||
aConfig.mMimeType,
|
||||
aConfig.mBitDepth,
|
||||
aConfig.mRate,
|
||||
aConfig.mChannels,
|
||||
&format), nullptr);
|
||||
|
||||
@@ -464,10 +389,11 @@ MediaCodecDataDecoder::InitDecoder(Surface::Param aSurface)
|
||||
NS_ENSURE_SUCCESS(rv = ResetInputBuffers(), rv);
|
||||
NS_ENSURE_SUCCESS(rv = ResetOutputBuffers(), rv);
|
||||
|
||||
NS_NewNamedThread("MC Decoder", getter_AddRefs(mThread),
|
||||
NS_NewRunnableMethod(this, &MediaCodecDataDecoder::DecoderLoop));
|
||||
rv = NS_NewNamedThread(
|
||||
"MC Decoder", getter_AddRefs(mThread),
|
||||
NS_NewRunnableMethod(this, &MediaCodecDataDecoder::DecoderLoop));
|
||||
|
||||
return NS_OK;
|
||||
return rv;
|
||||
}
|
||||
|
||||
// This is in usec, so that's 10ms.
|
||||
@@ -522,7 +448,7 @@ MediaCodecDataDecoder::WaitForInput()
|
||||
}
|
||||
|
||||
|
||||
MediaRawData*
|
||||
already_AddRefed<MediaRawData>
|
||||
MediaCodecDataDecoder::PeekNextSample()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
@@ -543,7 +469,7 @@ MediaCodecDataDecoder::PeekNextSample()
|
||||
}
|
||||
|
||||
// We're not stopping or flushing, so try to get a sample.
|
||||
return mQueue.front();
|
||||
return RefPtr<MediaRawData>(mQueue.front()).forget();
|
||||
}
|
||||
|
||||
nsresult
|
||||
@@ -584,7 +510,7 @@ MediaCodecDataDecoder::QueueSample(const MediaRawData* aSample)
|
||||
return res;
|
||||
}
|
||||
|
||||
mDurations.push(TimeUnit::FromMicroseconds(aSample->mDuration));
|
||||
mDurations.push_back(TimeUnit::FromMicroseconds(aSample->mDuration));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -629,7 +555,7 @@ MediaCodecDataDecoder::GetOutputDuration()
|
||||
{
|
||||
MOZ_ASSERT(!mDurations.empty(), "Should have had a duration queued");
|
||||
const TimeUnit duration = mDurations.front();
|
||||
mDurations.pop();
|
||||
mDurations.pop_front();
|
||||
return duration;
|
||||
}
|
||||
|
||||
@@ -661,12 +587,11 @@ MediaCodecDataDecoder::DecoderLoop()
|
||||
{
|
||||
bool isOutputDone = false;
|
||||
AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1);
|
||||
RefPtr<MediaRawData> sample;
|
||||
MediaFormat::LocalRef outputFormat(frame.GetEnv());
|
||||
nsresult res = NS_OK;
|
||||
|
||||
while (WaitForInput()) {
|
||||
sample = PeekNextSample();
|
||||
RefPtr<MediaRawData> sample = PeekNextSample();
|
||||
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
@@ -682,7 +607,8 @@ MediaCodecDataDecoder::DecoderLoop()
|
||||
if (NS_SUCCEEDED(res)) {
|
||||
// We've fed this into the decoder, so remove it from the queue.
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
mQueue.pop();
|
||||
MOZ_RELEASE_ASSERT(mQueue.size(), "Queue may not be empty");
|
||||
mQueue.pop_front();
|
||||
isOutputDone = false;
|
||||
}
|
||||
}
|
||||
@@ -757,18 +683,27 @@ MediaCodecDataDecoder::State() const
|
||||
return mState;
|
||||
}
|
||||
|
||||
void
|
||||
bool
|
||||
MediaCodecDataDecoder::State(ModuleState aState)
|
||||
{
|
||||
LOG("%s -> %s", ModuleStateStr(mState), ModuleStateStr(aState));
|
||||
bool ok = true;
|
||||
|
||||
if (aState == kDrainDecoder) {
|
||||
MOZ_ASSERT(mState == kDrainQueue);
|
||||
if (mState == kShutdown) {
|
||||
ok = false;
|
||||
} else if (mState == kStopping) {
|
||||
ok = aState == kShutdown;
|
||||
} else if (aState == kDrainDecoder) {
|
||||
ok = mState == kDrainQueue;
|
||||
} else if (aState == kDrainWaitEOS) {
|
||||
MOZ_ASSERT(mState == kDrainDecoder);
|
||||
ok = mState == kDrainDecoder;
|
||||
}
|
||||
|
||||
mState = aState;
|
||||
if (ok) {
|
||||
LOG("%s -> %s", ModuleStateStr(mState), ModuleStateStr(aState));
|
||||
mState = aState;
|
||||
}
|
||||
|
||||
return ok;
|
||||
}
|
||||
|
||||
void
|
||||
@@ -776,19 +711,15 @@ MediaCodecDataDecoder::ClearQueue()
|
||||
{
|
||||
mMonitor.AssertCurrentThreadOwns();
|
||||
|
||||
while (!mQueue.empty()) {
|
||||
mQueue.pop();
|
||||
}
|
||||
while (!mDurations.empty()) {
|
||||
mDurations.pop();
|
||||
}
|
||||
mQueue.clear();
|
||||
mDurations.clear();
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::Input(MediaRawData* aSample)
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
mQueue.push(aSample);
|
||||
mQueue.push_back(aSample);
|
||||
lock.NotifyAll();
|
||||
|
||||
return NS_OK;
|
||||
@@ -810,7 +741,9 @@ nsresult
|
||||
MediaCodecDataDecoder::Flush()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
State(kFlushing);
|
||||
if (!State(kFlushing)) {
|
||||
return NS_OK;
|
||||
}
|
||||
lock.Notify();
|
||||
|
||||
while (State() == kFlushing) {
|
||||
@@ -840,23 +773,23 @@ MediaCodecDataDecoder::Shutdown()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
|
||||
if (!mThread || State() == kStopping) {
|
||||
// Already shutdown or in the process of doing so
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
State(kStopping);
|
||||
lock.Notify();
|
||||
|
||||
while (State() == kStopping) {
|
||||
while (mThread && State() != kShutdown) {
|
||||
lock.Wait();
|
||||
}
|
||||
|
||||
mThread->Shutdown();
|
||||
mThread = nullptr;
|
||||
if (mThread) {
|
||||
mThread->Shutdown();
|
||||
mThread = nullptr;
|
||||
}
|
||||
|
||||
mDecoder->Stop();
|
||||
mDecoder->Release();
|
||||
if (mDecoder) {
|
||||
mDecoder->Stop();
|
||||
mDecoder->Release();
|
||||
mDecoder = nullptr;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user