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)
751 lines
21 KiB
C++
751 lines
21 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: */
|
|
/*
|
|
* Copyright (c) 2014 The Linux Foundation. All rights reserved.
|
|
* Copyright (C) 2009 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "AudioOffloadPlayer.h"
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsITimer.h"
|
|
#include "mozilla/dom/HTMLMediaElement.h"
|
|
#include "VideoUtils.h"
|
|
#include "mozilla/dom/power/PowerManagerService.h"
|
|
#include "mozilla/dom/WakeLock.h"
|
|
|
|
#include <binder/IPCThreadState.h>
|
|
#include <stagefright/foundation/ADebug.h>
|
|
#include <stagefright/foundation/ALooper.h>
|
|
#include <stagefright/MediaDefs.h>
|
|
#include <stagefright/MediaErrors.h>
|
|
#include <stagefright/MediaSource.h>
|
|
#include <stagefright/MetaData.h>
|
|
#include <stagefright/Utils.h>
|
|
#include <AudioTrack.h>
|
|
#include <AudioSystem.h>
|
|
#include <AudioParameter.h>
|
|
#include <hardware/audio.h>
|
|
|
|
using namespace android;
|
|
|
|
namespace mozilla {
|
|
|
|
LazyLogModule gAudioOffloadPlayerLog("AudioOffloadPlayer");
|
|
#define AUDIO_OFFLOAD_LOG(type, msg) \
|
|
MOZ_LOG(gAudioOffloadPlayerLog, type, msg)
|
|
|
|
// maximum time in paused state when offloading audio decompression.
|
|
// When elapsed, the GonkAudioSink is destroyed to allow the audio DSP to power down.
|
|
static const uint64_t OFFLOAD_PAUSE_MAX_MSECS = 60000ll;
|
|
|
|
AudioOffloadPlayer::AudioOffloadPlayer(MediaOmxCommonDecoder* aObserver) :
|
|
mStarted(false),
|
|
mPlaying(false),
|
|
mReachedEOS(false),
|
|
mIsElementVisible(true),
|
|
mSampleRate(0),
|
|
mStartPosUs(0),
|
|
mPositionTimeMediaUs(-1),
|
|
mInputBuffer(nullptr),
|
|
mObserver(aObserver)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
CHECK(aObserver);
|
|
#if ANDROID_VERSION >= 21
|
|
mSessionId = AudioSystem::newAudioUniqueId();
|
|
AudioSystem::acquireAudioSessionId(mSessionId, -1);
|
|
#else
|
|
mSessionId = AudioSystem::newAudioSessionId();
|
|
AudioSystem::acquireAudioSessionId(mSessionId);
|
|
#endif
|
|
mAudioSink = new AudioOutput(mSessionId,
|
|
IPCThreadState::self()->getCallingUid());
|
|
}
|
|
|
|
AudioOffloadPlayer::~AudioOffloadPlayer()
|
|
{
|
|
Reset();
|
|
#if ANDROID_VERSION >= 21
|
|
AudioSystem::releaseAudioSessionId(mSessionId, -1);
|
|
#else
|
|
AudioSystem::releaseAudioSessionId(mSessionId);
|
|
#endif
|
|
}
|
|
|
|
void AudioOffloadPlayer::SetSource(const sp<MediaSource> &aSource)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
CHECK(!mSource.get());
|
|
|
|
mSource = aSource;
|
|
}
|
|
|
|
status_t AudioOffloadPlayer::Start(bool aSourceAlreadyStarted)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
CHECK(!mStarted);
|
|
CHECK(mSource.get());
|
|
|
|
status_t err;
|
|
CHECK(mAudioSink.get());
|
|
|
|
if (!aSourceAlreadyStarted) {
|
|
err = mSource->start();
|
|
|
|
if (err != OK) {
|
|
return err;
|
|
}
|
|
}
|
|
|
|
sp<MetaData> format = mSource->getFormat();
|
|
const char* mime;
|
|
int avgBitRate = -1;
|
|
int32_t channelMask;
|
|
int32_t numChannels;
|
|
int64_t durationUs = -1;
|
|
audio_format_t audioFormat = AUDIO_FORMAT_PCM_16_BIT;
|
|
uint32_t flags = AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD;
|
|
audio_offload_info_t offloadInfo = AUDIO_INFO_INITIALIZER;
|
|
|
|
CHECK(format->findCString(kKeyMIMEType, &mime));
|
|
CHECK(format->findInt32(kKeySampleRate, &mSampleRate));
|
|
CHECK(format->findInt32(kKeyChannelCount, &numChannels));
|
|
format->findInt32(kKeyBitRate, &avgBitRate);
|
|
format->findInt64(kKeyDuration, &durationUs);
|
|
|
|
if(!format->findInt32(kKeyChannelMask, &channelMask)) {
|
|
channelMask = CHANNEL_MASK_USE_CHANNEL_ORDER;
|
|
}
|
|
|
|
if (mapMimeToAudioFormat(audioFormat, mime) != OK) {
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Error, ("Couldn't map mime type \"%s\" to a valid "
|
|
"AudioSystem::audio_format", mime));
|
|
audioFormat = AUDIO_FORMAT_INVALID;
|
|
}
|
|
|
|
offloadInfo.duration_us = durationUs;
|
|
offloadInfo.sample_rate = mSampleRate;
|
|
offloadInfo.channel_mask = channelMask;
|
|
offloadInfo.format = audioFormat;
|
|
offloadInfo.stream_type = AUDIO_STREAM_MUSIC;
|
|
offloadInfo.bit_rate = avgBitRate;
|
|
offloadInfo.has_video = false;
|
|
offloadInfo.is_streaming = false;
|
|
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("isOffloadSupported: SR=%u, CM=0x%x, "
|
|
"Format=0x%x, StreamType=%d, BitRate=%u, duration=%lld us, has_video=%d",
|
|
offloadInfo.sample_rate, offloadInfo.channel_mask, offloadInfo.format,
|
|
offloadInfo.stream_type, offloadInfo.bit_rate, offloadInfo.duration_us,
|
|
offloadInfo.has_video));
|
|
|
|
err = mAudioSink->Open(mSampleRate,
|
|
numChannels,
|
|
channelMask,
|
|
audioFormat,
|
|
&AudioOffloadPlayer::AudioSinkCallback,
|
|
this,
|
|
(audio_output_flags_t) flags,
|
|
&offloadInfo);
|
|
if (err == OK) {
|
|
// If the playback is offloaded to h/w we pass the
|
|
// HAL some metadata information
|
|
// We don't want to do this for PCM because it will be going
|
|
// through the AudioFlinger mixer before reaching the hardware
|
|
SendMetaDataToHal(mAudioSink, format);
|
|
}
|
|
mStarted = true;
|
|
mPlaying = false;
|
|
|
|
return err;
|
|
}
|
|
|
|
status_t AudioOffloadPlayer::ChangeState(MediaDecoder::PlayState aState)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mPlayState = aState;
|
|
|
|
switch (mPlayState) {
|
|
case MediaDecoder::PLAY_STATE_PLAYING: {
|
|
status_t err = Play();
|
|
if (err != OK) {
|
|
return err;
|
|
}
|
|
StartTimeUpdate();
|
|
} break;
|
|
|
|
case MediaDecoder::PLAY_STATE_PAUSED:
|
|
case MediaDecoder::PLAY_STATE_SHUTDOWN:
|
|
// Just pause here during play state shutdown as well to stop playing
|
|
// offload track immediately. Resources will be freed by
|
|
// MediaOmxCommonDecoder
|
|
Pause();
|
|
break;
|
|
|
|
case MediaDecoder::PLAY_STATE_ENDED:
|
|
Pause(true);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
return OK;
|
|
}
|
|
|
|
static void ResetCallback(nsITimer* aTimer, void* aClosure)
|
|
{
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("%s", __FUNCTION__));
|
|
AudioOffloadPlayer* player = static_cast<AudioOffloadPlayer*>(aClosure);
|
|
if (player) {
|
|
player->Reset();
|
|
}
|
|
}
|
|
|
|
void AudioOffloadPlayer::Pause(bool aPlayPendingSamples)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mStarted) {
|
|
CHECK(mAudioSink.get());
|
|
WakeLockCreate();
|
|
|
|
if (aPlayPendingSamples) {
|
|
mAudioSink->Stop();
|
|
} else {
|
|
mAudioSink->Pause();
|
|
}
|
|
mPlaying = false;
|
|
}
|
|
|
|
if (mResetTimer) {
|
|
return;
|
|
}
|
|
mResetTimer = do_CreateInstance("@mozilla.org/timer;1");
|
|
mResetTimer->InitWithFuncCallback(ResetCallback,
|
|
this,
|
|
OFFLOAD_PAUSE_MAX_MSECS,
|
|
nsITimer::TYPE_ONE_SHOT);
|
|
}
|
|
|
|
status_t AudioOffloadPlayer::Play()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mResetTimer) {
|
|
mResetTimer->Cancel();
|
|
mResetTimer = nullptr;
|
|
WakeLockRelease();
|
|
}
|
|
|
|
status_t err = OK;
|
|
|
|
if (!mStarted) {
|
|
// Last pause timed out and offloaded audio sink was reset. Start it again
|
|
err = Start(false);
|
|
if (err != OK) {
|
|
return err;
|
|
}
|
|
// Seek to last play position only when there was no seek during last pause
|
|
android::Mutex::Autolock autoLock(mLock);
|
|
if (!mSeekTarget.IsValid()) {
|
|
mSeekTarget = SeekTarget(mPositionTimeMediaUs,
|
|
SeekTarget::Accurate,
|
|
MediaDecoderEventVisibility::Suppressed);
|
|
DoSeek();
|
|
}
|
|
}
|
|
|
|
if (!mPlaying) {
|
|
CHECK(mAudioSink.get());
|
|
err = mAudioSink->Start();
|
|
if (err == OK) {
|
|
mPlaying = true;
|
|
}
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
void AudioOffloadPlayer::Reset()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (!mStarted) {
|
|
return;
|
|
}
|
|
|
|
CHECK(mAudioSink.get());
|
|
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("reset: mPlaying=%d mReachedEOS=%d",
|
|
mPlaying, mReachedEOS));
|
|
|
|
mAudioSink->Stop();
|
|
// If we're closing and have reached EOS, we don't want to flush
|
|
// the track because if it is offloaded there could be a small
|
|
// amount of residual data in the hardware buffer which we must
|
|
// play to give gapless playback.
|
|
// But if we're resetting when paused or before we've reached EOS
|
|
// we can't be doing a gapless playback and there could be a large
|
|
// amount of data queued in the hardware if the track is offloaded,
|
|
// so we must flush to prevent a track switch being delayed playing
|
|
// the buffered data that we don't want now
|
|
if (!mPlaying || !mReachedEOS) {
|
|
mAudioSink->Flush();
|
|
}
|
|
|
|
mAudioSink->Close();
|
|
// Make sure to release any buffer we hold onto so that the
|
|
// source is able to stop().
|
|
|
|
if (mInputBuffer) {
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("Releasing input buffer"));
|
|
|
|
mInputBuffer->release();
|
|
mInputBuffer = nullptr;
|
|
}
|
|
mSource->stop();
|
|
|
|
IPCThreadState::self()->flushCommands();
|
|
StopTimeUpdate();
|
|
|
|
mReachedEOS = false;
|
|
mStarted = false;
|
|
mPlaying = false;
|
|
mStartPosUs = 0;
|
|
|
|
WakeLockRelease();
|
|
}
|
|
|
|
RefPtr<MediaDecoder::SeekPromise> AudioOffloadPlayer::Seek(SeekTarget aTarget)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
android::Mutex::Autolock autoLock(mLock);
|
|
|
|
mSeekPromise.RejectIfExists(true, __func__);
|
|
mSeekTarget = aTarget;
|
|
RefPtr<MediaDecoder::SeekPromise> p = mSeekPromise.Ensure(__func__);
|
|
DoSeek();
|
|
return p;
|
|
}
|
|
|
|
status_t AudioOffloadPlayer::DoSeek()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mSeekTarget.IsValid());
|
|
CHECK(mAudioSink.get());
|
|
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug,
|
|
("DoSeek ( %lld )", mSeekTarget.GetTime().ToMicroseconds()));
|
|
|
|
mReachedEOS = false;
|
|
mPositionTimeMediaUs = -1;
|
|
mStartPosUs = mSeekTarget.GetTime().ToMicroseconds();
|
|
|
|
if (!mSeekPromise.IsEmpty()) {
|
|
nsCOMPtr<nsIRunnable> nsEvent =
|
|
NS_NewRunnableMethodWithArg<MediaDecoderEventVisibility>(
|
|
mObserver,
|
|
&MediaDecoder::SeekingStarted,
|
|
mSeekTarget.mEventVisibility);
|
|
NS_DispatchToCurrentThread(nsEvent);
|
|
}
|
|
|
|
if (mPlaying) {
|
|
mAudioSink->Pause();
|
|
mAudioSink->Flush();
|
|
mAudioSink->Start();
|
|
|
|
} else {
|
|
if (mStarted) {
|
|
mAudioSink->Flush();
|
|
}
|
|
|
|
if (!mSeekPromise.IsEmpty()) {
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("Fake seek complete during pause"));
|
|
// We do not reset mSeekTarget here.
|
|
MediaDecoder::SeekResolveValue val(mReachedEOS, mSeekTarget.mEventVisibility);
|
|
mSeekPromise.Resolve(val, __func__);
|
|
}
|
|
}
|
|
|
|
return OK;
|
|
}
|
|
|
|
int64_t AudioOffloadPlayer::GetMediaTimeUs()
|
|
{
|
|
android::Mutex::Autolock autoLock(mLock);
|
|
|
|
int64_t playPosition = 0;
|
|
if (mSeekTarget.IsValid()) {
|
|
return mSeekTarget.GetTime().ToMicroseconds();
|
|
}
|
|
if (!mStarted) {
|
|
return mPositionTimeMediaUs;
|
|
}
|
|
|
|
playPosition = GetOutputPlayPositionUs_l();
|
|
if (!mReachedEOS) {
|
|
mPositionTimeMediaUs = playPosition;
|
|
}
|
|
|
|
return mPositionTimeMediaUs;
|
|
}
|
|
|
|
int64_t AudioOffloadPlayer::GetOutputPlayPositionUs_l() const
|
|
{
|
|
CHECK(mAudioSink.get());
|
|
uint32_t playedSamples = 0;
|
|
|
|
mAudioSink->GetPosition(&playedSamples);
|
|
|
|
const int64_t playedUs = (static_cast<int64_t>(playedSamples) * 1000000 ) /
|
|
mSampleRate;
|
|
|
|
// HAL position is relative to the first buffer we sent at mStartPosUs
|
|
const int64_t renderedDuration = mStartPosUs + playedUs;
|
|
return renderedDuration;
|
|
}
|
|
|
|
void AudioOffloadPlayer::NotifyAudioEOS()
|
|
{
|
|
android::Mutex::Autolock autoLock(mLock);
|
|
// We do not reset mSeekTarget here.
|
|
if (!mSeekPromise.IsEmpty()) {
|
|
MediaDecoder::SeekResolveValue val(mReachedEOS, mSeekTarget.mEventVisibility);
|
|
mSeekPromise.Resolve(val, __func__);
|
|
}
|
|
nsCOMPtr<nsIRunnable> nsEvent = NS_NewRunnableMethod(mObserver,
|
|
&MediaDecoder::PlaybackEnded);
|
|
NS_DispatchToMainThread(nsEvent);
|
|
}
|
|
|
|
void AudioOffloadPlayer::NotifyPositionChanged()
|
|
{
|
|
nsCOMPtr<nsIRunnable> nsEvent =
|
|
NS_NewRunnableMethod(mObserver, &MediaOmxCommonDecoder::NotifyOffloadPlayerPositionChanged);
|
|
NS_DispatchToMainThread(nsEvent);
|
|
}
|
|
|
|
void AudioOffloadPlayer::NotifyAudioTearDown()
|
|
{
|
|
// Fallback to state machine.
|
|
// state machine's seeks will be done with
|
|
// MediaDecoderEventVisibility::Suppressed.
|
|
android::Mutex::Autolock autoLock(mLock);
|
|
// We do not reset mSeekTarget here.
|
|
if (!mSeekPromise.IsEmpty()) {
|
|
MediaDecoder::SeekResolveValue val(mReachedEOS, mSeekTarget.mEventVisibility);
|
|
mSeekPromise.Resolve(val, __func__);
|
|
}
|
|
nsCOMPtr<nsIRunnable> nsEvent = NS_NewRunnableMethod(mObserver,
|
|
&MediaOmxCommonDecoder::AudioOffloadTearDown);
|
|
NS_DispatchToMainThread(nsEvent);
|
|
}
|
|
|
|
// static
|
|
size_t AudioOffloadPlayer::AudioSinkCallback(GonkAudioSink* aAudioSink,
|
|
void* aBuffer,
|
|
size_t aSize,
|
|
void* aCookie,
|
|
GonkAudioSink::cb_event_t aEvent)
|
|
{
|
|
AudioOffloadPlayer* me = (AudioOffloadPlayer*) aCookie;
|
|
|
|
switch (aEvent) {
|
|
|
|
case GonkAudioSink::CB_EVENT_FILL_BUFFER:
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("Notify Audio position changed"));
|
|
me->NotifyPositionChanged();
|
|
return me->FillBuffer(aBuffer, aSize);
|
|
|
|
case GonkAudioSink::CB_EVENT_STREAM_END:
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("Notify Audio EOS"));
|
|
me->mReachedEOS = true;
|
|
me->NotifyAudioEOS();
|
|
break;
|
|
|
|
case GonkAudioSink::CB_EVENT_TEAR_DOWN:
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("Notify Tear down event"));
|
|
me->NotifyAudioTearDown();
|
|
break;
|
|
|
|
default:
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Error, ("Unknown event %d from audio sink",
|
|
aEvent));
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
size_t AudioOffloadPlayer::FillBuffer(void* aData, size_t aSize)
|
|
{
|
|
CHECK(mAudioSink.get());
|
|
|
|
if (mReachedEOS) {
|
|
return 0;
|
|
}
|
|
|
|
size_t sizeDone = 0;
|
|
size_t sizeRemaining = aSize;
|
|
int64_t seekTimeUs = -1;
|
|
while (sizeRemaining > 0) {
|
|
MediaSource::ReadOptions options;
|
|
bool refreshSeekTime = false;
|
|
{
|
|
android::Mutex::Autolock autoLock(mLock);
|
|
|
|
if (mSeekTarget.IsValid()) {
|
|
seekTimeUs = mSeekTarget.GetTime().ToMicroseconds();
|
|
options.setSeekTo(seekTimeUs);
|
|
refreshSeekTime = true;
|
|
|
|
if (mInputBuffer) {
|
|
mInputBuffer->release();
|
|
mInputBuffer = nullptr;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!mInputBuffer) {
|
|
status_t err;
|
|
err = mSource->read(&mInputBuffer, &options);
|
|
|
|
CHECK((!err && mInputBuffer) || (err && !mInputBuffer));
|
|
|
|
android::Mutex::Autolock autoLock(mLock);
|
|
|
|
if (err != OK) {
|
|
if (mSeekTarget.IsValid()) {
|
|
mSeekTarget.Reset();
|
|
}
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Error, ("Error while reading media source %d "
|
|
"Ok to receive EOS error at end", err));
|
|
if (!mReachedEOS) {
|
|
// After seek there is a possible race condition if
|
|
// OffloadThread is observing state_stopping_1 before
|
|
// framesReady() > 0. Ensure sink stop is called
|
|
// after last buffer is released. This ensures the
|
|
// partial buffer is written to the driver before
|
|
// stopping one is observed.The drawback is that
|
|
// there will be an unnecessary call to the parser
|
|
// after parser signalled EOS.
|
|
if (sizeDone > 0) {
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("send Partial buffer down"));
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("skip calling stop till next"
|
|
" fillBuffer"));
|
|
break;
|
|
}
|
|
// no more buffers to push - stop() and wait for STREAM_END
|
|
// don't set mReachedEOS until stream end received
|
|
mAudioSink->Stop();
|
|
}
|
|
break;
|
|
}
|
|
|
|
if(mInputBuffer->range_length() != 0) {
|
|
CHECK(mInputBuffer->meta_data()->findInt64(
|
|
kKeyTime, &mPositionTimeMediaUs));
|
|
}
|
|
|
|
if (mSeekTarget.IsValid() &&
|
|
seekTimeUs == mSeekTarget.GetTime().ToMicroseconds()) {
|
|
MOZ_ASSERT(mSeekTarget.IsValid());
|
|
mSeekTarget.Reset();
|
|
if (!mSeekPromise.IsEmpty()) {
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("FillBuffer posting SEEK_COMPLETE"));
|
|
MediaDecoder::SeekResolveValue val(mReachedEOS, mSeekTarget.mEventVisibility);
|
|
mSeekPromise.Resolve(val, __func__);
|
|
}
|
|
} else if (mSeekTarget.IsValid()) {
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("seek is updated during unlocking mLock"));
|
|
}
|
|
|
|
if (refreshSeekTime) {
|
|
NotifyPositionChanged();
|
|
|
|
// need to adjust the mStartPosUs for offload decoding since parser
|
|
// might not be able to get the exact seek time requested.
|
|
mStartPosUs = mPositionTimeMediaUs;
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("Adjust seek time to: %.2f",
|
|
mStartPosUs / 1E6));
|
|
}
|
|
}
|
|
|
|
if (mInputBuffer->range_length() == 0) {
|
|
mInputBuffer->release();
|
|
mInputBuffer = nullptr;
|
|
continue;
|
|
}
|
|
|
|
size_t copy = sizeRemaining;
|
|
if (copy > mInputBuffer->range_length()) {
|
|
copy = mInputBuffer->range_length();
|
|
}
|
|
|
|
memcpy((char *)aData + sizeDone,
|
|
(const char *)mInputBuffer->data() + mInputBuffer->range_offset(),
|
|
copy);
|
|
|
|
mInputBuffer->set_range(mInputBuffer->range_offset() + copy,
|
|
mInputBuffer->range_length() - copy);
|
|
|
|
sizeDone += copy;
|
|
sizeRemaining -= copy;
|
|
}
|
|
return sizeDone;
|
|
}
|
|
|
|
void AudioOffloadPlayer::SetElementVisibility(bool aIsVisible)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mIsElementVisible = aIsVisible;
|
|
if (mIsElementVisible) {
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("Element is visible. Start time update"));
|
|
StartTimeUpdate();
|
|
}
|
|
}
|
|
|
|
static void TimeUpdateCallback(nsITimer* aTimer, void* aClosure)
|
|
{
|
|
AudioOffloadPlayer* player = static_cast<AudioOffloadPlayer*>(aClosure);
|
|
player->TimeUpdate();
|
|
}
|
|
|
|
void AudioOffloadPlayer::TimeUpdate()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
TimeStamp now = TimeStamp::Now();
|
|
|
|
// If TIMEUPDATE_MS has passed since the last fire update event fired, fire
|
|
// another timeupdate event.
|
|
if ((mLastFireUpdateTime.IsNull() ||
|
|
now - mLastFireUpdateTime >=
|
|
TimeDuration::FromMilliseconds(TIMEUPDATE_MS))) {
|
|
mLastFireUpdateTime = now;
|
|
NotifyPositionChanged();
|
|
}
|
|
|
|
if (mPlayState != MediaDecoder::PLAY_STATE_PLAYING || !mIsElementVisible) {
|
|
StopTimeUpdate();
|
|
}
|
|
}
|
|
|
|
nsresult AudioOffloadPlayer::StartTimeUpdate()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mTimeUpdateTimer) {
|
|
return NS_OK;
|
|
}
|
|
|
|
mTimeUpdateTimer = do_CreateInstance("@mozilla.org/timer;1");
|
|
return mTimeUpdateTimer->InitWithFuncCallback(TimeUpdateCallback,
|
|
this,
|
|
TIMEUPDATE_MS,
|
|
nsITimer::TYPE_REPEATING_SLACK);
|
|
}
|
|
|
|
nsresult AudioOffloadPlayer::StopTimeUpdate()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (!mTimeUpdateTimer) {
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult rv = mTimeUpdateTimer->Cancel();
|
|
mTimeUpdateTimer = nullptr;
|
|
return rv;
|
|
}
|
|
|
|
MediaDecoderOwner::NextFrameStatus AudioOffloadPlayer::GetNextFrameStatus()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mSeekTarget.IsValid()) {
|
|
return MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_SEEKING;
|
|
} else if (mPlayState == MediaDecoder::PLAY_STATE_ENDED) {
|
|
return MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE;
|
|
} else {
|
|
return MediaDecoderOwner::NEXT_FRAME_AVAILABLE;
|
|
}
|
|
}
|
|
|
|
void AudioOffloadPlayer::SendMetaDataToHal(sp<GonkAudioSink>& aSink,
|
|
const sp<MetaData>& aMeta)
|
|
{
|
|
int32_t sampleRate = 0;
|
|
int32_t bitRate = 0;
|
|
int32_t channelMask = 0;
|
|
int32_t delaySamples = 0;
|
|
int32_t paddingSamples = 0;
|
|
CHECK(aSink.get());
|
|
|
|
AudioParameter param = AudioParameter();
|
|
|
|
if (aMeta->findInt32(kKeySampleRate, &sampleRate)) {
|
|
param.addInt(String8(AUDIO_OFFLOAD_CODEC_SAMPLE_RATE), sampleRate);
|
|
}
|
|
if (aMeta->findInt32(kKeyChannelMask, &channelMask)) {
|
|
param.addInt(String8(AUDIO_OFFLOAD_CODEC_NUM_CHANNEL), channelMask);
|
|
}
|
|
if (aMeta->findInt32(kKeyBitRate, &bitRate)) {
|
|
param.addInt(String8(AUDIO_OFFLOAD_CODEC_AVG_BIT_RATE), bitRate);
|
|
}
|
|
if (aMeta->findInt32(kKeyEncoderDelay, &delaySamples)) {
|
|
param.addInt(String8(AUDIO_OFFLOAD_CODEC_DELAY_SAMPLES), delaySamples);
|
|
}
|
|
if (aMeta->findInt32(kKeyEncoderPadding, &paddingSamples)) {
|
|
param.addInt(String8(AUDIO_OFFLOAD_CODEC_PADDING_SAMPLES), paddingSamples);
|
|
}
|
|
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("SendMetaDataToHal: bitRate %d,"
|
|
" sampleRate %d, chanMask %d, delaySample %d, paddingSample %d", bitRate,
|
|
sampleRate, channelMask, delaySamples, paddingSamples));
|
|
|
|
aSink->SetParameters(param.toString());
|
|
return;
|
|
}
|
|
|
|
void AudioOffloadPlayer::SetVolume(double aVolume)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
CHECK(mAudioSink.get());
|
|
mAudioSink->SetVolume((float) aVolume);
|
|
}
|
|
|
|
void AudioOffloadPlayer::WakeLockCreate()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("%s", __FUNCTION__));
|
|
if (!mWakeLock) {
|
|
RefPtr<dom::power::PowerManagerService> pmService =
|
|
dom::power::PowerManagerService::GetInstance();
|
|
NS_ENSURE_TRUE_VOID(pmService);
|
|
|
|
ErrorResult rv;
|
|
mWakeLock = pmService->NewWakeLock(NS_LITERAL_STRING("cpu"), nullptr, rv);
|
|
}
|
|
}
|
|
|
|
void AudioOffloadPlayer::WakeLockRelease()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
AUDIO_OFFLOAD_LOG(LogLevel::Debug, ("%s", __FUNCTION__));
|
|
if (mWakeLock) {
|
|
ErrorResult rv;
|
|
mWakeLock->Unlock(rv);
|
|
mWakeLock = nullptr;
|
|
}
|
|
}
|
|
|
|
} // namespace mozilla
|