mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +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)
243 lines
6.2 KiB
C++
243 lines
6.2 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
|
/* 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/. */
|
|
|
|
//#define LOG_NDEBUG 0
|
|
#define LOG_TAG "OMXCodecProxy"
|
|
|
|
#include <binder/IPCThreadState.h>
|
|
#include <cutils/properties.h>
|
|
#include <stagefright/foundation/ADebug.h>
|
|
#include <stagefright/MetaData.h>
|
|
#include <stagefright/OMXCodec.h>
|
|
#include <utils/Log.h>
|
|
|
|
#include "nsDebug.h"
|
|
|
|
#include "OMXCodecProxy.h"
|
|
|
|
namespace android {
|
|
|
|
// static
|
|
sp<OMXCodecProxy> OMXCodecProxy::Create(
|
|
const sp<IOMX> &omx,
|
|
const sp<MetaData> &meta, bool createEncoder,
|
|
const sp<MediaSource> &source,
|
|
const char *matchComponentName,
|
|
uint32_t flags,
|
|
const sp<ANativeWindow> &nativeWindow)
|
|
{
|
|
sp<OMXCodecProxy> proxy;
|
|
|
|
const char *mime;
|
|
if (!meta->findCString(kKeyMIMEType, &mime)) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (!strncasecmp(mime, "video/", 6)) {
|
|
proxy = new OMXCodecProxy(omx, meta, createEncoder, source, matchComponentName, flags, nativeWindow);
|
|
}
|
|
return proxy;
|
|
}
|
|
|
|
|
|
OMXCodecProxy::OMXCodecProxy(
|
|
const sp<IOMX> &omx,
|
|
const sp<MetaData> &meta,
|
|
bool createEncoder,
|
|
const sp<MediaSource> &source,
|
|
const char *matchComponentName,
|
|
uint32_t flags,
|
|
const sp<ANativeWindow> &nativeWindow)
|
|
: mOMX(omx),
|
|
mSrcMeta(meta),
|
|
mComponentName(nullptr),
|
|
mIsEncoder(createEncoder),
|
|
mFlags(flags),
|
|
mNativeWindow(nativeWindow),
|
|
mSource(source),
|
|
mState(ResourceState::START)
|
|
{
|
|
}
|
|
|
|
OMXCodecProxy::~OMXCodecProxy()
|
|
{
|
|
mState = ResourceState::END;
|
|
mCodecPromise.RejectIfExists(true, __func__);
|
|
|
|
if (mOMXCodec.get()) {
|
|
wp<MediaSource> tmp = mOMXCodec;
|
|
mOMXCodec.clear();
|
|
while (tmp.promote() != nullptr) {
|
|
// this value come from stagefrigh's AwesomePlayer.
|
|
usleep(1000);
|
|
}
|
|
}
|
|
// Complete all pending Binder ipc transactions
|
|
IPCThreadState::self()->flushCommands();
|
|
|
|
if (mResourceClient) {
|
|
mResourceClient->ReleaseResource();
|
|
mResourceClient = nullptr;
|
|
}
|
|
|
|
mSource.clear();
|
|
free(mComponentName);
|
|
mComponentName = nullptr;
|
|
}
|
|
|
|
RefPtr<OMXCodecProxy::CodecPromise>
|
|
OMXCodecProxy::requestResource()
|
|
{
|
|
Mutex::Autolock autoLock(mLock);
|
|
|
|
if (mResourceClient) {
|
|
return CodecPromise::CreateAndReject(true, __func__);
|
|
}
|
|
mState = ResourceState::WAITING;
|
|
|
|
mozilla::MediaSystemResourceType type = mIsEncoder ? mozilla::MediaSystemResourceType::VIDEO_ENCODER :
|
|
mozilla::MediaSystemResourceType::VIDEO_DECODER;
|
|
mResourceClient = new mozilla::MediaSystemResourceClient(type);
|
|
mResourceClient->SetListener(this);
|
|
mResourceClient->Acquire();
|
|
|
|
RefPtr<CodecPromise> p = mCodecPromise.Ensure(__func__);
|
|
return p.forget();
|
|
}
|
|
|
|
// Called on ImageBridge thread
|
|
void
|
|
OMXCodecProxy::ResourceReserved()
|
|
{
|
|
Mutex::Autolock autoLock(mLock);
|
|
|
|
if (mState != ResourceState::WAITING) {
|
|
mCodecPromise.RejectIfExists(true, __func__);
|
|
return;
|
|
}
|
|
|
|
const char *mime;
|
|
if (!mSrcMeta->findCString(kKeyMIMEType, &mime)) {
|
|
mState = ResourceState::END;
|
|
mCodecPromise.RejectIfExists(true, __func__);
|
|
return;
|
|
}
|
|
|
|
if (!strncasecmp(mime, "video/", 6)) {
|
|
sp<MediaSource> codec;
|
|
mOMXCodec = OMXCodec::Create(mOMX, mSrcMeta, mIsEncoder, mSource, mComponentName, mFlags, mNativeWindow);
|
|
if (mOMXCodec == nullptr) {
|
|
mState = ResourceState::END;
|
|
mCodecPromise.RejectIfExists(true, __func__);
|
|
return;
|
|
}
|
|
// Check if this video is sized such that we're comfortable
|
|
// possibly using an OMX decoder.
|
|
int32_t maxWidth, maxHeight;
|
|
char propValue[PROPERTY_VALUE_MAX];
|
|
property_get("ro.moz.omx.hw.max_width", propValue, "-1");
|
|
maxWidth = atoi(propValue);
|
|
property_get("ro.moz.omx.hw.max_height", propValue, "-1");
|
|
maxHeight = atoi(propValue);
|
|
|
|
int32_t width = -1, height = -1;
|
|
if (maxWidth > 0 && maxHeight > 0 &&
|
|
!(mOMXCodec->getFormat()->findInt32(kKeyWidth, &width) &&
|
|
mOMXCodec->getFormat()->findInt32(kKeyHeight, &height) &&
|
|
width * height <= maxWidth * maxHeight)) {
|
|
printf_stderr("Failed to get video size, or it was too large for HW decoder (<w=%d, h=%d> but <maxW=%d, maxH=%d>)",
|
|
width, height, maxWidth, maxHeight);
|
|
mOMXCodec.clear();
|
|
mState = ResourceState::END;
|
|
mCodecPromise.RejectIfExists(true, __func__);
|
|
return;
|
|
}
|
|
|
|
if (mOMXCodec->start() != OK) {
|
|
NS_WARNING("Couldn't start OMX video source");
|
|
mOMXCodec.clear();
|
|
mState = ResourceState::END;
|
|
mCodecPromise.RejectIfExists(true, __func__);
|
|
return;
|
|
}
|
|
}
|
|
|
|
mState = ResourceState::ACQUIRED;
|
|
mCodecPromise.ResolveIfExists(true, __func__);
|
|
}
|
|
|
|
// Called on ImageBridge thread
|
|
void
|
|
OMXCodecProxy::ResourceReserveFailed()
|
|
{
|
|
Mutex::Autolock autoLock(mLock);
|
|
mState = ResourceState::NOT_ACQUIRED;
|
|
mCodecPromise.RejectIfExists(true, __func__);
|
|
}
|
|
|
|
status_t
|
|
OMXCodecProxy::start(MetaData *params)
|
|
{
|
|
Mutex::Autolock autoLock(mLock);
|
|
|
|
if (mState != ResourceState::ACQUIRED) {
|
|
return NO_INIT;
|
|
}
|
|
CHECK(mOMXCodec.get() != nullptr);
|
|
return mOMXCodec->start();
|
|
}
|
|
|
|
status_t
|
|
OMXCodecProxy::stop()
|
|
{
|
|
Mutex::Autolock autoLock(mLock);
|
|
|
|
if (mState != ResourceState::ACQUIRED) {
|
|
return NO_INIT;
|
|
}
|
|
CHECK(mOMXCodec.get() != nullptr);
|
|
return mOMXCodec->stop();
|
|
}
|
|
|
|
sp<MetaData>
|
|
OMXCodecProxy::getFormat()
|
|
{
|
|
Mutex::Autolock autoLock(mLock);
|
|
|
|
if (mState != ResourceState::ACQUIRED) {
|
|
sp<MetaData> meta = new MetaData;
|
|
return meta;
|
|
}
|
|
CHECK(mOMXCodec.get() != nullptr);
|
|
return mOMXCodec->getFormat();
|
|
}
|
|
|
|
status_t
|
|
OMXCodecProxy::read(MediaBuffer **buffer, const ReadOptions *options)
|
|
{
|
|
Mutex::Autolock autoLock(mLock);
|
|
|
|
if (mState != ResourceState::ACQUIRED) {
|
|
return NO_INIT;
|
|
}
|
|
CHECK(mOMXCodec.get() != nullptr);
|
|
return mOMXCodec->read(buffer, options);
|
|
}
|
|
|
|
status_t
|
|
OMXCodecProxy::pause()
|
|
{
|
|
Mutex::Autolock autoLock(mLock);
|
|
|
|
if (mState != ResourceState::ACQUIRED) {
|
|
return NO_INIT;
|
|
}
|
|
CHECK(mOMXCodec.get() != nullptr);
|
|
return mOMXCodec->pause();
|
|
}
|
|
|
|
} // namespace android
|