From 1156cc49c39d457ecbf8d933f222b5344029986b Mon Sep 17 00:00:00 2001 From: Jean-Yves Avenard Date: Fri, 9 Nov 2018 22:07:40 +0000 Subject: [PATCH] Bug 1506076 - Mark video android decoder as needing AnnexB. r=jolin,alwu It only used to work as the H264Converter used to check that the conversion needed was != kNeedAVCC (the default being kNone) Differential Revision: https://phabricator.services.mozilla.com/D11526 --HG-- extra : moz-landing-system : lando --- dom/media/platforms/android/RemoteDataDecoder.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dom/media/platforms/android/RemoteDataDecoder.cpp b/dom/media/platforms/android/RemoteDataDecoder.cpp index 70fa16a0564f..38f1302fc6f3 100644 --- a/dom/media/platforms/android/RemoteDataDecoder.cpp +++ b/dom/media/platforms/android/RemoteDataDecoder.cpp @@ -279,6 +279,11 @@ public: return mIsHardwareAccelerated; } + ConversionRequired NeedsConversion() const override + { + return ConversionRequired::kNeedAnnexB; + } + private: const VideoInfo mConfig; GeckoSurface::GlobalRef mSurface; @@ -339,11 +344,6 @@ public: return InitPromise::CreateAndResolve(TrackInfo::kAudioTrack, __func__); } - ConversionRequired NeedsConversion() const override - { - return ConversionRequired::kNeedAnnexB; - } - private: class CallbacksSupport final : public JavaCallbacksSupport {