diff options
-rw-r--r-- | dom/media/platforms/android/AndroidDecoderModule.cpp | 227 | ||||
-rw-r--r-- | dom/media/platforms/android/AndroidDecoderModule.h | 34 | ||||
-rw-r--r-- | dom/media/platforms/android/MediaCodecDataDecoder.cpp | 698 | ||||
-rw-r--r-- | dom/media/platforms/android/MediaCodecDataDecoder.h | 126 | ||||
-rw-r--r-- | dom/media/platforms/android/RemoteDataDecoder.cpp | 489 | ||||
-rw-r--r-- | dom/media/platforms/android/RemoteDataDecoder.h | 62 | ||||
-rw-r--r-- | dom/media/platforms/moz.build | 10 | ||||
-rw-r--r-- | gfx/gl/AndroidSurfaceTexture.cpp | 260 | ||||
-rw-r--r-- | gfx/gl/AndroidSurfaceTexture.h | 107 | ||||
-rw-r--r-- | gfx/gl/moz.build | 2 | ||||
-rw-r--r-- | gfx/layers/GLImages.h | 1 | ||||
-rw-r--r-- | gfx/layers/opengl/TextureClientOGL.h | 1 | ||||
-rw-r--r-- | gfx/layers/opengl/TextureHostOGL.cpp | 1 | ||||
-rw-r--r-- | gfx/layers/opengl/TextureHostOGL.h | 4 |
14 files changed, 0 insertions, 2022 deletions
diff --git a/dom/media/platforms/android/AndroidDecoderModule.cpp b/dom/media/platforms/android/AndroidDecoderModule.cpp deleted file mode 100644 index 3bf5cbf09..000000000 --- a/dom/media/platforms/android/AndroidDecoderModule.cpp +++ /dev/null @@ -1,227 +0,0 @@ -/* 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 "MediaCodecDataDecoder.h" -#include "RemoteDataDecoder.h" - -#include "MediaInfo.h" -#include "VPXDecoder.h" - -#include "MediaPrefs.h" -#include "OpusDecoder.h" -#include "VorbisDecoder.h" - -#include "nsPromiseFlatString.h" -#include "nsIGfxInfo.h" - -#include "prlog.h" - -#include <jni.h> - -#undef LOG -#define LOG(arg, ...) MOZ_LOG(sAndroidDecoderModuleLog, \ - mozilla::LogLevel::Debug, ("AndroidDecoderModule(%p)::%s: " arg, \ - this, __func__, ##__VA_ARGS__)) - -using namespace mozilla; -using namespace mozilla::gl; -using namespace mozilla::java::sdk; -using media::TimeUnit; - -namespace mozilla { - -mozilla::LazyLogModule sAndroidDecoderModuleLog("AndroidDecoderModule"); - -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 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; -}; - -CryptoInfo::LocalRef -GetCryptoInfoFromSample(const MediaRawData* aSample) -{ - auto& cryptoObj = aSample->mCrypto; - - if (!cryptoObj.mValid) { - return nullptr; - } - - CryptoInfo::LocalRef cryptoInfo; - nsresult rv = CryptoInfo::New(&cryptoInfo); - NS_ENSURE_SUCCESS(rv, nullptr); - - uint32_t numSubSamples = - std::min<uint32_t>(cryptoObj.mPlainSizes.Length(), cryptoObj.mEncryptedSizes.Length()); - - uint32_t totalSubSamplesSize = 0; - for (auto& size : cryptoObj.mEncryptedSizes) { - totalSubSamplesSize += size; - } - - // mPlainSizes is uint16_t, need to transform to uint32_t first. - nsTArray<uint32_t> plainSizes; - for (auto& size : cryptoObj.mPlainSizes) { - totalSubSamplesSize += size; - plainSizes.AppendElement(size); - } - - uint32_t codecSpecificDataSize = aSample->Size() - totalSubSamplesSize; - // Size of codec specific data("CSD") for Android MediaCodec usage should be - // included in the 1st plain size. - plainSizes[0] += codecSpecificDataSize; - - static const int kExpectedIVLength = 16; - auto tempIV(cryptoObj.mIV); - auto tempIVLength = tempIV.Length(); - MOZ_ASSERT(tempIVLength <= kExpectedIVLength); - for (size_t i = tempIVLength; i < kExpectedIVLength; i++) { - // Padding with 0 - tempIV.AppendElement(0); - } - - auto numBytesOfPlainData = mozilla::jni::IntArray::New( - reinterpret_cast<int32_t*>(&plainSizes[0]), - plainSizes.Length()); - - auto numBytesOfEncryptedData = - mozilla::jni::IntArray::New(reinterpret_cast<const int32_t*>(&cryptoObj.mEncryptedSizes[0]), - cryptoObj.mEncryptedSizes.Length()); - auto iv = mozilla::jni::ByteArray::New(reinterpret_cast<int8_t*>(&tempIV[0]), - tempIV.Length()); - auto keyId = mozilla::jni::ByteArray::New(reinterpret_cast<const int8_t*>(&cryptoObj.mKeyId[0]), - cryptoObj.mKeyId.Length()); - cryptoInfo->Set(numSubSamples, - numBytesOfPlainData, - numBytesOfEncryptedData, - keyId, - iv, - MediaCodec::CRYPTO_MODE_AES_CTR); - - return cryptoInfo; -} - -bool -AndroidDecoderModule::SupportsMimeType(const nsACString& aMimeType, - DecoderDoctorDiagnostics* aDiagnostics) 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; - } - - // Prefer the gecko decoder for opus and vorbis; stagefright crashes - // on content demuxed from mp4. - if (OpusDataDecoder::IsOpus(aMimeType) || - VorbisDataDecoder::IsVorbis(aMimeType)) { - LOG("Rejecting audio of type %s", aMimeType.Data()); - return false; - } - - return java::HardwareCodecCapabilityUtils::FindDecoderCodecInfoForMimeType( - nsCString(TranslateMimeType(aMimeType))); -} - -already_AddRefed<MediaDataDecoder> -AndroidDecoderModule::CreateVideoDecoder(const CreateDecoderParams& aParams) -{ - MediaFormat::LocalRef format; - - const VideoInfo& config = aParams.VideoConfig(); - NS_ENSURE_SUCCESS(MediaFormat::CreateVideoFormat( - TranslateMimeType(config.mMimeType), - config.mDisplay.width, - config.mDisplay.height, - &format), nullptr); - - RefPtr<MediaDataDecoder> decoder = MediaPrefs::PDMAndroidRemoteCodecEnabled() ? - RemoteDataDecoder::CreateVideoDecoder(config, - format, - aParams.mCallback, - aParams.mImageContainer) : - MediaCodecDataDecoder::CreateVideoDecoder(config, - format, - aParams.mCallback, - aParams.mImageContainer); - - return decoder.forget(); -} - -already_AddRefed<MediaDataDecoder> -AndroidDecoderModule::CreateAudioDecoder(const CreateDecoderParams& aParams) -{ - const AudioInfo& config = aParams.AudioConfig(); - MOZ_ASSERT(config.mBitDepth == 16, "We only handle 16-bit audio!"); - - MediaFormat::LocalRef format; - - LOG("CreateAudioFormat with mimeType=%s, mRate=%d, channels=%d", - config.mMimeType.Data(), config.mRate, config.mChannels); - - NS_ENSURE_SUCCESS(MediaFormat::CreateAudioFormat( - config.mMimeType, - config.mRate, - config.mChannels, - &format), nullptr); - - RefPtr<MediaDataDecoder> decoder = MediaPrefs::PDMAndroidRemoteCodecEnabled() ? - RemoteDataDecoder::CreateAudioDecoder(config, format, aParams.mCallback) : - MediaCodecDataDecoder::CreateAudioDecoder(config, format, aParams.mCallback); - - return decoder.forget(); -} - -PlatformDecoderModule::ConversionRequired -AndroidDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const -{ - if (aConfig.IsVideo()) { - return ConversionRequired::kNeedAnnexB; - } - return ConversionRequired::kNeedNone; -} - -} // mozilla diff --git a/dom/media/platforms/android/AndroidDecoderModule.h b/dom/media/platforms/android/AndroidDecoderModule.h deleted file mode 100644 index 339cbb311..000000000 --- a/dom/media/platforms/android/AndroidDecoderModule.h +++ /dev/null @@ -1,34 +0,0 @@ -/* 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/. */ - -#ifndef AndroidDecoderModule_h_ -#define AndroidDecoderModule_h_ - -#include "PlatformDecoderModule.h" - -namespace mozilla { - -class AndroidDecoderModule : public PlatformDecoderModule { -public: - already_AddRefed<MediaDataDecoder> - CreateVideoDecoder(const CreateDecoderParams& aParams) override; - - already_AddRefed<MediaDataDecoder> - CreateAudioDecoder(const CreateDecoderParams& aParams) override; - - AndroidDecoderModule() {} - virtual ~AndroidDecoderModule() {} - - bool SupportsMimeType(const nsACString& aMimeType, - DecoderDoctorDiagnostics* aDiagnostics) const override; - - ConversionRequired - DecoderNeedsConversion(const TrackInfo& aConfig) const override; -}; - -extern LazyLogModule sAndroidDecoderModuleLog; - -} // namespace mozilla - -#endif diff --git a/dom/media/platforms/android/MediaCodecDataDecoder.cpp b/dom/media/platforms/android/MediaCodecDataDecoder.cpp deleted file mode 100644 index 3c5df54ee..000000000 --- a/dom/media/platforms/android/MediaCodecDataDecoder.cpp +++ /dev/null @@ -1,698 +0,0 @@ -/* 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 "MediaCodecDataDecoder.h" - -#include "AndroidBridge.h" -#include "AndroidSurfaceTexture.h" -#include "GeneratedJNINatives.h" -#include "GLImages.h" - -#include "MediaData.h" -#include "MediaInfo.h" -#include "VPXDecoder.h" - -#include "nsThreadUtils.h" -#include "nsPromiseFlatString.h" -#include "nsIGfxInfo.h" - -#include "prlog.h" - -#include <jni.h> - -#undef LOG -#define LOG(arg, ...) MOZ_LOG(sAndroidDecoderModuleLog, \ - mozilla::LogLevel::Debug, ("MediaCodecDataDecoder(%p)::%s: " arg, \ - this, __func__, ##__VA_ARGS__)) - -using namespace mozilla; -using namespace mozilla::gl; -using namespace mozilla::java; -using namespace mozilla::java::sdk; -using media::TimeUnit; - -namespace mozilla { - -#define INVOKE_CALLBACK(Func, ...) \ - if (mCallback) { \ - mCallback->Func(__VA_ARGS__); \ - } else { \ - NS_WARNING("Callback not set"); \ - } - -static MediaCodec::LocalRef -CreateDecoder(const nsACString& aMimeType) -{ - MediaCodec::LocalRef codec; - NS_ENSURE_SUCCESS(MediaCodec::CreateDecoderByType(TranslateMimeType(aMimeType), - &codec), nullptr); - return codec; -} - -class VideoDataDecoder : public MediaCodecDataDecoder -{ -public: - VideoDataDecoder(const VideoInfo& aConfig, - MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback, - layers::ImageContainer* aImageContainer) - : MediaCodecDataDecoder(MediaData::Type::VIDEO_DATA, aConfig.mMimeType, - aFormat, aCallback) - , mImageContainer(aImageContainer) - , mConfig(aConfig) - { - - } - - const char* GetDescriptionName() const override - { - return "Android MediaCodec video decoder"; - } - - RefPtr<InitPromise> Init() override - { - mSurfaceTexture = AndroidSurfaceTexture::Create(); - if (!mSurfaceTexture) { - NS_WARNING("Failed to create SurfaceTexture for video decode\n"); - return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__); - } - - if (NS_FAILED(InitDecoder(mSurfaceTexture->JavaSurface()))) { - return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__); - } - - return InitPromise::CreateAndResolve(TrackInfo::kVideoTrack, __func__); - } - - void Cleanup() override - { - } - - nsresult PostOutput(BufferInfo::Param aInfo, MediaFormat::Param aFormat, - const TimeUnit& aDuration) override - { - RefPtr<layers::Image> img = - new SurfaceTextureImage(mSurfaceTexture.get(), mConfig.mDisplay, - gl::OriginPos::BottomLeft); - - 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, - 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: - layers::ImageContainer* mImageContainer; - const VideoInfo& mConfig; - RefPtr<AndroidSurfaceTexture> mSurfaceTexture; -}; - -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::ByteBuffer::LocalRef buffer(env); - NS_ENSURE_SUCCESS_VOID(aFormat->GetByteBuffer(NS_LITERAL_STRING("csd-0"), - &buffer)); - - if (!buffer && aConfig.mCodecSpecificConfig->Length() >= 2) { - buffer = jni::ByteBuffer::New( - 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); - AudioConfig::ChannelLayout layout(numChannels); - if (!layout.IsValid()) { - return NS_ERROR_FAILURE; - } - - 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; - AlignedAudioBuffer audio(numSamples); - if (!audio) { - return NS_ERROR_OUT_OF_MEMORY; - } - - 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; - } -}; - -MediaDataDecoder* -MediaCodecDataDecoder::CreateAudioDecoder(const AudioInfo& aConfig, - MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback) -{ - return new AudioDataDecoder(aConfig, aFormat, aCallback); -} - -MediaDataDecoder* -MediaCodecDataDecoder::CreateVideoDecoder(const VideoInfo& aConfig, - MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback, - layers::ImageContainer* aImageContainer) -{ - return new VideoDataDecoder(aConfig, aFormat, aCallback, aImageContainer); -} - -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(ModuleState::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( - NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__); -} - -nsresult -MediaCodecDataDecoder::InitDecoder(Surface::Param aSurface) -{ - mDecoder = CreateDecoder(mMimeType); - if (!mDecoder) { - INVOKE_CALLBACK(Error, - MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__)); - 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); - - nsCOMPtr<nsIRunnable> r = NewRunnableMethod(this, &MediaCodecDataDecoder::DecoderLoop); - rv = NS_NewNamedThread("MC Decoder", getter_AddRefs(mThread), r); - - return rv; -} - -// 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 (mState == ModuleState::kDrainDecoder) { \ - INVOKE_CALLBACK(DrainComplete); \ - SetState(ModuleState::kDecoding); \ - } \ - INVOKE_CALLBACK(Error, MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__)); \ - 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 (mState == ModuleState::kDecoding && mQueue.empty()) { - // Signal that we require more input. - INVOKE_CALLBACK(InputExhausted); - lock.Wait(); - } - - return mState != ModuleState::kStopping; -} - - -already_AddRefed<MediaRawData> -MediaCodecDataDecoder::PeekNextSample() -{ - MonitorAutoLock lock(mMonitor); - - if (mState == ModuleState::kFlushing) { - mDecoder->Flush(); - ClearQueue(); - SetState(ModuleState::kDecoding); - lock.Notify(); - return nullptr; - } - - if (mQueue.empty()) { - if (mState == ModuleState::kDrainQueue) { - SetState(ModuleState::kDrainDecoder); - } - return nullptr; - } - - // We're not stopping or flushing, so try to get a sample. - return RefPtr<MediaRawData>(mQueue.front()).forget(); -} - -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()); - - CryptoInfo::LocalRef cryptoInfo = GetCryptoInfoFromSample(aSample); - if (cryptoInfo) { - res = mDecoder->QueueSecureInputBuffer(inputIndex, 0, cryptoInfo, - aSample->mTime, 0); - } else { - res = mDecoder->QueueInputBuffer(inputIndex, 0, aSample->Size(), - aSample->mTime, 0); - } - - if (NS_FAILED(res)) { - return res; - } - - mDurations.push_back(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)) { - SetState(ModuleState::kDrainWaitEOS); - mMonitor.Notify(); - } - return res; -} - -void -MediaCodecDataDecoder::HandleEOS(int32_t aOutputStatus) -{ - MonitorAutoLock lock(mMonitor); - - if (mState == ModuleState::kDrainWaitEOS) { - SetState(ModuleState::kDecoding); - mMonitor.Notify(); - - INVOKE_CALLBACK(DrainComplete); - } - - mDecoder->ReleaseOutputBuffer(aOutputStatus, false); -} - -Maybe<TimeUnit> -MediaCodecDataDecoder::GetOutputDuration() -{ - if (mDurations.empty()) { - return Nothing(); - } - const Maybe<TimeUnit> duration = Some(mDurations.front()); - mDurations.pop_front(); - return duration; -} - -nsresult -MediaCodecDataDecoder::ProcessOutput( - BufferInfo::Param aInfo, MediaFormat::Param aFormat, int32_t aStatus) -{ - AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1); - - const Maybe<TimeUnit> duration = GetOutputDuration(); - if (!duration) { - // Some devices report failure in QueueSample while actually succeeding at - // it, in which case we get an output buffer without having a cached duration - // (bug 1273523). - return NS_OK; - } - - 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.value()); - } - - // The Surface will be updated at this point (for video). - mDecoder->ReleaseOutputBuffer(aStatus, true); - PostOutput(aInfo, aFormat, duration.value()); - - return NS_OK; -} - -void -MediaCodecDataDecoder::DecoderLoop() -{ - bool isOutputDone = false; - AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1); - MediaFormat::LocalRef outputFormat(frame.GetEnv()); - nsresult res = NS_OK; - - while (WaitForInput()) { - RefPtr<MediaRawData> sample = PeekNextSample(); - - { - MonitorAutoLock lock(mMonitor); - if (mState == ModuleState::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); - MOZ_RELEASE_ASSERT(mQueue.size(), "Queue may not be empty"); - mQueue.pop_front(); - 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, - MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR, - __func__)); - // 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); - SetState(ModuleState::kShutdown); - mMonitor.Notify(); -} - -const char* -MediaCodecDataDecoder::ModuleStateStr(ModuleState aState) { - switch (aState) { - case ModuleState::kDecoding: return "Decoding"; - case ModuleState::kFlushing: return "Flushing"; - case ModuleState::kDrainQueue: return "DrainQueue"; - case ModuleState::kDrainDecoder: return "DrainDecoder"; - case ModuleState::kDrainWaitEOS: return "DrainWaitEOS"; - case ModuleState::kStopping: return "Stopping"; - case ModuleState::kShutdown: return "Shutdown"; - default: MOZ_ASSERT_UNREACHABLE("Invalid state."); - } - return "Unknown"; -} - -bool -MediaCodecDataDecoder::SetState(ModuleState aState) -{ - bool ok = true; - - if (mState == ModuleState::kShutdown) { - ok = false; - } else if (mState == ModuleState::kStopping) { - ok = aState == ModuleState::kShutdown; - } else if (aState == ModuleState::kDrainDecoder) { - ok = mState == ModuleState::kDrainQueue; - } else if (aState == ModuleState::kDrainWaitEOS) { - ok = mState == ModuleState::kDrainDecoder; - } - - if (ok) { - LOG("%s -> %s", ModuleStateStr(mState), ModuleStateStr(aState)); - mState = aState; - } else { - LOG("Fail to transit from %s to %s state", ModuleStateStr(mState), ModuleStateStr(aState)); - } - - return ok; -} - -void -MediaCodecDataDecoder::ClearQueue() -{ - mMonitor.AssertCurrentThreadOwns(); - - mQueue.clear(); - mDurations.clear(); -} - -void -MediaCodecDataDecoder::Input(MediaRawData* aSample) -{ - MonitorAutoLock lock(mMonitor); - mQueue.push_back(aSample); - lock.NotifyAll(); -} - -nsresult -MediaCodecDataDecoder::ResetInputBuffers() -{ - return mDecoder->GetInputBuffers(ReturnTo(&mInputBuffers)); -} - -nsresult -MediaCodecDataDecoder::ResetOutputBuffers() -{ - return mDecoder->GetOutputBuffers(ReturnTo(&mOutputBuffers)); -} - -void -MediaCodecDataDecoder::Flush() -{ - MonitorAutoLock lock(mMonitor); - if (!SetState(ModuleState::kFlushing)) { - return; - } - lock.Notify(); - - while (mState == ModuleState::kFlushing) { - lock.Wait(); - } -} - -void -MediaCodecDataDecoder::Drain() -{ - MonitorAutoLock lock(mMonitor); - if (mState == ModuleState::kDrainDecoder || - mState == ModuleState::kDrainQueue) { - return; - } - - SetState(ModuleState::kDrainQueue); - lock.Notify(); -} - - -void -MediaCodecDataDecoder::Shutdown() -{ - MonitorAutoLock lock(mMonitor); - - SetState(ModuleState::kStopping); - lock.Notify(); - - while (mThread && mState != ModuleState::kShutdown) { - lock.Wait(); - } - - if (mThread) { - mThread->Shutdown(); - mThread = nullptr; - } - - if (mDecoder) { - mDecoder->Stop(); - mDecoder->Release(); - mDecoder = nullptr; - } -} - -} // mozilla diff --git a/dom/media/platforms/android/MediaCodecDataDecoder.h b/dom/media/platforms/android/MediaCodecDataDecoder.h deleted file mode 100644 index 0db6407bf..000000000 --- a/dom/media/platforms/android/MediaCodecDataDecoder.h +++ /dev/null @@ -1,126 +0,0 @@ -/* 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/. */ - -#ifndef MediaCodecDataDecoder_h_ -#define MediaCodecDataDecoder_h_ - -#include "AndroidDecoderModule.h" - -#include "MediaCodec.h" -#include "SurfaceTexture.h" -#include "TimeUnits.h" -#include "mozilla/Monitor.h" -#include "mozilla/Maybe.h" - -#include <deque> - -namespace mozilla { - -typedef std::deque<RefPtr<MediaRawData>> SampleQueue; - -class MediaCodecDataDecoder : public MediaDataDecoder { -public: - static MediaDataDecoder* CreateAudioDecoder(const AudioInfo& aConfig, - java::sdk::MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback); - - static MediaDataDecoder* CreateVideoDecoder(const VideoInfo& aConfig, - java::sdk::MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback, - layers::ImageContainer* aImageContainer); - - virtual ~MediaCodecDataDecoder(); - - RefPtr<MediaDataDecoder::InitPromise> Init() override; - void Flush() override; - void Drain() override; - void Shutdown() override; - void Input(MediaRawData* aSample) override; - const char* GetDescriptionName() const override - { - return "Android MediaCodec decoder"; - } - -protected: - enum class ModuleState : uint8_t { - kDecoding = 0, - kFlushing, - kDrainQueue, - kDrainDecoder, - kDrainWaitEOS, - kStopping, - kShutdown - }; - - friend class AndroidDecoderModule; - - MediaCodecDataDecoder(MediaData::Type aType, - const nsACString& aMimeType, - java::sdk::MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback); - - static const char* ModuleStateStr(ModuleState aState); - - virtual nsresult InitDecoder(java::sdk::Surface::Param aSurface); - - virtual nsresult Output(java::sdk::BufferInfo::Param aInfo, void* aBuffer, - java::sdk::MediaFormat::Param aFormat, const media::TimeUnit& aDuration) - { - return NS_OK; - } - - virtual nsresult PostOutput(java::sdk::BufferInfo::Param aInfo, - java::sdk::MediaFormat::Param aFormat, const media::TimeUnit& aDuration) - { - return NS_OK; - } - - virtual void Cleanup() {}; - - nsresult ResetInputBuffers(); - nsresult ResetOutputBuffers(); - - nsresult GetInputBuffer(JNIEnv* env, int index, jni::Object::LocalRef* buffer); - bool WaitForInput(); - already_AddRefed<MediaRawData> PeekNextSample(); - nsresult QueueSample(const MediaRawData* aSample); - nsresult QueueEOS(); - void HandleEOS(int32_t aOutputStatus); - Maybe<media::TimeUnit> GetOutputDuration(); - nsresult ProcessOutput(java::sdk::BufferInfo::Param aInfo, - java::sdk::MediaFormat::Param aFormat, - int32_t aStatus); - // Sets decoder state and returns whether the new state has become effective. - bool SetState(ModuleState aState); - void DecoderLoop(); - - virtual void ClearQueue(); - - MediaData::Type mType; - - nsAutoCString mMimeType; - java::sdk::MediaFormat::GlobalRef mFormat; - - MediaDataDecoderCallback* mCallback; - - java::sdk::MediaCodec::GlobalRef mDecoder; - - jni::ObjectArray::GlobalRef mInputBuffers; - jni::ObjectArray::GlobalRef mOutputBuffers; - - nsCOMPtr<nsIThread> mThread; - - // Only these members are protected by mMonitor. - Monitor mMonitor; - - ModuleState mState; - - SampleQueue mQueue; - // Durations are stored in microseconds. - std::deque<media::TimeUnit> mDurations; -}; - -} // namespace mozilla - -#endif diff --git a/dom/media/platforms/android/RemoteDataDecoder.cpp b/dom/media/platforms/android/RemoteDataDecoder.cpp deleted file mode 100644 index 56af2601f..000000000 --- a/dom/media/platforms/android/RemoteDataDecoder.cpp +++ /dev/null @@ -1,489 +0,0 @@ -/* 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 "AndroidSurfaceTexture.h" -#include "FennecJNINatives.h" -#include "GLImages.h" - -#include "MediaData.h" -#include "MediaInfo.h" -#include "VideoUtils.h" -#include "VPXDecoder.h" - -#include "nsThreadUtils.h" -#include "nsPromiseFlatString.h" -#include "nsIGfxInfo.h" - -#include "prlog.h" - -#include <jni.h> - -#include <deque> - -#undef LOG -#define LOG(arg, ...) MOZ_LOG(sAndroidDecoderModuleLog, \ - mozilla::LogLevel::Debug, ("RemoteDataDecoder(%p)::%s: " arg, \ - this, __func__, ##__VA_ARGS__)) - -using namespace mozilla; -using namespace mozilla::gl; -using namespace mozilla::java; -using namespace mozilla::java::sdk; -using media::TimeUnit; - -namespace mozilla { - -class JavaCallbacksSupport - : public CodecProxy::NativeCallbacks::Natives<JavaCallbacksSupport> -{ -public: - typedef CodecProxy::NativeCallbacks::Natives<JavaCallbacksSupport> Base; - using Base::AttachNative; - - JavaCallbacksSupport(MediaDataDecoderCallback* aDecoderCallback) - : mDecoderCallback(aDecoderCallback) - { - MOZ_ASSERT(aDecoderCallback); - } - - virtual ~JavaCallbacksSupport() {} - - void OnInputExhausted() - { - if (mDecoderCallback) { - mDecoderCallback->InputExhausted(); - } - } - - virtual void HandleOutput(Sample::Param aSample) = 0; - - void OnOutput(jni::Object::Param aSample) - { - if (mDecoderCallback) { - HandleOutput(Sample::Ref::From(aSample)); - } - } - - virtual void HandleOutputFormatChanged(MediaFormat::Param aFormat) {}; - - void OnOutputFormatChanged(jni::Object::Param aFormat) - { - if (mDecoderCallback) { - HandleOutputFormatChanged(MediaFormat::Ref::From(aFormat)); - } - } - - void OnError(bool aIsFatal) - { - if (mDecoderCallback) { - mDecoderCallback->Error(aIsFatal ? - MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__) : - MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR, __func__)); - } - } - - void DisposeNative() - { - // TODO - } - - void Cancel() - { - mDecoderCallback = nullptr; - } - -protected: - MediaDataDecoderCallback* mDecoderCallback; -}; - -struct SampleTime final -{ - SampleTime(int64_t aStart, int64_t aDuration) - : mStart(aStart) - , mDuration(aDuration) - {} - - int64_t mStart; - int64_t mDuration; -}; - - -class RemoteVideoDecoder final : public RemoteDataDecoder -{ -public: - class CallbacksSupport final : public JavaCallbacksSupport - { - public: - CallbacksSupport(RemoteVideoDecoder* aDecoder, MediaDataDecoderCallback* aCallback) - : JavaCallbacksSupport(aCallback) - , mDecoder(aDecoder) - {} - - virtual ~CallbacksSupport() {} - - void HandleOutput(Sample::Param aSample) override - { - Maybe<int64_t> durationUs = mDecoder->mInputDurations.Get(); - if (!durationUs) { - return; - } - - BufferInfo::LocalRef info = aSample->Info(); - - int32_t flags; - bool ok = NS_SUCCEEDED(info->Flags(&flags)); - MOZ_ASSERT(ok); - - int32_t offset; - ok |= NS_SUCCEEDED(info->Offset(&offset)); - MOZ_ASSERT(ok); - - int64_t presentationTimeUs; - ok |= NS_SUCCEEDED(info->PresentationTimeUs(&presentationTimeUs)); - MOZ_ASSERT(ok); - - int32_t size; - ok |= NS_SUCCEEDED(info->Size(&size)); - MOZ_ASSERT(ok); - - NS_ENSURE_TRUE_VOID(ok); - - if (size > 0) { - RefPtr<layers::Image> img = - new SurfaceTextureImage(mDecoder->mSurfaceTexture.get(), mDecoder->mConfig.mDisplay, - gl::OriginPos::BottomLeft); - - RefPtr<VideoData> v = - VideoData::CreateFromImage(mDecoder->mConfig, - offset, - presentationTimeUs, - durationUs.value(), - img, - !!(flags & MediaCodec::BUFFER_FLAG_SYNC_FRAME), - presentationTimeUs, - gfx::IntRect(0, 0, - mDecoder->mConfig.mDisplay.width, - mDecoder->mConfig.mDisplay.height)); - - mDecoderCallback->Output(v); - } - - if ((flags & MediaCodec::BUFFER_FLAG_END_OF_STREAM) != 0) { - mDecoderCallback->DrainComplete(); - } - } - - friend class RemoteDataDecoder; - - private: - RemoteVideoDecoder* mDecoder; - }; - - RemoteVideoDecoder(const VideoInfo& aConfig, - MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback, - layers::ImageContainer* aImageContainer) - : RemoteDataDecoder(MediaData::Type::VIDEO_DATA, aConfig.mMimeType, - aFormat, aCallback) - , mImageContainer(aImageContainer) - , mConfig(aConfig) - { - } - - RefPtr<InitPromise> Init() override - { - mSurfaceTexture = AndroidSurfaceTexture::Create(); - if (!mSurfaceTexture) { - NS_WARNING("Failed to create SurfaceTexture for video decode\n"); - return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__); - } - - if (!jni::IsFennec()) { - NS_WARNING("Remote decoding not supported in non-Fennec environment\n"); - return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__); - } - - // Register native methods. - JavaCallbacksSupport::Init(); - - mJavaCallbacks = CodecProxy::NativeCallbacks::New(); - JavaCallbacksSupport::AttachNative(mJavaCallbacks, - mozilla::MakeUnique<CallbacksSupport>(this, mCallback)); - - mJavaDecoder = CodecProxy::Create(mFormat, mSurfaceTexture->JavaSurface(), mJavaCallbacks); - if (mJavaDecoder == nullptr) { - return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__); - } - - mInputDurations.Clear(); - - return InitPromise::CreateAndResolve(TrackInfo::kVideoTrack, __func__); - } - - void Flush() override - { - mInputDurations.Clear(); - RemoteDataDecoder::Flush(); - } - - void Drain() override - { - RemoteDataDecoder::Drain(); - mInputDurations.Put(0); - } - - void Input(MediaRawData* aSample) override - { - RemoteDataDecoder::Input(aSample); - mInputDurations.Put(aSample->mDuration); - } - -private: - class DurationQueue { - public: - - void Clear() - { - mValues.clear(); - } - - void Put(int64_t aDurationUs) - { - mValues.emplace_back(aDurationUs); - } - - Maybe<int64_t> Get() - { - if (mValues.empty()) { - return Nothing(); - } - - auto value = Some(mValues.front()); - mValues.pop_front(); - - return value; - } - - private: - std::deque<int64_t> mValues; - }; - - layers::ImageContainer* mImageContainer; - const VideoInfo& mConfig; - RefPtr<AndroidSurfaceTexture> mSurfaceTexture; - DurationQueue mInputDurations; -}; - -class RemoteAudioDecoder final : public RemoteDataDecoder -{ -public: - RemoteAudioDecoder(const AudioInfo& aConfig, - MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback) - : RemoteDataDecoder(MediaData::Type::AUDIO_DATA, aConfig.mMimeType, - aFormat, aCallback) - , mConfig(aConfig) - { - JNIEnv* const env = jni::GetEnvForThread(); - - bool formatHasCSD = false; - NS_ENSURE_SUCCESS_VOID(aFormat->ContainsKey(NS_LITERAL_STRING("csd-0"), &formatHasCSD)); - - if (!formatHasCSD && aConfig.mCodecSpecificConfig->Length() >= 2) { - jni::ByteBuffer::LocalRef buffer(env); - buffer = jni::ByteBuffer::New( - aConfig.mCodecSpecificConfig->Elements(), - aConfig.mCodecSpecificConfig->Length()); - NS_ENSURE_SUCCESS_VOID(aFormat->SetByteBuffer(NS_LITERAL_STRING("csd-0"), - buffer)); - } - } - - RefPtr<InitPromise> Init() override - { - // Register native methods. - JavaCallbacksSupport::Init(); - - mJavaCallbacks = CodecProxy::NativeCallbacks::New(); - JavaCallbacksSupport::AttachNative(mJavaCallbacks, - mozilla::MakeUnique<CallbacksSupport>(this, mCallback)); - - mJavaDecoder = CodecProxy::Create(mFormat, nullptr, mJavaCallbacks); - if (mJavaDecoder == nullptr) { - return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__); - } - - return InitPromise::CreateAndResolve(TrackInfo::kAudioTrack, __func__); - } - -private: - class CallbacksSupport final : public JavaCallbacksSupport - { - public: - CallbacksSupport(RemoteAudioDecoder* aDecoder, MediaDataDecoderCallback* aCallback) - : JavaCallbacksSupport(aCallback) - , mDecoder(aDecoder) - {} - - virtual ~CallbacksSupport() {} - - void HandleOutput(Sample::Param aSample) override - { - BufferInfo::LocalRef info = aSample->Info(); - - int32_t flags; - bool ok = NS_SUCCEEDED(info->Flags(&flags)); - MOZ_ASSERT(ok); - - int32_t offset; - ok |= NS_SUCCEEDED(info->Offset(&offset)); - MOZ_ASSERT(ok); - - int64_t presentationTimeUs; - ok |= NS_SUCCEEDED(info->PresentationTimeUs(&presentationTimeUs)); - MOZ_ASSERT(ok); - - int32_t size; - ok |= NS_SUCCEEDED(info->Size(&size)); - MOZ_ASSERT(ok); - - NS_ENSURE_TRUE_VOID(ok); - - if (size > 0) { -#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 / mOutputChannels; - AlignedAudioBuffer audio(numSamples); - if (!audio) { - return; - } - - jni::ByteBuffer::LocalRef dest = jni::ByteBuffer::New(audio.get(), size); - aSample->WriteToByteBuffer(dest); - - RefPtr<AudioData> data = new AudioData(0, presentationTimeUs, - FramesToUsecs(numFrames, mOutputSampleRate).value(), - numFrames, - Move(audio), - mOutputChannels, - mOutputSampleRate); - - mDecoderCallback->Output(data); - } - - if ((flags & MediaCodec::BUFFER_FLAG_END_OF_STREAM) != 0) { - mDecoderCallback->DrainComplete(); - return; - } - } - - void HandleOutputFormatChanged(MediaFormat::Param aFormat) override - { - aFormat->GetInteger(NS_LITERAL_STRING("channel-count"), &mOutputChannels); - AudioConfig::ChannelLayout layout(mOutputChannels); - if (!layout.IsValid()) { - mDecoderCallback->Error(MediaResult( - NS_ERROR_DOM_MEDIA_FATAL_ERR, - RESULT_DETAIL("Invalid channel layout:%d", mOutputChannels))); - return; - } - aFormat->GetInteger(NS_LITERAL_STRING("sample-rate"), &mOutputSampleRate); - LOG("Audio output format changed: channels:%d sample rate:%d", mOutputChannels, mOutputSampleRate); - } - - private: - RemoteAudioDecoder* mDecoder; - int32_t mOutputChannels; - int32_t mOutputSampleRate; - }; - - const AudioInfo& mConfig; -}; - -MediaDataDecoder* -RemoteDataDecoder::CreateAudioDecoder(const AudioInfo& aConfig, - MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback) -{ - return new RemoteAudioDecoder(aConfig, aFormat, aCallback); -} - -MediaDataDecoder* -RemoteDataDecoder::CreateVideoDecoder(const VideoInfo& aConfig, - MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback, - layers::ImageContainer* aImageContainer) -{ - return new RemoteVideoDecoder(aConfig, aFormat, aCallback, aImageContainer); -} - -RemoteDataDecoder::RemoteDataDecoder(MediaData::Type aType, - const nsACString& aMimeType, - MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback) - : mType(aType) - , mMimeType(aMimeType) - , mFormat(aFormat) - , mCallback(aCallback) -{ -} - -void -RemoteDataDecoder::Flush() -{ - mJavaDecoder->Flush(); -} - -void -RemoteDataDecoder::Drain() -{ - BufferInfo::LocalRef bufferInfo; - nsresult rv = BufferInfo::New(&bufferInfo); - NS_ENSURE_SUCCESS_VOID(rv); - bufferInfo->Set(0, 0, -1, MediaCodec::BUFFER_FLAG_END_OF_STREAM); - - mJavaDecoder->Input(nullptr, bufferInfo, nullptr); -} - -void -RemoteDataDecoder::Shutdown() -{ - LOG(""); - MOZ_ASSERT(mJavaDecoder && mJavaCallbacks); - - mJavaDecoder->Release(); - mJavaDecoder = nullptr; - - JavaCallbacksSupport::GetNative(mJavaCallbacks)->Cancel(); - mJavaCallbacks = nullptr; - - mFormat = nullptr; -} - -void -RemoteDataDecoder::Input(MediaRawData* aSample) -{ - MOZ_ASSERT(aSample != nullptr); - - jni::ByteBuffer::LocalRef bytes = jni::ByteBuffer::New(const_cast<uint8_t*>(aSample->Data()), - aSample->Size()); - - BufferInfo::LocalRef bufferInfo; - nsresult rv = BufferInfo::New(&bufferInfo); - if (NS_FAILED(rv)) { - mCallback->Error(MediaResult(NS_ERROR_OUT_OF_MEMORY, __func__)); - return; - } - bufferInfo->Set(0, aSample->Size(), aSample->mTime, 0); - - mJavaDecoder->Input(bytes, bufferInfo, GetCryptoInfoFromSample(aSample)); -} - -} // mozilla diff --git a/dom/media/platforms/android/RemoteDataDecoder.h b/dom/media/platforms/android/RemoteDataDecoder.h deleted file mode 100644 index 219539a0a..000000000 --- a/dom/media/platforms/android/RemoteDataDecoder.h +++ /dev/null @@ -1,62 +0,0 @@ -/* 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/. */ - -#ifndef RemoteDataDecoder_h_ -#define RemoteDataDecoder_h_ - -#include "AndroidDecoderModule.h" - -#include "FennecJNIWrappers.h" - -#include "SurfaceTexture.h" -#include "TimeUnits.h" -#include "mozilla/Monitor.h" -#include "mozilla/Maybe.h" - -#include <deque> - -namespace mozilla { - -class RemoteDataDecoder : public MediaDataDecoder { -public: - static MediaDataDecoder* CreateAudioDecoder(const AudioInfo& aConfig, - java::sdk::MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback); - - static MediaDataDecoder* CreateVideoDecoder(const VideoInfo& aConfig, - java::sdk::MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback, - layers::ImageContainer* aImageContainer); - - virtual ~RemoteDataDecoder() {} - - void Flush() override; - void Drain() override; - void Shutdown() override; - void Input(MediaRawData* aSample) override; - const char* GetDescriptionName() const override - { - return "android remote decoder"; - } - -protected: - RemoteDataDecoder(MediaData::Type aType, - const nsACString& aMimeType, - java::sdk::MediaFormat::Param aFormat, - MediaDataDecoderCallback* aCallback); - - MediaData::Type mType; - - nsAutoCString mMimeType; - java::sdk::MediaFormat::GlobalRef mFormat; - - MediaDataDecoderCallback* mCallback; - - java::CodecProxy::GlobalRef mJavaDecoder; - java::CodecProxy::NativeCallbacks::GlobalRef mJavaCallbacks; -}; - -} // namespace mozilla - -#endif diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build index 3d063b8c3..a32476133 100644 --- a/dom/media/platforms/moz.build +++ b/dom/media/platforms/moz.build @@ -80,16 +80,6 @@ if CONFIG['MOZ_APPLEMEDIA']: include('/ipc/chromium/chromium-config.mozbuild') -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - EXPORTS += [ - 'android/AndroidDecoderModule.h', - ] - SOURCES += [ - 'android/AndroidDecoderModule.cpp', - 'android/MediaCodecDataDecoder.cpp', - 'android/RemoteDataDecoder.cpp', - ] - FINAL_LIBRARY = 'xul' if CONFIG['GNU_CXX']: diff --git a/gfx/gl/AndroidSurfaceTexture.cpp b/gfx/gl/AndroidSurfaceTexture.cpp deleted file mode 100644 index 3c8c81974..000000000 --- a/gfx/gl/AndroidSurfaceTexture.cpp +++ /dev/null @@ -1,260 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -// vim:set ts=2 sts=2 sw=2 et cin: -/* 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/. */ - -#ifdef MOZ_WIDGET_ANDROID - -#include <map> -#include <android/native_window_jni.h> -#include <android/log.h> -#include "AndroidSurfaceTexture.h" -#include "gfxImageSurface.h" -#include "gfxPrefs.h" -#include "AndroidBridge.h" -#include "nsThreadUtils.h" -#include "mozilla/gfx/Matrix.h" -#include "GeneratedJNINatives.h" -#include "GLContext.h" - -using namespace mozilla; - -namespace mozilla { -namespace gl { - -class AndroidSurfaceTexture::Listener - : public java::SurfaceTextureListener::Natives<Listener> -{ - using Base = java::SurfaceTextureListener::Natives<Listener>; - - const nsCOMPtr<nsIRunnable> mCallback; - -public: - using Base::AttachNative; - using Base::DisposeNative; - - Listener(nsIRunnable* aCallback) : mCallback(aCallback) {} - - void OnFrameAvailable() - { - if (NS_IsMainThread()) { - mCallback->Run(); - return; - } - NS_DispatchToMainThread(mCallback); - } -}; - -already_AddRefed<AndroidSurfaceTexture> -AndroidSurfaceTexture::Create() -{ - return Create(nullptr, 0); -} - -already_AddRefed<AndroidSurfaceTexture> -AndroidSurfaceTexture::Create(GLContext* aContext, GLuint aTexture) -{ - RefPtr<AndroidSurfaceTexture> st = new AndroidSurfaceTexture(); - if (!st->Init(aContext, aTexture)) { - printf_stderr("Failed to initialize AndroidSurfaceTexture"); - st = nullptr; - } - - return st.forget(); -} - -nsresult -AndroidSurfaceTexture::Attach(GLContext* aContext, PRIntervalTime aTimeout) -{ - MonitorAutoLock lock(mMonitor); - - if (mAttachedContext == aContext) { - NS_WARNING("Tried to attach same GLContext to AndroidSurfaceTexture"); - return NS_OK; - } - - if (!CanDetach()) { - return NS_ERROR_NOT_AVAILABLE; - } - - while (mAttachedContext) { - // Wait until it's detached (or we time out) - if (NS_FAILED(lock.Wait(aTimeout))) { - return NS_ERROR_NOT_AVAILABLE; - } - } - - MOZ_ASSERT(aContext->IsOwningThreadCurrent(), "Trying to attach GLContext from different thread"); - - aContext->fGenTextures(1, &mTexture); - - if (NS_FAILED(mSurfaceTexture->AttachToGLContext(mTexture))) { - return NS_ERROR_NOT_AVAILABLE; - } - mAttachedContext = aContext; - mAttachedContext->MakeCurrent(); - - return NS_OK; -} - -nsresult -AndroidSurfaceTexture::Detach() -{ - MonitorAutoLock lock(mMonitor); - - if (!CanDetach() || - !mAttachedContext || - !mAttachedContext->IsOwningThreadCurrent()) - { - return NS_ERROR_FAILURE; - } - - mAttachedContext->MakeCurrent(); - - mSurfaceTexture->DetachFromGLContext(); - - mTexture = 0; - mAttachedContext = nullptr; - lock.NotifyAll(); - return NS_OK; -} - -bool -AndroidSurfaceTexture::CanDetach() const -{ - // The API for attach/detach only exists on 16+, and PowerVR has some sort of - // fencing issue. Additionally, attach/detach seems to be busted on at least - // some Mali adapters (400MP2 for sure, bug 1131793) - return AndroidBridge::Bridge()->GetAPIVersion() >= 16 && - (!mAttachedContext || mAttachedContext->Vendor() != GLVendor::Imagination) && - (!mAttachedContext || mAttachedContext->Vendor() != GLVendor::ARM /* Mali */) && - gfxPrefs::SurfaceTextureDetachEnabled(); -} - -bool -AndroidSurfaceTexture::Init(GLContext* aContext, GLuint aTexture) -{ - - if (!aTexture && !CanDetach()) { - // We have no texture and cannot initialize detached, bail out - return false; - } - - if (NS_WARN_IF(NS_FAILED( - java::sdk::SurfaceTexture::New(aTexture, ReturnTo(&mSurfaceTexture))))) { - return false; - } - - if (!aTexture) { - mSurfaceTexture->DetachFromGLContext(); - } - - mAttachedContext = aContext; - - if (NS_WARN_IF(NS_FAILED( - java::sdk::Surface::New(mSurfaceTexture, ReturnTo(&mSurface))))) { - return false; - } - - mNativeWindow = ANativeWindow_fromSurface(jni::GetEnvForThread(), - mSurface.Get()); - MOZ_ASSERT(mNativeWindow, "Failed to create native window from surface"); - - return true; -} - -AndroidSurfaceTexture::AndroidSurfaceTexture() - : mTexture(0) - , mSurfaceTexture() - , mSurface() - , mAttachedContext(nullptr) - , mMonitor("AndroidSurfaceTexture") -{ -} - -AndroidSurfaceTexture::~AndroidSurfaceTexture() -{ - if (mSurfaceTexture) { - SetFrameAvailableCallback(nullptr); - mSurfaceTexture = nullptr; - } - - if (mNativeWindow) { - ANativeWindow_release(mNativeWindow); - mNativeWindow = nullptr; - } -} - -void -AndroidSurfaceTexture::UpdateTexImage() -{ - mSurfaceTexture->UpdateTexImage(); -} - -void -AndroidSurfaceTexture::GetTransformMatrix(gfx::Matrix4x4& aMatrix) const -{ - JNIEnv* const env = jni::GetEnvForThread(); - - auto jarray = jni::FloatArray::LocalRef::Adopt(env, env->NewFloatArray(16)); - mSurfaceTexture->GetTransformMatrix(jarray); - - jfloat* array = env->GetFloatArrayElements(jarray.Get(), nullptr); - - aMatrix._11 = array[0]; - aMatrix._12 = array[1]; - aMatrix._13 = array[2]; - aMatrix._14 = array[3]; - - aMatrix._21 = array[4]; - aMatrix._22 = array[5]; - aMatrix._23 = array[6]; - aMatrix._24 = array[7]; - - aMatrix._31 = array[8]; - aMatrix._32 = array[9]; - aMatrix._33 = array[10]; - aMatrix._34 = array[11]; - - aMatrix._41 = array[12]; - aMatrix._42 = array[13]; - aMatrix._43 = array[14]; - aMatrix._44 = array[15]; - - env->ReleaseFloatArrayElements(jarray.Get(), array, 0); -} - -void -AndroidSurfaceTexture::SetFrameAvailableCallback(nsIRunnable* aRunnable) -{ - java::SurfaceTextureListener::LocalRef newListener; - - if (aRunnable) { - newListener = java::SurfaceTextureListener::New(); - Listener::AttachNative(newListener, MakeUnique<Listener>(aRunnable)); - } - - if (aRunnable || mListener) { - MOZ_ALWAYS_TRUE(NS_SUCCEEDED( - mSurfaceTexture->SetOnFrameAvailableListener(newListener))); - } - - if (mListener) { - Listener::DisposeNative(java::SurfaceTextureListener::LocalRef( - newListener.Env(), mListener)); - } - - mListener = newListener; -} - -void -AndroidSurfaceTexture::SetDefaultSize(mozilla::gfx::IntSize size) -{ - mSurfaceTexture->SetDefaultBufferSize(size.width, size.height); -} - -} // gl -} // mozilla - -#endif // MOZ_WIDGET_ANDROID diff --git a/gfx/gl/AndroidSurfaceTexture.h b/gfx/gl/AndroidSurfaceTexture.h deleted file mode 100644 index 056fab326..000000000 --- a/gfx/gl/AndroidSurfaceTexture.h +++ /dev/null @@ -1,107 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -// vim:set ts=2 sts=2 sw=2 et cin: -/* 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/. */ - -#ifndef AndroidSurfaceTexture_h__ -#define AndroidSurfaceTexture_h__ -#ifdef MOZ_WIDGET_ANDROID - -#include <jni.h> -#include <android/native_window.h> -#include "nsIRunnable.h" -#include "gfxPlatform.h" -#include "GLDefs.h" -#include "mozilla/gfx/2D.h" -#include "mozilla/gfx/MatrixFwd.h" -#include "mozilla/Monitor.h" - -#include "GeneratedJNIWrappers.h" -#include "SurfaceTexture.h" - -namespace mozilla { -namespace gl { - -class GLContext; - -/** - * This class is a wrapper around Android's SurfaceTexture class. - * Usage is pretty much exactly like the Java class, so see - * the Android documentation for details. - */ -class AndroidSurfaceTexture { - NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AndroidSurfaceTexture) - -public: - - // The SurfaceTexture is created in an attached state. This method requires - // Android Ice Cream Sandwich. - static already_AddRefed<AndroidSurfaceTexture> Create(GLContext* aGLContext, GLuint aTexture); - - // Here the SurfaceTexture will be created in a detached state. You must call - // Attach() with the GLContext you wish to composite with. It must be done - // on the thread where that GLContext is current. This method requires - // Android Jelly Bean. - static already_AddRefed<AndroidSurfaceTexture> Create(); - - // If we are on Jelly Bean, the SurfaceTexture can be detached and reattached - // to allow consumption from different GLContexts. It is recommended to only - // attach while you are consuming in order to allow this. - // - // Only one GLContext may be attached at any given time. If another is already - // attached, we try to wait for it to become detached. - nsresult Attach(GLContext* aContext, PRIntervalTime aTiemout = PR_INTERVAL_NO_TIMEOUT); - - nsresult Detach(); - - // Ability to detach is based on API version (16+), and we also block PowerVR - // since it has some type of fencing problem. Bug 1100126. - bool CanDetach() const; - - GLContext* AttachedContext() const { return mAttachedContext; } - - ANativeWindow* NativeWindow() const { - return mNativeWindow; - } - - // This attaches the updated data to the TEXTURE_EXTERNAL target - void UpdateTexImage(); - - void GetTransformMatrix(mozilla::gfx::Matrix4x4& aMatrix) const; - - void SetDefaultSize(mozilla::gfx::IntSize size); - - // The callback is guaranteed to be called on the main thread even - // if the upstream callback is received on a different thread - void SetFrameAvailableCallback(nsIRunnable* aRunnable); - - GLuint Texture() const { return mTexture; } - const java::sdk::Surface::Ref& JavaSurface() const { return mSurface; } - -private: - class Listener; - - AndroidSurfaceTexture(); - ~AndroidSurfaceTexture(); - - bool Init(GLContext* aContext, GLuint aTexture); - - GLuint mTexture; - java::sdk::SurfaceTexture::GlobalRef mSurfaceTexture; - java::sdk::Surface::GlobalRef mSurface; - java::SurfaceTextureListener::GlobalRef mListener; - - GLContext* mAttachedContext; - - ANativeWindow* mNativeWindow; - - Monitor mMonitor; -}; - -} -} - - -#endif -#endif diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index d5287ca59..c490400cb 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -21,7 +21,6 @@ if CONFIG['MOZ_GL_PROVIDER']: gl_provider = CONFIG['MOZ_GL_PROVIDER'] EXPORTS += [ - 'AndroidSurfaceTexture.h', 'DecomposeIntoNoRepeatTriangles.h', 'EGLUtils.h', 'ForceDiscreteGPUHelperCGL.h', @@ -116,7 +115,6 @@ elif gl_provider == 'GLX': ] SOURCES += [ - 'AndroidSurfaceTexture.cpp', 'DecomposeIntoNoRepeatTriangles.cpp', 'EGLUtils.cpp', 'GfxTexturesReporter.cpp', diff --git a/gfx/layers/GLImages.h b/gfx/layers/GLImages.h index 16e31e053..e7110db9d 100644 --- a/gfx/layers/GLImages.h +++ b/gfx/layers/GLImages.h @@ -6,7 +6,6 @@ #ifndef GFX_GLIMAGES_H #define GFX_GLIMAGES_H -#include "AndroidSurfaceTexture.h" #include "GLContextTypes.h" #include "GLTypes.h" #include "ImageContainer.h" // for Image diff --git a/gfx/layers/opengl/TextureClientOGL.h b/gfx/layers/opengl/TextureClientOGL.h index 57e05468a..b996f7eba 100644 --- a/gfx/layers/opengl/TextureClientOGL.h +++ b/gfx/layers/opengl/TextureClientOGL.h @@ -14,7 +14,6 @@ #include "mozilla/layers/CompositorTypes.h" #include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor #include "mozilla/layers/TextureClient.h" // for TextureClient, etc -#include "AndroidSurfaceTexture.h" namespace mozilla { diff --git a/gfx/layers/opengl/TextureHostOGL.cpp b/gfx/layers/opengl/TextureHostOGL.cpp index e4a0f5d95..bc06444b0 100644 --- a/gfx/layers/opengl/TextureHostOGL.cpp +++ b/gfx/layers/opengl/TextureHostOGL.cpp @@ -16,7 +16,6 @@ #include "mozilla/gfx/Logging.h" // for gfxCriticalError #include "mozilla/layers/ISurfaceAllocator.h" #include "nsRegion.h" // for nsIntRegion -#include "AndroidSurfaceTexture.h" #include "GfxTexturesReporter.h" // for GfxTexturesReporter #include "GLBlitTextureImageHelper.h" #include "GeckoProfiler.h" diff --git a/gfx/layers/opengl/TextureHostOGL.h b/gfx/layers/opengl/TextureHostOGL.h index f30811b10..cac58ee65 100644 --- a/gfx/layers/opengl/TextureHostOGL.h +++ b/gfx/layers/opengl/TextureHostOGL.h @@ -36,10 +36,6 @@ namespace gfx { class DataSourceSurface; } // namespace gfx -namespace gl { -class AndroidSurfaceTexture; -} // namespace gl - namespace layers { class Compositor; |