mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
8a0a002cf2
- Bug 1148708: Add missing 'override' annotations in DocAccessibleChild.h. rs=ehsan (d606358545)
- Bug 1210408 - make nsMaiInterfaceAction work with proxies, r=tbsaunde (f7c819c6ae)
- Bug 1210407 - teach nsMaiInterfaceTable to use proxies, r=tbsaunde (4ca4f10b5f)
- bug 1185157 make sure we don't send an event to a destroyed ipc document r=billm (23acf53f75)
- bug 1214864 - make SetCarretOffset() async r=davidb (e3079e9b2d)
- missing of Bug 1139972 - IPC Proxy for charAt, r=tbsaunde (e9593ed752)
- bug 1191598 - Pass MOZ_CURRENT_PROJECT in environment when running post-build automation steps for universal mac builds. r=gps (fc342c6ced)
- Bug 1164596 - Add mach android-emulator command; r=ahal (afeb9b27d1)
- Bug 1223149 - Add basic usage documentation for mach build; r=glandium (bfb802d175)
- Bug 1182301 - Improve 'mach build' notifications. r=gps (2c65a122d1)
- Bug 1184696 - Add clobber targets to |mach clobber|; Ability to clobber compiled python files, r=gps (35d8be292e)
- Bug 1117958 - Allow any debugging options to the run or gtest mach subcommands to automatically enable debugging. r=gps (32f986af4b)
- Bug 1180081 - Properly rebuild gtest/libxul before running gtests. r=gps (80db9a3d49)
- Bug 1171647, part 1 - Define a new function to convert the mode to a string. r=njn (61ad16f5ba)
- Bug 1171647, part 2 - Remove redundant assertion for dark matter mode. r=njn (b5ac9519f3)
- Bug 1058178, part 1 - Implement DMD heap scanning mode. r=njn (60e1079536)
- Bug 1058178, part 2 - Implement address clamping analysis for DMD scan logs. r=njn (45c0326b93)
- Bug 1102388 - Fix DMD static constructor ordering dependency. r=mccr8 (59b87897a1)
- Bug 1128705 - Don't redefine PAGE_SIZE in DMD if it's already defined. r=erahm (49216348ee)
- Bug 1179042 - Add a script for analyzing memory blocks using a heap scan DMD log. r=njn DONTBUILD (1c08d2d66e)
- Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat (1c999d139b)
- Bug 1158772 - fix non-idiomatic memset call in nsDeque.cpp; r=erahm (de6b555245)
- Bug 1199400 - Part 1: Use CheckedInt when growing nsDeque capacity. r=froydnj (dfdf6814a3)
- Bug 1199400 - Part 0: Remove unused nsDequeIterator. r=froydnj (38d69d7f47)
- Bug 1199400 - Part 2: Add tests for possible nsDeque corner cases. r=froydnj (931baff195)
- Bug 1201997 - Part 1 - Converted compiled test to gtest for nsDeque class. Added tests to test untested methods. r=froydn (e893916651)
- Bug 1201997 - Part 2 - Removing unused methods from the nsDeque class. r=froydn (41595a90ac)
- Bug 1201997 - Part 3 - Make internally used methods private. r=froydn (8cd3afd96f)
- Bug 1201997 - Part 4 - Change size and offset variables to size_t.r=froydn (73eabc8d60)
- Bug 1215140 P1 Add an nsIConsoleReportCollector interface to support navigation channel logging. r=bz (8a41535e2b)
- Bug 1215140 P2 Make HttpBaseChannel implement nsIConsoleReportCollector. r=bz (75fca301f2)
- Bug 1197679 - If nsUnknownDecoder is involved in e10s DivertToParent can break. r=jduell (5d94a12504)
- Bug 1178991 - smartptr for http converter r=hurley (8e7fbc8443)
- bug 366559 - patch 2, fix nsHTTPCompressConv indentation r=bagder (ba762da587)
- bug 366559 - patch 3, fix nsHTTPCompressConv bracing style r=bagder (54195ab451)
- bits of bug 366559 - patch 7, content-encoding brotli for http (f0b4051022)
- Bug 1205112 - Make PushEvent.data nullable. r=mt,smaug (775db32856)
- Bug 1193414 - SharedWorkers thread should be kept alive also when the SharedWorker object is CCed, r=khuey (b77ea8125c)
- Bug 1206520: Add about:config prefs to enable throwing on asm.js validation failures; r=bz (c42126665d)
- Bug 1193414 - Telemetry for SharedWorker spawning. r=bkelly (77984b7bcc)
- Bug 1205676 - Enable WPT service-worker/unregister-then-register-new-script.https.html in e10s, r=nsm (ec24939cf6)
- Bug 1193133 - Throw when calling postMessage from a Service Worker dom object with no global. r=bkelly (526dcacfab)
- Bug 1181871 P1 Only enforce Cache Context shared data destruction on target thread after init. r=ehsan (cdbf3ed3a8)
- Bug 1181871 P2 Fix ServiceWorkerManager usage of stack-based ErrorResult. r=ehsan (c449195d90)
- minor cleanup and missing bit of 1198230 (02f459db05)
- Bug 1143717 - Implement the ServiceWorkerMessageEvent interface. r=baku (027b3465f2)
- fix misspatch (708eee4e84)
- Bug 1188545 - Disentangle service workers from shared workers and refactor event dispatching code into a separate class. r=nsm,mrbkap (fb5b5341c9)
- Bug 1205228 - Change PackagedAppVerifier to notify the verification result asynchronously. r=valentin. (9edda0fa00)
- Bug 1178518 - Packaged App Utils. r=valentin (f60f3b7a93)
- Bug 1213150 - Part 1: Add a nsContentUtils::IsNonSubresourceRequest helper; r=jdm (b509cc3cc9)
- Bug 1213150 - Part 2: Rework ShouldPrepareForIntercept() in terms of subresource requests; r=jdm (2e92fe8780)
- Bug 1213150 - Part 3: Remove nsIInterceptedChannel.isNavigation; r=jdm (becf1cc12f)
- Bug 1213150 follow-up: fix build bustage (8d73d6ca73)
- Bug 1198394 - Part 1: Allow interception of HSTS upgraded connections in non-e10s mode; r=mcmanus (f504c5be08)
- Bug 1198394 - Part 2: Add a test for interception of HSTS upgraded connections; r=jdm (054e984eef)
- Bug 1187011 - Don't allow response body with null body status. r=bkelly (b1860741d1)
- missing bit of 1140788 (29d319712e)
- Bug 1213436 - Reject core dumps with node IDs that don't fit in an IEEE 754 double; r=sfink (3c1f6fdda0)
- Bug 1211006 - Add Debugger.Source.prototype.canonicalId; r=ejpbruel (eef7b79fce)
- Bug 1199218 - Implement JS::ubi::Node::size for js::LazyScript referents; r=sfink (098a48d240)
- Bug 1220031 - Add JS::ubi::Node::scriptFilename; r=sfink (6b824ae680)
- Bug 1143575. Remove unused MediaQueue::Empty. r=cpearce (de737f3433)
- Bug 1209933 - Make sure all parent runtime pointers are the topmost parent, r=billm. (fe824d967d)
- Bug 1197012 - Fix ThrowTypeError in Notification. r=mccr8 (0b1a097526)
- Bug 1197893 - Check the number of arguments for ThrowTypeError() and ThrowRangeError() at compile time. r=peterv (d98c7d78a0)
- Bug 1142083 - Add test for IDN Unicode domain redirect. r=mcmanus (0c8961fe17)
- Bug 1187159 - Add mochitest for loading packaged apps (iframe+fetch+mozapp) r=jduell (ce90ea561b)
- Bug 1186290 - Notify TabParent to switch process when loading a signed package. r=honzab, r=kanru. (c58a14554a)
- fix (15e2df75eb)
- Bug 1206124 P1 Fix "same-origin" CORS credentials in FetchDriver. r=ehsan (fae1bb6ab3)
- Bug 1206124 P2 Test fetch() with credentials and redirects. r=ehsan (ffc6254112)
- Bug 1211751: Remove nsIChannelEventSink-forwarding from EventSource and FetchDriver. It's never needed. r=smaug (adafe5737a)
- Bug 1212433 Fail fetch() calls that require preflight and also redirect. r=sicking a=abillings (c0d6742b9e)
- Bug 1193128 - Fix base64 decoding when fetching data URIs. r=baku (80bafa291a)
- Bug 1195167 part 1: Let necko handle all protocols. r=bkelly (bb932b0ada)
- Bug 1195167 part 2: Remove redundant aCORSFlag argument and instead use mCORSFlagEverSet. r=bkelly (beadafcad0)
- Bug 1195167 part 3: Remove more scheme-specific handling from FetchDriver. r=bkelly (d00b38db9e)
- Bug 1195167 part 4: Remove FetchDriver::BasicFetch since it is empty. r=bkelly (c5ed097267)
- Bug 1210413 P2 Test CORS credentials on cross-origin redirects. r=sicking a=dveditz (b4eeb8aac0)
- Bug 1210413 P1 Propagate new channel load flags from child to parent on redirect. r=jduell a=dveditz (8b329af4fa)
- Bug 1195167 part 5: Make FetchDriver use AsyncOpen2. r=bkelly (cc217c4cc1)
- Bug 1195167 part 6: Some code simplification since necko handles fetch recursion. r=bkelly (f3b6da2262)
- Bug 1195167: Followup to fix test which I forgot to change (81e7439a2e)
- Bug 1215746: Remove RequestMode::Cors_with_forced_preflight. r=bkelly (0336e812b6)
- Bug 1211000: Move CORS preflight logic from nsCORSListenerProxy to nsCORSPreflightListener. r=ehsan (bf2f71cf22)
- missing bit of Bug 1211443 - Drop scheduled update if decoder initialization isn't done yet. r=jya (f6bc074e33)
- Bug 1182571: Fix nsILoadInfo->GetContentPolicyType API to be less ambigious. Audit and fix all users of it. r=ckerschb (5af6fa7442)
- fix (e40c8e7625)
- Bug 1173811 - Part 1: Propagate the response URL to intercepted channels when necessary (non-e10s). r=mayhemer,bkelly (26f4f13c28)
- Bug 1173811 - Part 2: Propagate the response URL to intercepted channels when necessary (e10s). r=mayhemer,bkelly (a603fe1df2)
- Bug 1154309 - Add New Resource Timing Fields r=bz,hurley (1d14eb6bef)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (a5d18bb637)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (fb07d2c8aa)
- Bug 1212904 P1 Add a LoadTainting enumeration. r=jduell (a1db8a3e99)
- Bug 1212904 P2 Add LoadTainting information to nsILoadInfo. r=jduell (2482e5e334)
- Bug 1221151 - use [infallible] in nsILoadInfo.idl instead of manual %{C++ blocks; r=jduell (aae73129b6)
- Bug 1045891 - CSP 2 child-src implementation r=ckerschb (792920aeb9)
- Bug 1219931 - CSP: Don't allow removing a policy (r=sicking) (9daaab4186)
- Bug 1208661 - Dump client-side layer textures. r=BenWa (1f2d17d515)
667 lines
19 KiB
C++
667 lines
19 KiB
C++
/* 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 "AndroidDecoderModule.h"
|
|
#include "AndroidBridge.h"
|
|
#include "GLBlitHelper.h"
|
|
#include "GLContext.h"
|
|
#include "GLContextEGL.h"
|
|
#include "GLContextProvider.h"
|
|
#include "GLImages.h"
|
|
#include "GLLibraryEGL.h"
|
|
|
|
#include "MediaData.h"
|
|
|
|
#include "MediaInfo.h"
|
|
|
|
#include "nsThreadUtils.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsPromiseFlatString.h"
|
|
|
|
#include <jni.h>
|
|
#include <string.h>
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::gl;
|
|
using namespace mozilla::widget::sdk;
|
|
|
|
namespace mozilla {
|
|
|
|
static MediaCodec::LocalRef CreateDecoder(const nsACString& aMimeType)
|
|
{
|
|
MediaCodec::LocalRef codec;
|
|
NS_ENSURE_SUCCESS(MediaCodec::CreateDecoderByType(PromiseFlatCString(aMimeType).get(), &codec), nullptr);
|
|
return codec;
|
|
}
|
|
|
|
class VideoDataDecoder : public MediaCodecDataDecoder {
|
|
public:
|
|
VideoDataDecoder(const VideoInfo& aConfig,
|
|
MediaFormat::Param aFormat, MediaDataDecoderCallback* aCallback,
|
|
layers::ImageContainer* aImageContainer)
|
|
: MediaCodecDataDecoder(MediaData::Type::VIDEO_DATA, aConfig.mMimeType, aFormat, aCallback)
|
|
, mImageContainer(aImageContainer)
|
|
, mConfig(aConfig)
|
|
{
|
|
|
|
}
|
|
|
|
RefPtr<InitPromise> Init() override {
|
|
mSurfaceTexture = AndroidSurfaceTexture::Create();
|
|
if (!mSurfaceTexture) {
|
|
NS_WARNING("Failed to create SurfaceTexture for video decode\n");
|
|
return InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
|
}
|
|
|
|
if (NS_FAILED(InitDecoder(mSurfaceTexture->JavaSurface()))) {
|
|
return InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
|
}
|
|
|
|
return InitPromise::CreateAndResolve(TrackInfo::kVideoTrack, __func__);
|
|
}
|
|
|
|
void Cleanup() override {
|
|
mGLContext = nullptr;
|
|
}
|
|
|
|
nsresult Input(MediaRawData* aSample) override {
|
|
return MediaCodecDataDecoder::Input(aSample);
|
|
}
|
|
|
|
bool WantCopy() {
|
|
// Allocating a texture is incredibly slow on PowerVR
|
|
return mGLContext->Vendor() != GLVendor::Imagination;
|
|
}
|
|
|
|
EGLImage CopySurface(layers::Image* img) {
|
|
mGLContext->MakeCurrent();
|
|
|
|
GLuint tex = CreateTextureForOffscreen(mGLContext, mGLContext->GetGLFormats(), img->GetSize());
|
|
|
|
GLBlitHelper helper(mGLContext);
|
|
if (!helper.BlitImageToTexture(img, img->GetSize(), tex, LOCAL_GL_TEXTURE_2D)) {
|
|
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,
|
|
(EGLClientBuffer)tex, attribs);
|
|
mGLContext->fDeleteTextures(1, &tex);
|
|
|
|
return eglImage;
|
|
}
|
|
|
|
nsresult PostOutput(BufferInfo::Param aInfo, MediaFormat::Param aFormat,
|
|
const media::TimeUnit& aDuration) override {
|
|
if (!EnsureGLContext()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
RefPtr<layers::Image> img = mImageContainer->CreateImage(ImageFormat::SURFACE_TEXTURE);
|
|
layers::SurfaceTextureImage::Data data;
|
|
data.mSurfTex = mSurfaceTexture.get();
|
|
data.mSize = mConfig.mDisplay;
|
|
data.mOriginPos = gl::OriginPos::BottomLeft;
|
|
|
|
layers::SurfaceTextureImage* stImg = static_cast<layers::SurfaceTextureImage*>(img.get());
|
|
stImg->SetData(data);
|
|
|
|
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 = mImageContainer->CreateImage(ImageFormat::EGLIMAGE);
|
|
layers::EGLImageImage::Data data;
|
|
data.mImage = eglImage;
|
|
data.mSync = eglSync;
|
|
data.mOwns = true;
|
|
data.mSize = mConfig.mDisplay;
|
|
data.mOriginPos = gl::OriginPos::BottomLeft;
|
|
|
|
layers::EGLImageImage* typedImg = static_cast<layers::EGLImageImage*>(img.get());
|
|
typedImg->SetData(data);
|
|
}
|
|
|
|
nsresult rv;
|
|
int32_t flags;
|
|
NS_ENSURE_SUCCESS(rv = aInfo->Flags(&flags), rv);
|
|
|
|
bool isSync = !!(flags & MediaCodec::BUFFER_FLAG_SYNC_FRAME);
|
|
|
|
int32_t offset;
|
|
NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
|
|
|
|
int64_t presentationTimeUs;
|
|
NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
|
|
|
|
RefPtr<VideoData> v =
|
|
VideoData::CreateFromImage(mConfig,
|
|
mImageContainer,
|
|
offset,
|
|
presentationTimeUs,
|
|
aDuration.ToMicroseconds(),
|
|
img,
|
|
isSync,
|
|
presentationTimeUs,
|
|
gfx::IntRect(0, 0,
|
|
mConfig.mDisplay.width,
|
|
mConfig.mDisplay.height));
|
|
mCallback->Output(v);
|
|
return NS_OK;
|
|
}
|
|
|
|
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 {
|
|
private:
|
|
uint8_t csd0[2];
|
|
|
|
public:
|
|
AudioDataDecoder(const AudioInfo& aConfig, MediaFormat::Param aFormat, MediaDataDecoderCallback* aCallback)
|
|
: MediaCodecDataDecoder(MediaData::Type::AUDIO_DATA, aConfig.mMimeType, aFormat, aCallback)
|
|
{
|
|
JNIEnv* env = GetJNIForThread();
|
|
|
|
jni::Object::LocalRef buffer(env);
|
|
NS_ENSURE_SUCCESS_VOID(aFormat->GetByteBuffer(NS_LITERAL_STRING("csd-0"), &buffer));
|
|
|
|
if (!buffer && aConfig.mCodecSpecificConfig->Length() >= 2) {
|
|
csd0[0] = (*aConfig.mCodecSpecificConfig)[0];
|
|
csd0[1] = (*aConfig.mCodecSpecificConfig)[1];
|
|
|
|
buffer = jni::Object::LocalRef::Adopt(env, env->NewDirectByteBuffer(csd0, 2));
|
|
NS_ENSURE_SUCCESS_VOID(aFormat->SetByteBuffer(NS_LITERAL_STRING("csd-0"), buffer));
|
|
}
|
|
}
|
|
|
|
nsresult Output(BufferInfo::Param aInfo, void* aBuffer,
|
|
MediaFormat::Param aFormat,
|
|
const media::TimeUnit& aDuration) {
|
|
// The output on Android is always 16-bit signed
|
|
|
|
nsresult rv;
|
|
int32_t numChannels;
|
|
NS_ENSURE_SUCCESS(rv =
|
|
aFormat->GetInteger(NS_LITERAL_STRING("channel-count"), &numChannels), rv);
|
|
|
|
int32_t sampleRate;
|
|
NS_ENSURE_SUCCESS(rv =
|
|
aFormat->GetInteger(NS_LITERAL_STRING("sample-rate"), &sampleRate), rv);
|
|
|
|
int32_t size;
|
|
NS_ENSURE_SUCCESS(rv = aInfo->Size(&size), rv);
|
|
|
|
const int32_t numFrames = (size / numChannels) / 2;
|
|
AudioDataValue* audio = new AudioDataValue[size];
|
|
PodCopy(audio, static_cast<AudioDataValue*>(aBuffer), size);
|
|
|
|
int32_t offset;
|
|
NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
|
|
|
|
int64_t presentationTimeUs;
|
|
NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
|
|
|
|
RefPtr<AudioData> data = new AudioData(offset, presentationTimeUs,
|
|
aDuration.ToMicroseconds(),
|
|
numFrames,
|
|
audio,
|
|
numChannels,
|
|
sampleRate);
|
|
mCallback->Output(data);
|
|
return NS_OK;
|
|
}
|
|
};
|
|
|
|
|
|
bool AndroidDecoderModule::SupportsMimeType(const nsACString& aMimeType)
|
|
{
|
|
if (!AndroidBridge::Bridge() || (AndroidBridge::Bridge()->GetAPIVersion() < 16)) {
|
|
return false;
|
|
}
|
|
if (aMimeType.EqualsLiteral("video/mp4") ||
|
|
aMimeType.EqualsLiteral("video/avc")) {
|
|
return true;
|
|
}
|
|
return static_cast<bool>(mozilla::CreateDecoder(aMimeType));
|
|
}
|
|
|
|
already_AddRefed<MediaDataDecoder>
|
|
AndroidDecoderModule::CreateVideoDecoder(
|
|
const VideoInfo& aConfig,
|
|
layers::LayersBackend aLayersBackend,
|
|
layers::ImageContainer* aImageContainer,
|
|
FlushableTaskQueue* aVideoTaskQueue,
|
|
MediaDataDecoderCallback* aCallback)
|
|
{
|
|
MediaFormat::LocalRef format;
|
|
|
|
NS_ENSURE_SUCCESS(MediaFormat::CreateVideoFormat(
|
|
aConfig.mMimeType,
|
|
aConfig.mDisplay.width,
|
|
aConfig.mDisplay.height,
|
|
&format), nullptr);
|
|
|
|
RefPtr<MediaDataDecoder> decoder =
|
|
new VideoDataDecoder(aConfig, format, aCallback, aImageContainer);
|
|
|
|
return decoder.forget();
|
|
}
|
|
|
|
already_AddRefed<MediaDataDecoder>
|
|
AndroidDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
|
|
FlushableTaskQueue* aAudioTaskQueue,
|
|
MediaDataDecoderCallback* aCallback)
|
|
{
|
|
MOZ_ASSERT(aConfig.mBitDepth == 16, "We only handle 16-bit audio!");
|
|
|
|
MediaFormat::LocalRef format;
|
|
|
|
NS_ENSURE_SUCCESS(MediaFormat::CreateAudioFormat(
|
|
aConfig.mMimeType,
|
|
aConfig.mBitDepth,
|
|
aConfig.mChannels,
|
|
&format), nullptr);
|
|
|
|
RefPtr<MediaDataDecoder> decoder =
|
|
new AudioDataDecoder(aConfig, format, aCallback);
|
|
|
|
return decoder.forget();
|
|
|
|
}
|
|
|
|
PlatformDecoderModule::ConversionRequired
|
|
AndroidDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
|
|
{
|
|
if (aConfig.IsVideo()) {
|
|
return kNeedAnnexB;
|
|
} else {
|
|
return kNeedNone;
|
|
}
|
|
}
|
|
|
|
MediaCodecDataDecoder::MediaCodecDataDecoder(MediaData::Type aType,
|
|
const nsACString& aMimeType,
|
|
MediaFormat::Param aFormat,
|
|
MediaDataDecoderCallback* aCallback)
|
|
: mType(aType)
|
|
, mMimeType(aMimeType)
|
|
, mFormat(aFormat)
|
|
, mCallback(aCallback)
|
|
, mInputBuffers(nullptr)
|
|
, mOutputBuffers(nullptr)
|
|
, mMonitor("MediaCodecDataDecoder::mMonitor")
|
|
, mFlushing(false)
|
|
, mDraining(false)
|
|
, mStopping(false)
|
|
{
|
|
|
|
}
|
|
|
|
MediaCodecDataDecoder::~MediaCodecDataDecoder()
|
|
{
|
|
Shutdown();
|
|
}
|
|
|
|
RefPtr<MediaDataDecoder::InitPromise> MediaCodecDataDecoder::Init()
|
|
{
|
|
nsresult rv = InitDecoder(nullptr);
|
|
|
|
TrackInfo::TrackType type =
|
|
(mType == MediaData::AUDIO_DATA ? TrackInfo::TrackType::kAudioTrack
|
|
: TrackInfo::TrackType::kVideoTrack);
|
|
|
|
return NS_SUCCEEDED(rv) ?
|
|
InitPromise::CreateAndResolve(type, __func__) :
|
|
InitPromise::CreateAndReject(MediaDataDecoder::DecoderFailureReason::INIT_ERROR, __func__);
|
|
}
|
|
|
|
nsresult MediaCodecDataDecoder::InitDecoder(Surface::Param aSurface)
|
|
{
|
|
mDecoder = CreateDecoder(mMimeType);
|
|
if (!mDecoder) {
|
|
mCallback->Error();
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
nsresult rv;
|
|
NS_ENSURE_SUCCESS(rv = mDecoder->Configure(mFormat, aSurface, nullptr, 0), rv);
|
|
NS_ENSURE_SUCCESS(rv = mDecoder->Start(), rv);
|
|
|
|
NS_ENSURE_SUCCESS(rv = ResetInputBuffers(), rv);
|
|
NS_ENSURE_SUCCESS(rv = ResetOutputBuffers(), rv);
|
|
|
|
NS_NewNamedThread("MC Decoder", getter_AddRefs(mThread),
|
|
NS_NewRunnableMethod(this, &MediaCodecDataDecoder::DecoderLoop));
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
// This is in usec, so that's 10ms
|
|
#define DECODER_TIMEOUT 10000
|
|
|
|
#define HANDLE_DECODER_ERROR() \
|
|
if (NS_FAILED(res)) { \
|
|
NS_WARNING("exiting decoder loop due to exception"); \
|
|
mCallback->Error(); \
|
|
break; \
|
|
}
|
|
|
|
nsresult MediaCodecDataDecoder::GetInputBuffer(JNIEnv* env, int index, jni::Object::LocalRef* buffer)
|
|
{
|
|
bool retried = false;
|
|
while (!*buffer) {
|
|
*buffer = jni::Object::LocalRef::Adopt(env->GetObjectArrayElement(mInputBuffers.Get(), index));
|
|
if (!*buffer) {
|
|
if (!retried) {
|
|
// Reset the input buffers and then try again
|
|
nsresult res = ResetInputBuffers();
|
|
if (NS_FAILED(res)) {
|
|
return res;
|
|
}
|
|
retried = true;
|
|
} else {
|
|
// We already tried resetting the input buffers, return an error
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
}
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void MediaCodecDataDecoder::DecoderLoop()
|
|
{
|
|
bool outputDone = false;
|
|
|
|
bool draining = false;
|
|
bool waitingEOF = false;
|
|
|
|
AutoLocalJNIFrame frame(GetJNIForThread(), 1);
|
|
RefPtr<MediaRawData> sample;
|
|
|
|
MediaFormat::LocalRef outputFormat(frame.GetEnv());
|
|
nsresult res;
|
|
|
|
for (;;) {
|
|
{
|
|
MonitorAutoLock lock(mMonitor);
|
|
while (!mStopping && !mDraining && !mFlushing && mQueue.empty()) {
|
|
if (mQueue.empty()) {
|
|
// We could be waiting here forever if we don't signal that we need more input
|
|
mCallback->InputExhausted();
|
|
}
|
|
lock.Wait();
|
|
}
|
|
|
|
if (mStopping) {
|
|
// Get out of the loop. This is the only exit point.
|
|
break;
|
|
}
|
|
|
|
if (mFlushing) {
|
|
mDecoder->Flush();
|
|
ClearQueue();
|
|
mFlushing = false;
|
|
lock.Notify();
|
|
continue;
|
|
}
|
|
|
|
if (mDraining && !sample && !waitingEOF) {
|
|
draining = true;
|
|
}
|
|
|
|
// We're not stopping or draining, so try to get a sample
|
|
if (!mQueue.empty()) {
|
|
sample = mQueue.front();
|
|
}
|
|
}
|
|
|
|
if (draining && !waitingEOF) {
|
|
MOZ_ASSERT(!sample, "Shouldn't have a sample when pushing EOF frame");
|
|
|
|
int32_t inputIndex;
|
|
res = mDecoder->DequeueInputBuffer(DECODER_TIMEOUT, &inputIndex);
|
|
HANDLE_DECODER_ERROR();
|
|
|
|
if (inputIndex >= 0) {
|
|
res = mDecoder->QueueInputBuffer(inputIndex, 0, 0, 0, MediaCodec::BUFFER_FLAG_END_OF_STREAM);
|
|
HANDLE_DECODER_ERROR();
|
|
|
|
waitingEOF = true;
|
|
}
|
|
}
|
|
|
|
if (sample) {
|
|
// We have a sample, try to feed it to the decoder
|
|
int inputIndex;
|
|
res = mDecoder->DequeueInputBuffer(DECODER_TIMEOUT, &inputIndex);
|
|
HANDLE_DECODER_ERROR();
|
|
|
|
if (inputIndex >= 0) {
|
|
jni::Object::LocalRef buffer(frame.GetEnv());
|
|
res = GetInputBuffer(frame.GetEnv(), inputIndex, &buffer);
|
|
HANDLE_DECODER_ERROR();
|
|
|
|
void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
|
|
|
|
MOZ_ASSERT(frame.GetEnv()->GetDirectBufferCapacity(buffer.Get()) >= sample->Size(),
|
|
"Decoder buffer is not large enough for sample");
|
|
|
|
{
|
|
// We're feeding this to the decoder, so remove it from the queue
|
|
MonitorAutoLock lock(mMonitor);
|
|
mQueue.pop();
|
|
}
|
|
|
|
PodCopy((uint8_t*)directBuffer, sample->Data(), sample->Size());
|
|
|
|
res = mDecoder->QueueInputBuffer(inputIndex, 0, sample->Size(),
|
|
sample->mTime, 0);
|
|
HANDLE_DECODER_ERROR();
|
|
|
|
mDurations.push(media::TimeUnit::FromMicroseconds(sample->mDuration));
|
|
sample = nullptr;
|
|
outputDone = false;
|
|
}
|
|
}
|
|
|
|
if (!outputDone) {
|
|
BufferInfo::LocalRef bufferInfo;
|
|
res = BufferInfo::New(&bufferInfo);
|
|
HANDLE_DECODER_ERROR();
|
|
|
|
int32_t outputStatus;
|
|
res = mDecoder->DequeueOutputBuffer(bufferInfo, DECODER_TIMEOUT, &outputStatus);
|
|
HANDLE_DECODER_ERROR();
|
|
|
|
if (outputStatus == MediaCodec::INFO_TRY_AGAIN_LATER) {
|
|
// We might want to call mCallback->InputExhausted() here, but there seems to be
|
|
// some possible bad interactions here with the threading
|
|
} else if (outputStatus == MediaCodec::INFO_OUTPUT_BUFFERS_CHANGED) {
|
|
res = ResetOutputBuffers();
|
|
HANDLE_DECODER_ERROR();
|
|
} else if (outputStatus == MediaCodec::INFO_OUTPUT_FORMAT_CHANGED) {
|
|
res = mDecoder->GetOutputFormat(ReturnTo(&outputFormat));
|
|
HANDLE_DECODER_ERROR();
|
|
} else if (outputStatus < 0) {
|
|
NS_WARNING("unknown error from decoder!");
|
|
mCallback->Error();
|
|
|
|
// Don't break here just in case it's recoverable. If it's not, others stuff will fail later and
|
|
// we'll bail out.
|
|
} else {
|
|
int32_t flags;
|
|
res = bufferInfo->Flags(&flags);
|
|
HANDLE_DECODER_ERROR();
|
|
|
|
// We have a valid buffer index >= 0 here
|
|
if (flags & MediaCodec::BUFFER_FLAG_END_OF_STREAM) {
|
|
if (draining) {
|
|
draining = false;
|
|
waitingEOF = false;
|
|
|
|
mMonitor.Lock();
|
|
mDraining = false;
|
|
mMonitor.Notify();
|
|
mMonitor.Unlock();
|
|
|
|
mCallback->DrainComplete();
|
|
}
|
|
|
|
mDecoder->ReleaseOutputBuffer(outputStatus, false);
|
|
outputDone = true;
|
|
|
|
// We only queue empty EOF frames, so we're done for now
|
|
continue;
|
|
}
|
|
|
|
MOZ_ASSERT(!mDurations.empty(), "Should have had a duration queued");
|
|
|
|
media::TimeUnit duration;
|
|
if (!mDurations.empty()) {
|
|
duration = mDurations.front();
|
|
mDurations.pop();
|
|
}
|
|
|
|
auto buffer = jni::Object::LocalRef::Adopt(
|
|
frame.GetEnv()->GetObjectArrayElement(mOutputBuffers.Get(), outputStatus));
|
|
if (buffer) {
|
|
// The buffer will be null on Android L if we are decoding to a Surface
|
|
void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
|
|
Output(bufferInfo, directBuffer, outputFormat, duration);
|
|
}
|
|
|
|
// The Surface will be updated at this point (for video)
|
|
mDecoder->ReleaseOutputBuffer(outputStatus, true);
|
|
|
|
PostOutput(bufferInfo, outputFormat, duration);
|
|
}
|
|
}
|
|
}
|
|
|
|
Cleanup();
|
|
|
|
// We're done
|
|
MonitorAutoLock lock(mMonitor);
|
|
mStopping = false;
|
|
mMonitor.Notify();
|
|
}
|
|
|
|
void MediaCodecDataDecoder::ClearQueue()
|
|
{
|
|
mMonitor.AssertCurrentThreadOwns();
|
|
while (!mQueue.empty()) {
|
|
mQueue.pop();
|
|
}
|
|
while (!mDurations.empty()) {
|
|
mDurations.pop();
|
|
}
|
|
}
|
|
|
|
nsresult MediaCodecDataDecoder::Input(MediaRawData* aSample) {
|
|
MonitorAutoLock lock(mMonitor);
|
|
mQueue.push(aSample);
|
|
lock.NotifyAll();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult MediaCodecDataDecoder::ResetInputBuffers()
|
|
{
|
|
return mDecoder->GetInputBuffers(ReturnTo(&mInputBuffers));
|
|
}
|
|
|
|
nsresult MediaCodecDataDecoder::ResetOutputBuffers()
|
|
{
|
|
return mDecoder->GetOutputBuffers(ReturnTo(&mOutputBuffers));
|
|
}
|
|
|
|
nsresult MediaCodecDataDecoder::Flush() {
|
|
MonitorAutoLock lock(mMonitor);
|
|
mFlushing = true;
|
|
lock.Notify();
|
|
|
|
while (mFlushing) {
|
|
lock.Wait();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult MediaCodecDataDecoder::Drain() {
|
|
MonitorAutoLock lock(mMonitor);
|
|
if (mDraining) {
|
|
return NS_OK;
|
|
}
|
|
|
|
mDraining = true;
|
|
lock.Notify();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
nsresult MediaCodecDataDecoder::Shutdown() {
|
|
MonitorAutoLock lock(mMonitor);
|
|
|
|
if (!mThread || mStopping) {
|
|
// Already shutdown or in the process of doing so
|
|
return NS_OK;
|
|
}
|
|
|
|
mStopping = true;
|
|
lock.Notify();
|
|
|
|
while (mStopping) {
|
|
lock.Wait();
|
|
}
|
|
|
|
mThread->Shutdown();
|
|
mThread = nullptr;
|
|
|
|
mDecoder->Stop();
|
|
mDecoder->Release();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
} // mozilla
|