mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
116abd772d
- 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)
942 lines
29 KiB
C++
942 lines
29 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/. */
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "base/basictypes.h"
|
|
#include <cutils/properties.h>
|
|
#include <stagefright/foundation/ADebug.h>
|
|
#include <stagefright/foundation/AMessage.h>
|
|
#include <stagefright/MediaExtractor.h>
|
|
#include <stagefright/MetaData.h>
|
|
#include <stagefright/OMXClient.h>
|
|
#include <stagefright/OMXCodec.h>
|
|
#include <OMX.h>
|
|
#if MOZ_WIDGET_GONK && ANDROID_VERSION >= 17
|
|
#include <ui/Fence.h>
|
|
#endif
|
|
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
#include <gui/Surface.h>
|
|
#else
|
|
#include <gui/SurfaceTextureClient.h>
|
|
#endif
|
|
|
|
#include "mozilla/layers/GrallocTextureClient.h"
|
|
#include "mozilla/layers/TextureClient.h"
|
|
#include "mozilla/Preferences.h"
|
|
#include "mozilla/Types.h"
|
|
#include "mozilla/Monitor.h"
|
|
#include "nsMimeTypes.h"
|
|
#include "MPAPI.h"
|
|
#include "mozilla/Logging.h"
|
|
|
|
#include "GonkNativeWindow.h"
|
|
#include "OMXCodecProxy.h"
|
|
#include "OmxDecoder.h"
|
|
|
|
#include <android/log.h>
|
|
#define OD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "OmxDecoder", __VA_ARGS__)
|
|
|
|
#undef LOG
|
|
mozilla::LazyLogModule gOmxDecoderLog("OmxDecoder");
|
|
#define LOG(type, msg...) MOZ_LOG(gOmxDecoderLog, type, (msg))
|
|
|
|
using namespace MPAPI;
|
|
using namespace mozilla;
|
|
using namespace mozilla::gfx;
|
|
using namespace mozilla::layers;
|
|
using namespace android;
|
|
|
|
OmxDecoder::OmxDecoder(AbstractMediaDecoder *aDecoder,
|
|
mozilla::TaskQueue* aTaskQueue) :
|
|
mDecoder(aDecoder),
|
|
mDisplayWidth(0),
|
|
mDisplayHeight(0),
|
|
mVideoWidth(0),
|
|
mVideoHeight(0),
|
|
mVideoColorFormat(0),
|
|
mVideoStride(0),
|
|
mVideoSliceHeight(0),
|
|
mVideoRotation(0),
|
|
mAudioChannels(-1),
|
|
mAudioSampleRate(-1),
|
|
mDurationUs(-1),
|
|
mLastSeekTime(-1),
|
|
mVideoBuffer(nullptr),
|
|
mAudioBuffer(nullptr),
|
|
mIsVideoSeeking(false),
|
|
mAudioMetadataRead(false),
|
|
mTaskQueue(aTaskQueue),
|
|
mAudioPaused(false),
|
|
mVideoPaused(false)
|
|
{
|
|
mLooper = new ALooper;
|
|
mLooper->setName("OmxDecoder");
|
|
|
|
mReflector = new AHandlerReflector<OmxDecoder>(this);
|
|
// Register AMessage handler to ALooper.
|
|
mLooper->registerHandler(mReflector);
|
|
// Start ALooper thread.
|
|
mLooper->start();
|
|
}
|
|
|
|
OmxDecoder::~OmxDecoder()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
ReleaseMediaResources();
|
|
|
|
// unregister AMessage handler from ALooper.
|
|
mLooper->unregisterHandler(mReflector->id());
|
|
// Stop ALooper thread.
|
|
mLooper->stop();
|
|
}
|
|
|
|
static sp<IOMX> sOMX = nullptr;
|
|
static sp<IOMX> GetOMX()
|
|
{
|
|
if(sOMX.get() == nullptr) {
|
|
sOMX = new OMX;
|
|
}
|
|
return sOMX;
|
|
}
|
|
|
|
bool
|
|
OmxDecoder::Init(sp<MediaExtractor>& extractor) {
|
|
sp<MetaData> meta = extractor->getMetaData();
|
|
|
|
ssize_t audioTrackIndex = -1;
|
|
ssize_t videoTrackIndex = -1;
|
|
|
|
for (size_t i = 0; i < extractor->countTracks(); ++i) {
|
|
sp<MetaData> meta = extractor->getTrackMetaData(i);
|
|
|
|
int32_t bitRate;
|
|
if (!meta->findInt32(kKeyBitRate, &bitRate))
|
|
bitRate = 0;
|
|
|
|
const char *mime;
|
|
if (!meta->findCString(kKeyMIMEType, &mime)) {
|
|
continue;
|
|
}
|
|
|
|
if (videoTrackIndex == -1 && !strncasecmp(mime, "video/", 6)) {
|
|
videoTrackIndex = i;
|
|
} else if (audioTrackIndex == -1 && !strncasecmp(mime, "audio/", 6)) {
|
|
audioTrackIndex = i;
|
|
}
|
|
}
|
|
|
|
if (videoTrackIndex == -1 && audioTrackIndex == -1) {
|
|
NS_WARNING("OMX decoder could not find video or audio tracks");
|
|
return false;
|
|
}
|
|
|
|
if (videoTrackIndex != -1 && mDecoder->GetImageContainer()) {
|
|
mVideoTrack = extractor->getTrack(videoTrackIndex);
|
|
}
|
|
|
|
if (audioTrackIndex != -1) {
|
|
mAudioTrack = extractor->getTrack(audioTrackIndex);
|
|
|
|
#ifdef MOZ_AUDIO_OFFLOAD
|
|
// mAudioTrack is be used by OMXCodec. For offloaded audio track, using same
|
|
// object gives undetermined behavior. So get a new track
|
|
mAudioOffloadTrack = extractor->getTrack(audioTrackIndex);
|
|
#endif
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
OmxDecoder::EnsureMetadata() {
|
|
// calculate duration
|
|
int64_t totalDurationUs = 0;
|
|
int64_t durationUs = 0;
|
|
if (mVideoTrack.get() && mVideoTrack->getFormat()->findInt64(kKeyDuration, &durationUs)) {
|
|
if (durationUs > totalDurationUs)
|
|
totalDurationUs = durationUs;
|
|
}
|
|
if (mAudioTrack.get()) {
|
|
durationUs = -1;
|
|
sp<MetaData> meta = mAudioTrack->getFormat();
|
|
|
|
if ((durationUs == -1) && meta->findInt64(kKeyDuration, &durationUs)) {
|
|
if (durationUs > totalDurationUs) {
|
|
totalDurationUs = durationUs;
|
|
}
|
|
}
|
|
}
|
|
mDurationUs = totalDurationUs;
|
|
|
|
// read video metadata
|
|
if (mVideoSource.get() && !SetVideoFormat()) {
|
|
NS_WARNING("Couldn't set OMX video format");
|
|
return false;
|
|
}
|
|
|
|
// read audio metadata
|
|
if (mAudioSource.get()) {
|
|
// To reliably get the channel and sample rate data we need to read from the
|
|
// audio source until we get a INFO_FORMAT_CHANGE status
|
|
status_t err = mAudioSource->read(&mAudioBuffer);
|
|
if (err != INFO_FORMAT_CHANGED) {
|
|
if (err != OK) {
|
|
NS_WARNING("Couldn't read audio buffer from OMX decoder");
|
|
return false;
|
|
}
|
|
sp<MetaData> meta = mAudioSource->getFormat();
|
|
if (!meta->findInt32(kKeyChannelCount, &mAudioChannels) ||
|
|
!meta->findInt32(kKeySampleRate, &mAudioSampleRate)) {
|
|
NS_WARNING("Couldn't get audio metadata from OMX decoder");
|
|
return false;
|
|
}
|
|
mAudioMetadataRead = true;
|
|
}
|
|
else if (!SetAudioFormat()) {
|
|
NS_WARNING("Couldn't set audio format");
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
static bool isInEmulator()
|
|
{
|
|
char propQemu[PROPERTY_VALUE_MAX];
|
|
property_get("ro.kernel.qemu", propQemu, "");
|
|
return !strncmp(propQemu, "1", 1);
|
|
}
|
|
|
|
RefPtr<mozilla::MediaOmxCommonReader::MediaResourcePromise>
|
|
OmxDecoder::AllocateMediaResources()
|
|
{
|
|
RefPtr<MediaResourcePromise> p = mMediaResourcePromise.Ensure(__func__);
|
|
|
|
if ((mVideoTrack != nullptr) && (mVideoSource == nullptr)) {
|
|
// OMXClient::connect() always returns OK and abort's fatally if
|
|
// it can't connect.
|
|
OMXClient client;
|
|
DebugOnly<status_t> err = client.connect();
|
|
NS_ASSERTION(err == OK, "Failed to connect to OMX in mediaserver.");
|
|
sp<IOMX> omx = client.interface();
|
|
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 21
|
|
sp<IGraphicBufferProducer> producer;
|
|
sp<IGonkGraphicBufferConsumer> consumer;
|
|
GonkBufferQueue::createBufferQueue(&producer, &consumer);
|
|
mNativeWindow = new GonkNativeWindow(consumer);
|
|
#else
|
|
mNativeWindow = new GonkNativeWindow();
|
|
#endif
|
|
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 21
|
|
mNativeWindowClient = new Surface(producer);
|
|
#elif defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
mNativeWindowClient = new Surface(mNativeWindow->getBufferQueue());
|
|
#else
|
|
mNativeWindowClient = new SurfaceTextureClient(mNativeWindow);
|
|
#endif
|
|
|
|
// Experience with OMX codecs is that only the HW decoders are
|
|
// worth bothering with, at least on the platforms where this code
|
|
// is currently used, and for formats this code is currently used
|
|
// for (h.264). So if we don't get a hardware decoder, just give
|
|
// up.
|
|
#ifdef MOZ_OMX_WEBM_DECODER
|
|
int flags = 0;//fallback to omx sw decoder if there is no hw decoder
|
|
#else
|
|
int flags = kHardwareCodecsOnly;
|
|
#endif//MOZ_OMX_WEBM_DECODER
|
|
|
|
if (isInEmulator()) {
|
|
// If we are in emulator, allow to fall back to software.
|
|
flags = 0;
|
|
}
|
|
mVideoSource =
|
|
OMXCodecProxy::Create(omx,
|
|
mVideoTrack->getFormat(),
|
|
false, // decoder
|
|
mVideoTrack,
|
|
nullptr,
|
|
flags,
|
|
mNativeWindowClient);
|
|
if (mVideoSource == nullptr) {
|
|
NS_WARNING("Couldn't create OMX video source");
|
|
mMediaResourcePromise.Reject(true, __func__);
|
|
return p;
|
|
} else {
|
|
sp<OmxDecoder> self = this;
|
|
mVideoCodecRequest.Begin(mVideoSource->requestResource()
|
|
->Then(OwnerThread(), __func__,
|
|
[self] (bool) -> void {
|
|
self->mVideoCodecRequest.Complete();
|
|
self->mMediaResourcePromise.ResolveIfExists(true, __func__);
|
|
}, [self] (bool) -> void {
|
|
self->mVideoCodecRequest.Complete();
|
|
self->mMediaResourcePromise.RejectIfExists(true, __func__);
|
|
}));
|
|
}
|
|
}
|
|
|
|
if ((mAudioTrack != nullptr) && (mAudioSource == nullptr)) {
|
|
// OMXClient::connect() always returns OK and abort's fatally if
|
|
// it can't connect.
|
|
OMXClient client;
|
|
DebugOnly<status_t> err = client.connect();
|
|
NS_ASSERTION(err == OK, "Failed to connect to OMX in mediaserver.");
|
|
sp<IOMX> omx = client.interface();
|
|
|
|
const char *audioMime = nullptr;
|
|
sp<MetaData> meta = mAudioTrack->getFormat();
|
|
if (!meta->findCString(kKeyMIMEType, &audioMime)) {
|
|
mMediaResourcePromise.Reject(true, __func__);
|
|
return p;
|
|
}
|
|
if (!strcasecmp(audioMime, "audio/raw")) {
|
|
mAudioSource = mAudioTrack;
|
|
} else {
|
|
// try to load hardware codec in mediaserver process.
|
|
int flags = kHardwareCodecsOnly;
|
|
mAudioSource = OMXCodec::Create(omx,
|
|
mAudioTrack->getFormat(),
|
|
false, // decoder
|
|
mAudioTrack,
|
|
nullptr,
|
|
flags);
|
|
}
|
|
|
|
if (mAudioSource == nullptr) {
|
|
// try to load software codec in this process.
|
|
int flags = kSoftwareCodecsOnly;
|
|
mAudioSource = OMXCodec::Create(GetOMX(),
|
|
mAudioTrack->getFormat(),
|
|
false, // decoder
|
|
mAudioTrack,
|
|
nullptr,
|
|
flags);
|
|
if (mAudioSource == nullptr) {
|
|
NS_WARNING("Couldn't create OMX audio source");
|
|
mMediaResourcePromise.Reject(true, __func__);
|
|
return p;
|
|
}
|
|
}
|
|
if (mAudioSource->start() != OK) {
|
|
NS_WARNING("Couldn't start OMX audio source");
|
|
mAudioSource.clear();
|
|
mMediaResourcePromise.Reject(true, __func__);
|
|
return p;
|
|
}
|
|
}
|
|
if (!mVideoSource.get()) {
|
|
// No resource allocation wait.
|
|
mMediaResourcePromise.Resolve(true, __func__);
|
|
}
|
|
return p;
|
|
}
|
|
|
|
|
|
void
|
|
OmxDecoder::ReleaseMediaResources() {
|
|
mVideoCodecRequest.DisconnectIfExists();
|
|
mMediaResourcePromise.RejectIfExists(true, __func__);
|
|
|
|
ReleaseVideoBuffer();
|
|
ReleaseAudioBuffer();
|
|
|
|
{
|
|
Mutex::Autolock autoLock(mPendingVideoBuffersLock);
|
|
MOZ_ASSERT(mPendingRecycleTexutreClients.empty());
|
|
// Release all pending recycle TextureClients, if they are not recycled yet.
|
|
// This should not happen. See Bug 1042308.
|
|
if (!mPendingRecycleTexutreClients.empty()) {
|
|
printf_stderr("OmxDecoder::ReleaseMediaResources -- TextureClients are not recycled yet\n");
|
|
for (std::set<TextureClient*>::iterator it=mPendingRecycleTexutreClients.begin();
|
|
it!=mPendingRecycleTexutreClients.end(); it++)
|
|
{
|
|
GrallocTextureData* client = static_cast<GrallocTextureData*>((*it)->GetInternalData());
|
|
(*it)->ClearRecycleCallback();
|
|
if (client->GetMediaBuffer()) {
|
|
mPendingVideoBuffers.push(BufferItem(client->GetMediaBuffer(), (*it)->GetAndResetReleaseFenceHandle()));
|
|
}
|
|
}
|
|
mPendingRecycleTexutreClients.clear();
|
|
}
|
|
}
|
|
|
|
{
|
|
// Free all pending video buffers.
|
|
Mutex::Autolock autoLock(mSeekLock);
|
|
ReleaseAllPendingVideoBuffersLocked();
|
|
}
|
|
|
|
if (mVideoSource.get()) {
|
|
mVideoSource->stop();
|
|
mVideoSource.clear();
|
|
}
|
|
|
|
if (mAudioSource.get()) {
|
|
mAudioSource->stop();
|
|
mAudioSource.clear();
|
|
}
|
|
|
|
mNativeWindowClient.clear();
|
|
mNativeWindow.clear();
|
|
|
|
// Reset this variable to make the first seek go to the previous keyframe
|
|
// when resuming
|
|
mLastSeekTime = -1;
|
|
}
|
|
|
|
bool
|
|
OmxDecoder::SetVideoFormat() {
|
|
const char *componentName;
|
|
|
|
if (!mVideoSource->getFormat()->findInt32(kKeyWidth, &mVideoWidth) ||
|
|
!mVideoSource->getFormat()->findInt32(kKeyHeight, &mVideoHeight) ||
|
|
!mVideoSource->getFormat()->findCString(kKeyDecoderComponent, &componentName) ||
|
|
!mVideoSource->getFormat()->findInt32(kKeyColorFormat, &mVideoColorFormat) ) {
|
|
return false;
|
|
}
|
|
|
|
if (!mVideoTrack.get() || !mVideoTrack->getFormat()->findInt32(kKeyDisplayWidth, &mDisplayWidth)) {
|
|
mDisplayWidth = mVideoWidth;
|
|
NS_WARNING("display width not available, assuming width");
|
|
}
|
|
|
|
if (!mVideoTrack.get() || !mVideoTrack->getFormat()->findInt32(kKeyDisplayHeight, &mDisplayHeight)) {
|
|
mDisplayHeight = mVideoHeight;
|
|
NS_WARNING("display height not available, assuming height");
|
|
}
|
|
|
|
if (!mVideoSource->getFormat()->findInt32(kKeyStride, &mVideoStride)) {
|
|
mVideoStride = mVideoWidth;
|
|
NS_WARNING("stride not available, assuming width");
|
|
}
|
|
|
|
if (!mVideoSource->getFormat()->findInt32(kKeySliceHeight, &mVideoSliceHeight)) {
|
|
mVideoSliceHeight = mVideoHeight;
|
|
NS_WARNING("slice height not available, assuming height");
|
|
}
|
|
|
|
// Since ICS, valid video side is caluculated from kKeyCropRect.
|
|
// kKeyWidth means decoded video buffer width.
|
|
// kKeyHeight means decoded video buffer height.
|
|
// On some hardwares, decoded video buffer and valid video size are different.
|
|
int32_t crop_left, crop_top, crop_right, crop_bottom;
|
|
if (mVideoSource->getFormat()->findRect(kKeyCropRect,
|
|
&crop_left,
|
|
&crop_top,
|
|
&crop_right,
|
|
&crop_bottom)) {
|
|
mVideoWidth = crop_right - crop_left + 1;
|
|
mVideoHeight = crop_bottom - crop_top + 1;
|
|
}
|
|
|
|
if (!mVideoSource->getFormat()->findInt32(kKeyRotation, &mVideoRotation)) {
|
|
mVideoRotation = 0;
|
|
NS_WARNING("rotation not available, assuming 0");
|
|
}
|
|
|
|
LOG(LogLevel::Debug, "display width: %d display height %d width: %d height: %d component: %s format: %d stride: %d sliceHeight: %d rotation: %d",
|
|
mDisplayWidth, mDisplayHeight, mVideoWidth, mVideoHeight, componentName,
|
|
mVideoColorFormat, mVideoStride, mVideoSliceHeight, mVideoRotation);
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
OmxDecoder::SetAudioFormat() {
|
|
// If the format changed, update our cached info.
|
|
if (!mAudioSource->getFormat()->findInt32(kKeyChannelCount, &mAudioChannels) ||
|
|
!mAudioSource->getFormat()->findInt32(kKeySampleRate, &mAudioSampleRate)) {
|
|
return false;
|
|
}
|
|
|
|
LOG(LogLevel::Debug, "channelCount: %d sampleRate: %d",
|
|
mAudioChannels, mAudioSampleRate);
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
OmxDecoder::ReleaseDecoder()
|
|
{
|
|
mDecoder = nullptr;
|
|
}
|
|
|
|
void
|
|
OmxDecoder::ReleaseVideoBuffer() {
|
|
if (mVideoBuffer) {
|
|
mVideoBuffer->release();
|
|
mVideoBuffer = nullptr;
|
|
}
|
|
}
|
|
|
|
void
|
|
OmxDecoder::ReleaseAudioBuffer() {
|
|
if (mAudioBuffer) {
|
|
mAudioBuffer->release();
|
|
mAudioBuffer = nullptr;
|
|
}
|
|
}
|
|
|
|
void
|
|
OmxDecoder::PlanarYUV420Frame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
|
|
void *y = aData;
|
|
void *u = static_cast<uint8_t *>(y) + mVideoStride * mVideoSliceHeight;
|
|
void *v = static_cast<uint8_t *>(u) + mVideoStride/2 * mVideoSliceHeight/2;
|
|
|
|
aFrame->Set(aTimeUs, aKeyFrame,
|
|
aData, aSize, mVideoStride, mVideoSliceHeight, mVideoRotation,
|
|
y, mVideoStride, mVideoWidth, mVideoHeight, 0, 0,
|
|
u, mVideoStride/2, mVideoWidth/2, mVideoHeight/2, 0, 0,
|
|
v, mVideoStride/2, mVideoWidth/2, mVideoHeight/2, 0, 0);
|
|
}
|
|
|
|
void
|
|
OmxDecoder::CbYCrYFrame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
|
|
aFrame->Set(aTimeUs, aKeyFrame,
|
|
aData, aSize, mVideoStride, mVideoSliceHeight, mVideoRotation,
|
|
aData, mVideoStride, mVideoWidth, mVideoHeight, 1, 1,
|
|
aData, mVideoStride, mVideoWidth/2, mVideoHeight/2, 0, 3,
|
|
aData, mVideoStride, mVideoWidth/2, mVideoHeight/2, 2, 3);
|
|
}
|
|
|
|
void
|
|
OmxDecoder::SemiPlanarYUV420Frame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
|
|
void *y = aData;
|
|
void *uv = static_cast<uint8_t *>(y) + (mVideoStride * mVideoSliceHeight);
|
|
|
|
aFrame->Set(aTimeUs, aKeyFrame,
|
|
aData, aSize, mVideoStride, mVideoSliceHeight, mVideoRotation,
|
|
y, mVideoStride, mVideoWidth, mVideoHeight, 0, 0,
|
|
uv, mVideoStride, mVideoWidth/2, mVideoHeight/2, 0, 1,
|
|
uv, mVideoStride, mVideoWidth/2, mVideoHeight/2, 1, 1);
|
|
}
|
|
|
|
void
|
|
OmxDecoder::SemiPlanarYVU420Frame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
|
|
SemiPlanarYUV420Frame(aFrame, aTimeUs, aData, aSize, aKeyFrame);
|
|
aFrame->Cb.mOffset = 1;
|
|
aFrame->Cr.mOffset = 0;
|
|
}
|
|
|
|
bool
|
|
OmxDecoder::ToVideoFrame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
|
|
const int OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00;
|
|
|
|
aFrame->mGraphicBuffer = nullptr;
|
|
|
|
switch (mVideoColorFormat) {
|
|
case OMX_COLOR_FormatYUV420Planar:
|
|
PlanarYUV420Frame(aFrame, aTimeUs, aData, aSize, aKeyFrame);
|
|
break;
|
|
case OMX_COLOR_FormatCbYCrY:
|
|
CbYCrYFrame(aFrame, aTimeUs, aData, aSize, aKeyFrame);
|
|
break;
|
|
case OMX_COLOR_FormatYUV420SemiPlanar:
|
|
SemiPlanarYUV420Frame(aFrame, aTimeUs, aData, aSize, aKeyFrame);
|
|
break;
|
|
case OMX_QCOM_COLOR_FormatYVU420SemiPlanar:
|
|
SemiPlanarYVU420Frame(aFrame, aTimeUs, aData, aSize, aKeyFrame);
|
|
break;
|
|
default:
|
|
LOG(LogLevel::Debug, "Unknown video color format %08x", mVideoColorFormat);
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
OmxDecoder::ToAudioFrame(AudioFrame *aFrame, int64_t aTimeUs, void *aData, size_t aDataOffset, size_t aSize, int32_t aAudioChannels, int32_t aAudioSampleRate)
|
|
{
|
|
aFrame->Set(aTimeUs, static_cast<char *>(aData) + aDataOffset, aSize, aAudioChannels, aAudioSampleRate);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
OmxDecoder::ReadVideo(VideoFrame *aFrame, int64_t aTimeUs,
|
|
bool aKeyframeSkip, bool aDoSeek)
|
|
{
|
|
if (!mVideoSource.get())
|
|
return false;
|
|
|
|
ReleaseVideoBuffer();
|
|
|
|
status_t err;
|
|
|
|
if (aDoSeek) {
|
|
{
|
|
Mutex::Autolock autoLock(mSeekLock);
|
|
ReleaseAllPendingVideoBuffersLocked();
|
|
mIsVideoSeeking = true;
|
|
}
|
|
MediaSource::ReadOptions options;
|
|
MediaSource::ReadOptions::SeekMode seekMode;
|
|
// If the last timestamp of decoded frame is smaller than seekTime,
|
|
// seek to next key frame. Otherwise seek to the previos one.
|
|
OD_LOG("SeekTime: %lld, mLastSeekTime:%lld", aTimeUs, mLastSeekTime);
|
|
if (mLastSeekTime == -1 || mLastSeekTime > aTimeUs) {
|
|
seekMode = MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC;
|
|
} else {
|
|
seekMode = MediaSource::ReadOptions::SEEK_NEXT_SYNC;
|
|
}
|
|
mLastSeekTime = aTimeUs;
|
|
bool findNextBuffer = true;
|
|
while (findNextBuffer) {
|
|
options.setSeekTo(aTimeUs, seekMode);
|
|
findNextBuffer = false;
|
|
if (mIsVideoSeeking) {
|
|
err = mVideoSource->read(&mVideoBuffer, &options);
|
|
Mutex::Autolock autoLock(mSeekLock);
|
|
mIsVideoSeeking = false;
|
|
PostReleaseVideoBuffer(nullptr, FenceHandle());
|
|
}
|
|
else {
|
|
err = mVideoSource->read(&mVideoBuffer);
|
|
}
|
|
|
|
// If there is no next Keyframe, jump to the previous key frame.
|
|
if (err == ERROR_END_OF_STREAM && seekMode == MediaSource::ReadOptions::SEEK_NEXT_SYNC) {
|
|
seekMode = MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC;
|
|
findNextBuffer = true;
|
|
{
|
|
Mutex::Autolock autoLock(mSeekLock);
|
|
mIsVideoSeeking = true;
|
|
}
|
|
continue;
|
|
} else if (err != OK) {
|
|
OD_LOG("Unexpected error when seeking to %lld", aTimeUs);
|
|
break;
|
|
}
|
|
// For some codecs, the length of first decoded frame after seek is 0.
|
|
// Need to ignore it and continue to find the next one
|
|
if (mVideoBuffer->range_length() == 0) {
|
|
PostReleaseVideoBuffer(mVideoBuffer, FenceHandle());
|
|
findNextBuffer = true;
|
|
}
|
|
}
|
|
aDoSeek = false;
|
|
} else {
|
|
err = mVideoSource->read(&mVideoBuffer);
|
|
}
|
|
|
|
aFrame->mSize = 0;
|
|
|
|
if (err == OK) {
|
|
int64_t timeUs;
|
|
int32_t unreadable;
|
|
int32_t keyFrame;
|
|
|
|
size_t length = mVideoBuffer->range_length();
|
|
|
|
if (!mVideoBuffer->meta_data()->findInt64(kKeyTime, &timeUs) ) {
|
|
NS_WARNING("OMX decoder did not return frame time");
|
|
return false;
|
|
}
|
|
|
|
if (!mVideoBuffer->meta_data()->findInt32(kKeyIsSyncFrame, &keyFrame)) {
|
|
keyFrame = 0;
|
|
}
|
|
|
|
if (!mVideoBuffer->meta_data()->findInt32(kKeyIsUnreadable, &unreadable)) {
|
|
unreadable = 0;
|
|
}
|
|
|
|
RefPtr<mozilla::layers::TextureClient> textureClient;
|
|
if ((mVideoBuffer->graphicBuffer().get())) {
|
|
textureClient = mNativeWindow->getTextureClientFromBuffer(mVideoBuffer->graphicBuffer().get());
|
|
}
|
|
|
|
if (textureClient) {
|
|
// Manually increment reference count to keep MediaBuffer alive
|
|
// during TextureClient is in use.
|
|
mVideoBuffer->add_ref();
|
|
static_cast<GrallocTextureData*>(textureClient->GetInternalData())->SetMediaBuffer(mVideoBuffer);
|
|
// Set recycle callback for TextureClient
|
|
textureClient->SetRecycleCallback(OmxDecoder::RecycleCallback, this);
|
|
{
|
|
Mutex::Autolock autoLock(mPendingVideoBuffersLock);
|
|
// Store pending recycle TextureClient.
|
|
MOZ_ASSERT(mPendingRecycleTexutreClients.find(textureClient) == mPendingRecycleTexutreClients.end());
|
|
mPendingRecycleTexutreClients.insert(textureClient);
|
|
}
|
|
|
|
aFrame->mGraphicBuffer = textureClient;
|
|
aFrame->mRotation = mVideoRotation;
|
|
aFrame->mTimeUs = timeUs;
|
|
aFrame->mKeyFrame = keyFrame;
|
|
aFrame->Y.mWidth = mVideoWidth;
|
|
aFrame->Y.mHeight = mVideoHeight;
|
|
// Release to hold video buffer in OmxDecoder more.
|
|
// MediaBuffer's ref count is changed from 2 to 1.
|
|
ReleaseVideoBuffer();
|
|
} else if (length > 0) {
|
|
char *data = static_cast<char *>(mVideoBuffer->data()) + mVideoBuffer->range_offset();
|
|
|
|
if (unreadable) {
|
|
LOG(LogLevel::Debug, "video frame is unreadable");
|
|
}
|
|
|
|
if (!ToVideoFrame(aFrame, timeUs, data, length, keyFrame)) {
|
|
return false;
|
|
}
|
|
}
|
|
// Check if this frame is valid or not. If not, skip it.
|
|
if ((aKeyframeSkip && timeUs < aTimeUs) || length == 0) {
|
|
aFrame->mShouldSkip = true;
|
|
}
|
|
}
|
|
else if (err == INFO_FORMAT_CHANGED) {
|
|
// If the format changed, update our cached info.
|
|
if (!SetVideoFormat()) {
|
|
return false;
|
|
} else {
|
|
return ReadVideo(aFrame, aTimeUs, aKeyframeSkip, aDoSeek);
|
|
}
|
|
}
|
|
else if (err == ERROR_END_OF_STREAM) {
|
|
return false;
|
|
}
|
|
else if (err == -ETIMEDOUT) {
|
|
LOG(LogLevel::Debug, "OmxDecoder::ReadVideo timed out, will retry");
|
|
return true;
|
|
}
|
|
else {
|
|
// UNKNOWN_ERROR is sometimes is used to mean "out of memory", but
|
|
// regardless, don't keep trying to decode if the decoder doesn't want to.
|
|
LOG(LogLevel::Debug, "OmxDecoder::ReadVideo failed, err=%d", err);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
OmxDecoder::ReadAudio(AudioFrame *aFrame, int64_t aSeekTimeUs)
|
|
{
|
|
status_t err;
|
|
|
|
if (mAudioMetadataRead && aSeekTimeUs == -1) {
|
|
// Use the data read into the buffer during metadata time
|
|
err = OK;
|
|
}
|
|
else {
|
|
ReleaseAudioBuffer();
|
|
if (aSeekTimeUs != -1) {
|
|
MediaSource::ReadOptions options;
|
|
options.setSeekTo(aSeekTimeUs);
|
|
err = mAudioSource->read(&mAudioBuffer, &options);
|
|
} else {
|
|
err = mAudioSource->read(&mAudioBuffer);
|
|
}
|
|
}
|
|
mAudioMetadataRead = false;
|
|
|
|
aSeekTimeUs = -1;
|
|
aFrame->mSize = 0;
|
|
|
|
if (err == OK && mAudioBuffer && mAudioBuffer->range_length() != 0) {
|
|
int64_t timeUs;
|
|
if (!mAudioBuffer->meta_data()->findInt64(kKeyTime, &timeUs))
|
|
return false;
|
|
|
|
return ToAudioFrame(aFrame, timeUs,
|
|
mAudioBuffer->data(),
|
|
mAudioBuffer->range_offset(),
|
|
mAudioBuffer->range_length(),
|
|
mAudioChannels, mAudioSampleRate);
|
|
}
|
|
else if (err == INFO_FORMAT_CHANGED) {
|
|
// If the format changed, update our cached info.
|
|
if (!SetAudioFormat()) {
|
|
return false;
|
|
} else {
|
|
return ReadAudio(aFrame, aSeekTimeUs);
|
|
}
|
|
}
|
|
else if (err == ERROR_END_OF_STREAM) {
|
|
if (aFrame->mSize == 0) {
|
|
return false;
|
|
}
|
|
}
|
|
else if (err == -ETIMEDOUT) {
|
|
LOG(LogLevel::Debug, "OmxDecoder::ReadAudio timed out, will retry");
|
|
return true;
|
|
}
|
|
else if (err != OK) {
|
|
LOG(LogLevel::Debug, "OmxDecoder::ReadAudio failed, err=%d", err);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
nsresult
|
|
OmxDecoder::Play()
|
|
{
|
|
if (!mVideoPaused && !mAudioPaused) {
|
|
return NS_OK;
|
|
}
|
|
|
|
if (mVideoPaused && mVideoSource.get() && mVideoSource->start() != OK) {
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
mVideoPaused = false;
|
|
|
|
if (mAudioPaused && mAudioSource.get() && mAudioSource->start() != OK) {
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
mAudioPaused = false;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
// AOSP didn't give implementation on OMXCodec::Pause() and not define
|
|
// OMXCodec::Start() should be called for resuming the decoding. Currently
|
|
// it is customized by a specific open source repository only.
|
|
// ToDo The one not supported OMXCodec::Pause() should return error code here,
|
|
// so OMXCodec::Start() doesn't be called again for resuming. But if someone
|
|
// implement the OMXCodec::Pause() and need a following OMXCodec::Read() with
|
|
// seek option (define in MediaSource.h) then it is still not supported here.
|
|
// We need to fix it until it is really happened.
|
|
void
|
|
OmxDecoder::Pause()
|
|
{
|
|
/* The implementation of OMXCodec::pause is flawed.
|
|
* OMXCodec::start will not restore from the paused state and result in
|
|
* buffer timeout which causes timeouts in mochitests.
|
|
* Since there is not power consumption problem in emulator, we will just
|
|
* return when running in emulator to fix timeouts in mochitests.
|
|
*/
|
|
if (isInEmulator()) {
|
|
return;
|
|
}
|
|
|
|
if (mVideoPaused || mAudioPaused) {
|
|
return;
|
|
}
|
|
|
|
if (mVideoSource.get() && mVideoSource->pause() == OK) {
|
|
mVideoPaused = true;
|
|
}
|
|
|
|
if (mAudioSource.get() && mAudioSource->pause() == OK) {
|
|
mAudioPaused = true;
|
|
}
|
|
}
|
|
|
|
// Called on ALooper thread.
|
|
void
|
|
OmxDecoder::onMessageReceived(const sp<AMessage> &msg)
|
|
{
|
|
switch (msg->what()) {
|
|
case kNotifyPostReleaseVideoBuffer:
|
|
{
|
|
Mutex::Autolock autoLock(mSeekLock);
|
|
// Free pending video buffers when OmxDecoder is not seeking video.
|
|
// If OmxDecoder is seeking video, the buffers are freed on seek exit.
|
|
if (!mIsVideoSeeking) {
|
|
ReleaseAllPendingVideoBuffersLocked();
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
TRESPASS();
|
|
break;
|
|
}
|
|
}
|
|
|
|
void
|
|
OmxDecoder::PostReleaseVideoBuffer(MediaBuffer *aBuffer, const FenceHandle& aReleaseFenceHandle)
|
|
{
|
|
{
|
|
Mutex::Autolock autoLock(mPendingVideoBuffersLock);
|
|
if (aBuffer) {
|
|
mPendingVideoBuffers.push(BufferItem(aBuffer, aReleaseFenceHandle));
|
|
}
|
|
}
|
|
|
|
sp<AMessage> notify =
|
|
new AMessage(kNotifyPostReleaseVideoBuffer, mReflector->id());
|
|
// post AMessage to OmxDecoder via ALooper.
|
|
notify->post();
|
|
}
|
|
|
|
void
|
|
OmxDecoder::ReleaseAllPendingVideoBuffersLocked()
|
|
{
|
|
Vector<BufferItem> releasingVideoBuffers;
|
|
{
|
|
Mutex::Autolock autoLock(mPendingVideoBuffersLock);
|
|
|
|
int size = mPendingVideoBuffers.size();
|
|
for (int i = 0; i < size; i++) {
|
|
releasingVideoBuffers.push(mPendingVideoBuffers[i]);
|
|
}
|
|
mPendingVideoBuffers.clear();
|
|
}
|
|
// Free all pending video buffers without holding mPendingVideoBuffersLock.
|
|
int size = releasingVideoBuffers.size();
|
|
for (int i = 0; i < size; i++) {
|
|
MediaBuffer *buffer;
|
|
buffer = releasingVideoBuffers[i].mMediaBuffer;
|
|
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
|
|
RefPtr<FenceHandle::FdObj> fdObj = releasingVideoBuffers.editItemAt(i).mReleaseFenceHandle.GetAndResetFdObj();
|
|
int fenceFd = fdObj->GetAndResetFd();
|
|
|
|
MOZ_ASSERT(buffer->refcount() == 1);
|
|
// This code expect MediaBuffer's ref count is 1.
|
|
// Return gralloc buffer to ANativeWindow
|
|
ANativeWindow* window = static_cast<ANativeWindow*>(mNativeWindowClient.get());
|
|
window->cancelBuffer(window,
|
|
buffer->graphicBuffer().get(),
|
|
fenceFd);
|
|
// Mark MediaBuffer as rendered.
|
|
// When gralloc buffer is directly returned to ANativeWindow,
|
|
// this mark is necesary.
|
|
sp<MetaData> metaData = buffer->meta_data();
|
|
metaData->setInt32(kKeyRendered, 1);
|
|
#endif
|
|
// Return MediaBuffer to OMXCodec.
|
|
buffer->release();
|
|
}
|
|
releasingVideoBuffers.clear();
|
|
}
|
|
|
|
void
|
|
OmxDecoder::RecycleCallbackImp(TextureClient* aClient)
|
|
{
|
|
aClient->ClearRecycleCallback();
|
|
{
|
|
Mutex::Autolock autoLock(mPendingVideoBuffersLock);
|
|
if (mPendingRecycleTexutreClients.find(aClient) == mPendingRecycleTexutreClients.end()) {
|
|
printf_stderr("OmxDecoder::RecycleCallbackImp -- TextureClient is not pending recycle\n");
|
|
return;
|
|
}
|
|
mPendingRecycleTexutreClients.erase(aClient);
|
|
GrallocTextureData* grallocData = static_cast<GrallocTextureData*>(aClient->GetInternalData());
|
|
if (grallocData->GetMediaBuffer()) {
|
|
mPendingVideoBuffers.push(BufferItem(grallocData->GetMediaBuffer(), aClient->GetAndResetReleaseFenceHandle()));
|
|
}
|
|
}
|
|
sp<AMessage> notify =
|
|
new AMessage(kNotifyPostReleaseVideoBuffer, mReflector->id());
|
|
// post AMessage to OmxDecoder via ALooper.
|
|
notify->post();
|
|
}
|
|
|
|
/* static */ void
|
|
OmxDecoder::RecycleCallback(TextureClient* aClient, void* aClosure)
|
|
{
|
|
MOZ_ASSERT(aClient && !aClient->IsDead());
|
|
OmxDecoder* decoder = static_cast<OmxDecoder*>(aClosure);
|
|
decoder->RecycleCallbackImp(aClient);
|
|
}
|