mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 23:06:52 +00:00
d457251529
- Bug 1120715 - Part 6: Remove the dom.requestcache.enabled pref; r=bkelly (800c996a96) - Bug 1143222 - Put the DOM Cache tests in sequential mode again until we fix the rest of the intermittent failures; a=RyanVM (2ebdd659a1) - Bug 1255636 - Give a better error message when the Request constructor fails because of a cross-origin referrer URL; r=bkelly (d81a21c0bb) - Bug 1265056 - don't needlessly construct nsAutoCString temporaries in dom/; r=baku (3be49ca3fc) - Bug 1243849 - Restore support for accessing the Cache API from app:// URLs and also for storing requests/responses with app:// URLs within it; r=bkelly (eb56fa564c) - Bug 1263235, part 1 - Move PBrowser::AsyncMessage's data argument last. r=smaug (6852b87c22) - Bug 1263235, part 2 - Make PContent::AsyncMessage and PContentBridge::AsyncMessage's data argument last. r=smaug (9e8cd94461) - Bug 1263028 - send HTTP data to the content process in smaller chunks, r=michal (c0da548157) - Bug 1263235, part 3 - Move PHttpChannel::OnTransportAndData's data argument last. r=mayhemer (e1bf4f430f) - Bug 1263235, part 4 - Make PBrowserStream::Write's data argument last. r=jimm (8bcec4d541) - Bug 1260876 - Remove process switch code for signed package code (added by Bug 1186290). r=valentin. (cef270b44c) - Bug 1234575 - Empty fragment is ignored in URI of location header r=mcmanus (db68f102d8) - Bug 1262506 - Unused variable in a runnable in BackgroundParentImpl, r=ehsan (9288f0a111) - bug 1239166 - platform work to support Microsoft Family Safety functionality r=froydnj,mgoodwin,mhowell,rbarnes,vladan (adc357f3b3) - Bug 842818 - Make Crypto::GetRandomValues() work off the main thread r=baku,keeler,mt (533f8942c4) - Bug 1247089 - Add a mode to ReportToConsoleNonLocalized that ignores the calling location. r=bkelly (4be23e0869) - Bug 1258883 - Add a way to replace the entire Push service in tests. r=wchen (06a5f27016) - Bug 1243856 - Remove alarms from the Push H2 backend. r=dragana (60d146dc73) - Bug 1246066 - Clear PushService timeout tasks on uninitialization. r=itcambridge (461276a972) - Bug 1214338 - Implement Android GCM-based PushService protocol. r=rnewman r=kitcambridge (f2bb78994a) - Bug 1257821 - Support the new aesgcm content encoding scheme. r=mt (1da653c14a) - Bug 1243856 - Remove alarms from the Push WebSocket backend. r=dragana (43f74c4999) - Bug 1258145 - Remove waitForPromise from the xpcshell tests. r=wchen (cdd1aff2f6) - Bug 1253831 - Don't check actual intervals in the Push backoff test. r=wchen (859fa0bba3) - Bug 1246341 - Include status codes in "ack" and "unregister" requests. r=dragana (a62d0daf9b) - Bug 1246341 - Add a test for push event error reporting. r=dragana (013bc814e4) - Bug 1247089 - Log Web Push decryption errors. r=bkelly (ffc093dc2f) - Bug 1258221 - patch 2 - Port FileSystem API and DeviceStorage API to PBackground, r=smaug (c1c0e08bc0) - Bug 1258221 - patch 3 - Rename FileSystemTaskBase to FileSystemTaskChildBase, r=smaug (867a0e65fd) - Bug 1251032 - Don't return layersId or textureFactoryIdentifier as outparams in RenderFrameParent constructor. r=kanru (198ddff7fc) - Bug 1251032 - Send RenderFrame info down to child in CreateWindow message. r=kanru (87e9001088) - Bug 1251032 - Make it possible to assign a frameloader to RenderFrameParent after construction. r=kanru (96483d1282) - Bug 1254865 - Send disableglobalhistory state down to TabChild after construction asynchronously. r=smaug (3949285b62) - Bug 1238707 Release the window immediately in TabParent::Destroy() to avoid leaks. r=smaug (fc612485d7) - Bug 1256589 part.1 Move the implementation of StopPropagation() from dom::Event to WidgetEvent r=smaug (181721b64c) - Bug 1256589 part.2 Move the implementation of StopImmediatePropagation() from dom::Event to WidgetEvent r=smaug (554a0dc5b5) - Bug 1203059 part.1 nsXBLWincowKeyHandler mark WidgetEvent::mFlags if it's reserved by chrome before the event is dispatched into the content r=smaug (9162dd68cb) - Bug 1203059 part.2 When an event is reserved by chrome, it should be fired only on chrome r=smaug (35f082ca5f) - Bug 1203059 part.3 Installing and removing keyboard event listeners of nsXBLWindowKeyHandler should be done by the class itself r=smaug (1e06c2d0bc) - Bug 1203059 part.4 Update test_keycodes.xul for the new behavior r=smaug (3014d21c75) - Bug 1256589 part.3 Move the implementation of StopCrossProcessForwarding() from dom::Event to WidgetEvent r=smaug (96db915b51) - Bug 1257180 - patch 1 - Directory clonable to workers, r=smaug (5634acb08d) - Bug 1257180 - patch 2 - Directory can be sent via postMessage(), r=smaug (82ada39ae3) - Bug 1263311: Part 3 - s/nsCancelableRunnable/CancelableRunnable/g. r=froydnj (79d0a6c81f) - Bug 1253198: add WebRtcIce prefix to all ICE unit tests. r=bwc (9c18f5fd56) - Bug 1244926: added TCP socket filter to only allow outgoing STUN. r=jesup (75debfdc84) - Bug 1257405 - Increase auth secret length to 16 octets. r=mt (b1e000c331) - Bug 1257401 - Remove the worker descriptor for PushSubscription. r=khuey (5791fb69ef) - Bug 1257401 - Remove the worker descriptor for PushManager. r=khuey (e2c75903a9) - Bug 1257821 - Remove the authenticated aesgcm128 content coding scheme. r=mt,marco (64a2917910) - Bug 1256488 - Add a Base64 URL-decoder for C++ and chrome JS callers. r=mt,baku (0bbb250298) - Bug 1247685 - Validate and store app server keys in the Push service. r=mt (c3c026ccb1) - Bug 1252650 - Support loading PushService immediately on Android; r=kitcambridge (d59a37fec4) - Bug 1258595 - Shut down the Push service if errors occur at startup. r=wchen (eef1805652) - Bug 1258595 - Wait for the Push service to shut down between tests. r=wchen (c30cf92ce6) - Bug 1262618 - Fix an unchained promise and a couple of non-promise returns in the push service. r=wchen (8eadab5706) - Bug 1263747 - Log error messages when stringifying errors. r=bgrins (edffd0074e) - Bug 1265705 - Silence startup JavaScript strict warning in resource://gre/modules/PushService.jsm. r=kitcambridge (e7e210fb61) - Bug 1264062 - Don't bother checking which accelerated layer types are available if they're all disabled by pref r=milan (0d3208ad59) - Bug 1263346. Remove wrong Ivy Bridge device id. r=Bas (7e39e7f370) - fix misspatch (a67a111b2c) - Bug 1251334 - Create a disposable pref to force-disable e10s in an emergency. r=jimm (ef892d4474) - Bug 1254774 - error: member access into incomplete type 'nsIUUIDGenerator' after bug 1237847. r=aklotz (c1f334609f) - Bug 1257242 - Split the ::BrowserTabsRemoteAutostart() function into two parts, to allow for the blocking policies to be checked independently from the prefs checks. r=jimm (1babda578f) - Bug 1260190 - Disable e10s for accessibility users on OS X. r=jimm (219e5b1f19) - Bug 1237769 - Disable e10s on Windows XP if layers acceleration is requested r=milan (60f2434e9f) - Bug 1232911 - [3.2] Block VPX support in ADM on unsupported devices. r=snorp (6924aa073a) - Bug 1263249 - Bubble up unique failureId in GetFeatureStatus. r=mconley,milan (cd56eeab3c) - Bug 1219296 - Split fields not needed for repaints out from FrameMetrics. r=kats (9003ca634a) - Bug 1219296 - Factor out scroll snap information into a form that's usable by the compositor. r=kats (23d3e619a1) - Bug 1219296 - Make ScrollMetadata::sNullMetadata a StaticAutoPtr so that ScrollMetadata can admit nsTArray members. r=kats (1729ff7d93) - Bug 1257641 - Replace the mUpdateScrollOffset bool with an enum, needed in the next patch. r=botond (f9d546f8e8) - Bug 1257641 - Use empty transactions to carry scroll offset updates to APZ that don't require a repaint. r=mattwoodrow,mstange,botond (ba4a8a8c29) - Bug 1246290 - Add a bit to FrameMetrics to indicate if APZ-scrolling should be disabled on that APZC. r=botond (af2067137f) - Bug 1256589 part.4 Move the implementation of PreventDefault() and add PreventDefaultBeforeDispatch() from dom::Event to WidgetEvent r=smaug (e7828f2d8f) - Bug 1256589 part.5 Add DefaultPrevented() and DefaultPreventedByContent() to WidgetEvent r=smaug (e65cdd9127) - Bug 1249915 - Fix missing MOZ_COUNT_CTOR and some misc cleanup. r=karlt (d2f26cf971) - Bug 1154183 part.1 Move shortcut/access key candidate list creators from nsContentUtils to WidgetKeyboardEvent r=smaug (40b0b11a5a) - Bug 1154183 part.2 eKeyDown event should have charCode value of following keypress event r=smaug (28c1443ba3) - Bug 1154183 part.3 Clean up some variable names in nsXBLWindowKeyHandler::WalkHandlersAndExecute() r=smaug (81e25023d8) - Bug 1154183 part.4 Implement nsXBLWindowKeyHandler::GetElementForHandler() r=smaug (b5605d5c83) - Bug 1154183 part.5 Make nsXBLWindowKeyHandler::GetElementForHandler() use early return style r=smaug (017467204f) - Bug 1154183 part.6 Add nsXBLWindowKeyHandler::IsExecuteableElement() r=smaug (1fda349113) - Bug 1154183 part.7 Don't dispatch preceding keydown events of reserved keypress events on content in the default event group r=smaug (15b9e8c9d2) - Bug 1256589 part.6 Move the implementation of IsTrusted() from dom::Event to WidgetEvent r=smaug (ec79520fd3) - Bug 1253044. Fix fall through of observer topics when other conditions aren't met in PresShell::Observe. r=dholbert (dcc36884aa) - Bug 1157546 - Replace the image visibility API with a more general API that tracks visibility for any kind of frame. r=mstange (d6ea061614) - Bug 1219296 - Factor out the algorithm that computes a scroll snap destination into a reusable form. r=kats (296cbe9e49) - Bug 1254275 - Inspect the event queue to find out whether momentum events are following. r=kats (b2bb8a26b9) - Bug 1219296 - Scroll snap directly in APZ instead of going through the main thread. r=kats (0a30b550f9) - Bug 1219296 - Fix an include-what-you-use error. r=kats (4a128ae98e) - Bug 1260588 - C++ APZ should only allow handoff to ancestor APZC r=botond (9856ab5160) - Bug 1257269 - Panning up in a scrollable element should not hide the toolbar r=kats,jchen (1036ffc9e3) - Bug 1219296 - Ship scroll snap information to the compositor. r=kats (0e920f02a1) - Bug 1219296 - Move the layout.css.scroll-snap.proximity-threshold pref to gfxPrefs, so it can be queried on the compositor thread. r=kats (2e3e1ec16e) - Bug 1219296 - Remove StartSmoothScroll()'s argument, which is no longer used. r=kats (12efcd9c79) - Bug 1219296 - Light refactoring to how a smooth scroll is launched inside APZC. r=kats (ba6a9ed9a2) - Bug 1219296 - Followup to fix stale code comments. r=me and DONTBUILD (fec5f65988) - Bug 1257641 - Remove now-unused code for the lightweight scroll offset update message. r=botond (d449e45d6d) - Bug 1236680 Part 1: Add new WinUtils function to Resolve moved Users folder. r=jimm (51d12f856c) - Bug 1236680 Part 2: Resolve GMP path for moved Users folder. r=cpearce (e568217b78) - Bug 1236680 Part 3: Add #ifs to include to fix bustage. r=me (40c38680ea) - Bug 1240315: Add startup crash report annotation for AppInit_DLLs; r=jimm (aa2040baae) - Bug 1253446 - patch 2 - Return the proper scaling factor when querying the primary screen on Windows. r=emk (9765e4f7ca) - Bug 1251624 - patch 1 - The desktop to device scaling in WinUtils::MonitorFromRect should not depend on custom CSS pixel scaling (devPixelsPerPx setting). r=emk (788b4ad5db) - Bug 1251624 - patch 2 - Check for scaling override (devPixelsPerPx setting) in nsScreenWin::GetDefaultCSSScaleFactor, for proper window positioning when a custom scale factor is used. r=emk (2843a3fe70) - Bug 1222149 - delete unused fields from AsyncEncodeAndWriteIcon; r=roc clang-cl says these are unused, so let's delete them. (62cf7f8f47) - Bug 1204809 - Notify (don't hang) third party windows when adding shortcut icon. r=jmathies (7e4058a0f8) - Bug 1253566 - Deal with char16_t/wchar_t mismatch. r=aklotz (1c6cf160c7) - Bug 1211941 - Let nsICacheStorage.openTruncate impl return an HTTP cache entry write handle, r=michal (6a5796fb93) - Bug 1050613 - Make sure force-valid for HTTP cache entries is removed when entries are removed, r=michal (9efb91eefc) - Bug 1248389 - Cache index causing CPU loops, r=honzab (175b5b27f2) - Bug 1066970 - Show 'calculating' during HTTP cache cleaning process in preferences window, r=michal (db722000d8) - Bug 1248958 - CacheIndex mRWBuf ownership too fragile, read-after-free, r=honzab (66ee3d1d0d) - Bug 1248003 - Purge from HTTP cache memory pool only in reasonable intervals, r=michal (1cd6cb5983) - Bug 1068674 - Don't turn off e10s if hardware acceleration is disabled. r=jimm (dfbef44278)
859 lines
23 KiB
C++
859 lines
23 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 "VPXDecoder.h"
|
|
|
|
#include "nsThreadUtils.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsPromiseFlatString.h"
|
|
#include "nsIGfxInfo.h"
|
|
|
|
#include "prlog.h"
|
|
|
|
#include <jni.h>
|
|
|
|
static PRLogModuleInfo* AndroidDecoderModuleLog()
|
|
{
|
|
static PRLogModuleInfo* sLogModule = nullptr;
|
|
if (!sLogModule) {
|
|
sLogModule = PR_NewLogModule("AndroidDecoderModule");
|
|
}
|
|
return sLogModule;
|
|
}
|
|
|
|
#undef LOG
|
|
#define LOG(arg, ...) MOZ_LOG(AndroidDecoderModuleLog(), \
|
|
mozilla::LogLevel::Debug, ("AndroidDecoderModule(%p)::%s: " arg, \
|
|
this, __func__, ##__VA_ARGS__))
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::gl;
|
|
using namespace mozilla::widget::sdk;
|
|
using media::TimeUnit;
|
|
|
|
namespace mozilla {
|
|
|
|
#define INVOKE_CALLBACK(Func, ...) \
|
|
if (mCallback) { \
|
|
mCallback->Func(__VA_ARGS__); \
|
|
} else { \
|
|
NS_WARNING("Callback not set"); \
|
|
}
|
|
|
|
static const char*
|
|
TranslateMimeType(const nsACString& aMimeType)
|
|
{
|
|
if (VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP8)) {
|
|
return "video/x-vnd.on2.vp8";
|
|
} else if (VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP9)) {
|
|
return "video/x-vnd.on2.vp9";
|
|
}
|
|
return PromiseFlatCString(aMimeType).get();
|
|
}
|
|
|
|
static MediaCodec::LocalRef
|
|
CreateDecoder(const nsACString& aMimeType)
|
|
{
|
|
MediaCodec::LocalRef codec;
|
|
NS_ENSURE_SUCCESS(MediaCodec::CreateDecoderByType(TranslateMimeType(aMimeType),
|
|
&codec), nullptr);
|
|
return codec;
|
|
}
|
|
|
|
static bool
|
|
GetFeatureStatus(int32_t aFeature)
|
|
{
|
|
nsCOMPtr<nsIGfxInfo> gfxInfo = services::GetGfxInfo();
|
|
int32_t status = nsIGfxInfo::FEATURE_STATUS_UNKNOWN;
|
|
nsCString discardFailureId;
|
|
if (!gfxInfo || NS_FAILED(gfxInfo->GetFeatureStatus(aFeature, discardFailureId, &status))) {
|
|
return false;
|
|
}
|
|
return status == nsIGfxInfo::FEATURE_STATUS_OK;
|
|
};
|
|
|
|
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)
|
|
{
|
|
|
|
}
|
|
|
|
const char* GetDescriptionName() const override
|
|
{
|
|
return "android video decoder";
|
|
}
|
|
|
|
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() 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);
|
|
|
|
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));
|
|
INVOKE_CALLBACK(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
|
|
{
|
|
public:
|
|
AudioDataDecoder(const AudioInfo& aConfig, MediaFormat::Param aFormat,
|
|
MediaDataDecoderCallback* aCallback)
|
|
: MediaCodecDataDecoder(MediaData::Type::AUDIO_DATA, aConfig.mMimeType,
|
|
aFormat, aCallback)
|
|
{
|
|
JNIEnv* const env = jni::GetEnvForThread();
|
|
|
|
jni::Object::LocalRef buffer(env);
|
|
NS_ENSURE_SUCCESS_VOID(aFormat->GetByteBuffer(NS_LITERAL_STRING("csd-0"),
|
|
&buffer));
|
|
|
|
if (!buffer && aConfig.mCodecSpecificConfig->Length() >= 2) {
|
|
buffer = jni::Object::LocalRef::Adopt(
|
|
env, env->NewDirectByteBuffer(aConfig.mCodecSpecificConfig->Elements(),
|
|
aConfig.mCodecSpecificConfig->Length()));
|
|
NS_ENSURE_SUCCESS_VOID(aFormat->SetByteBuffer(NS_LITERAL_STRING("csd-0"),
|
|
buffer));
|
|
}
|
|
}
|
|
|
|
const char* GetDescriptionName() const override
|
|
{
|
|
return "android audio decoder";
|
|
}
|
|
|
|
nsresult Output(BufferInfo::Param aInfo, void* aBuffer,
|
|
MediaFormat::Param aFormat, const 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);
|
|
|
|
int32_t offset;
|
|
NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
|
|
|
|
#ifdef MOZ_SAMPLE_TYPE_S16
|
|
const int32_t numSamples = size / 2;
|
|
#else
|
|
#error We only support 16-bit integer PCM
|
|
#endif
|
|
|
|
const int32_t numFrames = numSamples / numChannels;
|
|
auto audio = MakeUnique<AudioDataValue[]>(numSamples);
|
|
|
|
const uint8_t* bufferStart = static_cast<uint8_t*>(aBuffer) + offset;
|
|
PodCopy(audio.get(), reinterpret_cast<const AudioDataValue*>(bufferStart),
|
|
numSamples);
|
|
|
|
int64_t presentationTimeUs;
|
|
NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
|
|
|
|
RefPtr<AudioData> data = new AudioData(0, presentationTimeUs,
|
|
aDuration.ToMicroseconds(),
|
|
numFrames,
|
|
Move(audio),
|
|
numChannels,
|
|
sampleRate);
|
|
INVOKE_CALLBACK(Output, data);
|
|
return NS_OK;
|
|
}
|
|
};
|
|
|
|
bool
|
|
AndroidDecoderModule::SupportsMimeType(const nsACString& aMimeType) const
|
|
{
|
|
if (!AndroidBridge::Bridge() ||
|
|
AndroidBridge::Bridge()->GetAPIVersion() < 16) {
|
|
return false;
|
|
}
|
|
|
|
if (aMimeType.EqualsLiteral("video/mp4") ||
|
|
aMimeType.EqualsLiteral("video/avc")) {
|
|
return true;
|
|
}
|
|
|
|
// When checking "audio/x-wav", CreateDecoder can cause a JNI ERROR by
|
|
// Accessing a stale local reference leading to a SIGSEGV crash.
|
|
// To avoid this we check for wav types here.
|
|
if (aMimeType.EqualsLiteral("audio/x-wav") ||
|
|
aMimeType.EqualsLiteral("audio/wave; codecs=1") ||
|
|
aMimeType.EqualsLiteral("audio/wave; codecs=6") ||
|
|
aMimeType.EqualsLiteral("audio/wave; codecs=7") ||
|
|
aMimeType.EqualsLiteral("audio/wave; codecs=65534")) {
|
|
return false;
|
|
}
|
|
|
|
if ((VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP8) &&
|
|
!GetFeatureStatus(nsIGfxInfo::FEATURE_VP8_HW_DECODE)) ||
|
|
(VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP9) &&
|
|
!GetFeatureStatus(nsIGfxInfo::FEATURE_VP9_HW_DECODE))) {
|
|
return false;
|
|
}
|
|
|
|
return widget::HardwareCodecCapabilityUtils::FindDecoderCodecInfoForMimeType(
|
|
nsCString(TranslateMimeType(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(
|
|
TranslateMimeType(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;
|
|
}
|
|
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")
|
|
, mState(kDecoding)
|
|
{
|
|
|
|
}
|
|
|
|
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) {
|
|
INVOKE_CALLBACK(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.
|
|
static const int64_t kDecoderTimeout = 10000;
|
|
|
|
#define BREAK_ON_DECODER_ERROR() \
|
|
if (NS_FAILED(res)) { \
|
|
NS_WARNING("Exiting decoder loop due to exception"); \
|
|
if (State() == kDrainDecoder) { \
|
|
INVOKE_CALLBACK(DrainComplete); \
|
|
State(kDecoding); \
|
|
} \
|
|
INVOKE_CALLBACK(Error); \
|
|
break; \
|
|
}
|
|
|
|
nsresult
|
|
MediaCodecDataDecoder::GetInputBuffer(
|
|
JNIEnv* aEnv, int aIndex, jni::Object::LocalRef* aBuffer)
|
|
{
|
|
MOZ_ASSERT(aEnv);
|
|
MOZ_ASSERT(!*aBuffer);
|
|
|
|
int numTries = 2;
|
|
|
|
while (numTries--) {
|
|
*aBuffer = jni::Object::LocalRef::Adopt(
|
|
aEnv->GetObjectArrayElement(mInputBuffers.Get(), aIndex));
|
|
if (*aBuffer) {
|
|
return NS_OK;
|
|
}
|
|
nsresult res = ResetInputBuffers();
|
|
if (NS_FAILED(res)) {
|
|
return res;
|
|
}
|
|
}
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
bool
|
|
MediaCodecDataDecoder::WaitForInput()
|
|
{
|
|
MonitorAutoLock lock(mMonitor);
|
|
|
|
while (State() == kDecoding && mQueue.empty()) {
|
|
// Signal that we require more input.
|
|
INVOKE_CALLBACK(InputExhausted);
|
|
lock.Wait();
|
|
}
|
|
|
|
return State() != kStopping;
|
|
}
|
|
|
|
|
|
MediaRawData*
|
|
MediaCodecDataDecoder::PeekNextSample()
|
|
{
|
|
MonitorAutoLock lock(mMonitor);
|
|
|
|
if (State() == kFlushing) {
|
|
mDecoder->Flush();
|
|
ClearQueue();
|
|
State(kDecoding);
|
|
lock.Notify();
|
|
return nullptr;
|
|
}
|
|
|
|
if (mQueue.empty()) {
|
|
if (State() == kDrainQueue) {
|
|
State(kDrainDecoder);
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
// We're not stopping or flushing, so try to get a sample.
|
|
return mQueue.front();
|
|
}
|
|
|
|
nsresult
|
|
MediaCodecDataDecoder::QueueSample(const MediaRawData* aSample)
|
|
{
|
|
MOZ_ASSERT(aSample);
|
|
AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1);
|
|
|
|
// We have a sample, try to feed it to the decoder.
|
|
int32_t inputIndex = -1;
|
|
nsresult res = mDecoder->DequeueInputBuffer(kDecoderTimeout, &inputIndex);
|
|
if (NS_FAILED(res)) {
|
|
return res;
|
|
}
|
|
|
|
if (inputIndex < 0) {
|
|
// There is no valid input buffer available.
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
jni::Object::LocalRef buffer(frame.GetEnv());
|
|
res = GetInputBuffer(frame.GetEnv(), inputIndex, &buffer);
|
|
if (NS_FAILED(res)) {
|
|
return res;
|
|
}
|
|
|
|
void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
|
|
|
|
MOZ_ASSERT(frame.GetEnv()->GetDirectBufferCapacity(buffer.Get()) >=
|
|
aSample->Size(),
|
|
"Decoder buffer is not large enough for sample");
|
|
|
|
PodCopy(static_cast<uint8_t*>(directBuffer), aSample->Data(), aSample->Size());
|
|
|
|
res = mDecoder->QueueInputBuffer(inputIndex, 0, aSample->Size(),
|
|
aSample->mTime, 0);
|
|
if (NS_FAILED(res)) {
|
|
return res;
|
|
}
|
|
|
|
mDurations.push(TimeUnit::FromMicroseconds(aSample->mDuration));
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
MediaCodecDataDecoder::QueueEOS()
|
|
{
|
|
mMonitor.AssertCurrentThreadOwns();
|
|
|
|
nsresult res = NS_OK;
|
|
int32_t inputIndex = -1;
|
|
res = mDecoder->DequeueInputBuffer(kDecoderTimeout, &inputIndex);
|
|
if (NS_FAILED(res) || inputIndex < 0) {
|
|
return res;
|
|
}
|
|
|
|
res = mDecoder->QueueInputBuffer(inputIndex, 0, 0, 0,
|
|
MediaCodec::BUFFER_FLAG_END_OF_STREAM);
|
|
if (NS_SUCCEEDED(res)) {
|
|
State(kDrainWaitEOS);
|
|
mMonitor.Notify();
|
|
}
|
|
return res;
|
|
}
|
|
|
|
void
|
|
MediaCodecDataDecoder::HandleEOS(int32_t aOutputStatus)
|
|
{
|
|
MonitorAutoLock lock(mMonitor);
|
|
|
|
if (State() == kDrainWaitEOS) {
|
|
State(kDecoding);
|
|
mMonitor.Notify();
|
|
|
|
INVOKE_CALLBACK(DrainComplete);
|
|
}
|
|
|
|
mDecoder->ReleaseOutputBuffer(aOutputStatus, false);
|
|
}
|
|
|
|
TimeUnit
|
|
MediaCodecDataDecoder::GetOutputDuration()
|
|
{
|
|
MOZ_ASSERT(!mDurations.empty(), "Should have had a duration queued");
|
|
const TimeUnit duration = mDurations.front();
|
|
mDurations.pop();
|
|
return duration;
|
|
}
|
|
|
|
nsresult
|
|
MediaCodecDataDecoder::ProcessOutput(
|
|
BufferInfo::Param aInfo, MediaFormat::Param aFormat, int32_t aStatus)
|
|
{
|
|
AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1);
|
|
|
|
const TimeUnit duration = GetOutputDuration();
|
|
const auto buffer = jni::Object::LocalRef::Adopt(
|
|
frame.GetEnv()->GetObjectArrayElement(mOutputBuffers.Get(), aStatus));
|
|
|
|
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(aInfo, directBuffer, aFormat, duration);
|
|
}
|
|
|
|
// The Surface will be updated at this point (for video).
|
|
mDecoder->ReleaseOutputBuffer(aStatus, true);
|
|
PostOutput(aInfo, aFormat, duration);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
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();
|
|
|
|
{
|
|
MonitorAutoLock lock(mMonitor);
|
|
if (State() == kDrainDecoder) {
|
|
MOZ_ASSERT(!sample, "Shouldn't have a sample when pushing EOF frame");
|
|
res = QueueEOS();
|
|
BREAK_ON_DECODER_ERROR();
|
|
}
|
|
}
|
|
|
|
if (sample) {
|
|
res = QueueSample(sample);
|
|
if (NS_SUCCEEDED(res)) {
|
|
// We've fed this into the decoder, so remove it from the queue.
|
|
MonitorAutoLock lock(mMonitor);
|
|
mQueue.pop();
|
|
isOutputDone = false;
|
|
}
|
|
}
|
|
|
|
if (isOutputDone) {
|
|
continue;
|
|
}
|
|
|
|
BufferInfo::LocalRef bufferInfo;
|
|
nsresult res = BufferInfo::New(&bufferInfo);
|
|
BREAK_ON_DECODER_ERROR();
|
|
|
|
int32_t outputStatus = -1;
|
|
res = mDecoder->DequeueOutputBuffer(bufferInfo, kDecoderTimeout,
|
|
&outputStatus);
|
|
BREAK_ON_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();
|
|
BREAK_ON_DECODER_ERROR();
|
|
} else if (outputStatus == MediaCodec::INFO_OUTPUT_FORMAT_CHANGED) {
|
|
res = mDecoder->GetOutputFormat(ReturnTo(&outputFormat));
|
|
BREAK_ON_DECODER_ERROR();
|
|
} else if (outputStatus < 0) {
|
|
NS_WARNING("Unknown error from decoder!");
|
|
INVOKE_CALLBACK(Error);
|
|
// Don't break here just in case it's recoverable. If it's not, other
|
|
// stuff will fail later and we'll bail out.
|
|
} else {
|
|
// We have a valid buffer index >= 0 here.
|
|
int32_t flags;
|
|
nsresult res = bufferInfo->Flags(&flags);
|
|
BREAK_ON_DECODER_ERROR();
|
|
|
|
if (flags & MediaCodec::BUFFER_FLAG_END_OF_STREAM) {
|
|
HandleEOS(outputStatus);
|
|
isOutputDone = true;
|
|
// We only queue empty EOF frames, so we're done for now.
|
|
continue;
|
|
}
|
|
|
|
res = ProcessOutput(bufferInfo, outputFormat, outputStatus);
|
|
BREAK_ON_DECODER_ERROR();
|
|
}
|
|
}
|
|
|
|
Cleanup();
|
|
|
|
// We're done.
|
|
MonitorAutoLock lock(mMonitor);
|
|
State(kShutdown);
|
|
mMonitor.Notify();
|
|
}
|
|
|
|
const char*
|
|
MediaCodecDataDecoder::ModuleStateStr(ModuleState aState) {
|
|
static const char* kStr[] = {
|
|
"Decoding", "Flushing", "DrainQueue", "DrainDecoder", "DrainWaitEOS",
|
|
"Stopping", "Shutdown"
|
|
};
|
|
|
|
MOZ_ASSERT(aState < sizeof(kStr) / sizeof(kStr[0]));
|
|
return kStr[aState];
|
|
}
|
|
|
|
MediaCodecDataDecoder::ModuleState
|
|
MediaCodecDataDecoder::State() const
|
|
{
|
|
return mState;
|
|
}
|
|
|
|
void
|
|
MediaCodecDataDecoder::State(ModuleState aState)
|
|
{
|
|
LOG("%s -> %s", ModuleStateStr(mState), ModuleStateStr(aState));
|
|
|
|
if (aState == kDrainDecoder) {
|
|
MOZ_ASSERT(mState == kDrainQueue);
|
|
} else if (aState == kDrainWaitEOS) {
|
|
MOZ_ASSERT(mState == kDrainDecoder);
|
|
}
|
|
|
|
mState = aState;
|
|
}
|
|
|
|
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);
|
|
State(kFlushing);
|
|
lock.Notify();
|
|
|
|
while (State() == kFlushing) {
|
|
lock.Wait();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
MediaCodecDataDecoder::Drain()
|
|
{
|
|
MonitorAutoLock lock(mMonitor);
|
|
if (State() == kDrainDecoder || State() == kDrainQueue) {
|
|
return NS_OK;
|
|
}
|
|
|
|
State(kDrainQueue);
|
|
lock.Notify();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
nsresult
|
|
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) {
|
|
lock.Wait();
|
|
}
|
|
|
|
mThread->Shutdown();
|
|
mThread = nullptr;
|
|
|
|
mDecoder->Stop();
|
|
mDecoder->Release();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
} // mozilla
|