From 55d6ddef1220638e35ab17924431509040a2a3a1 Mon Sep 17 00:00:00 2001 From: Alfredo Yang Date: Thu, 18 May 2017 16:54:43 +0800 Subject: [PATCH] Bug 1365872 - remove parsing mp4v mCodecSpecificConfig which is for b2g. r=jya MozReview-Commit-ID: G3l6AtEH0hO --HG-- extra : rebase_source : bad9f7ae16715acb53826a494203cd7bbee138b3 --- dom/media/platforms/omx/OmxDataDecoder.cpp | 2 +- media/libstagefright/binding/DecoderData.cpp | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/dom/media/platforms/omx/OmxDataDecoder.cpp b/dom/media/platforms/omx/OmxDataDecoder.cpp index b64917688e4d..011e23cc861e 100644 --- a/dom/media/platforms/omx/OmxDataDecoder.cpp +++ b/dom/media/platforms/omx/OmxDataDecoder.cpp @@ -609,7 +609,7 @@ OmxDataDecoder::FillCodecConfigDataToOmx() if (mTrackInfo->IsAudio()) { csc = mTrackInfo->GetAsAudioInfo()->mCodecSpecificConfig; } else if (mTrackInfo->IsVideo()) { - csc = mTrackInfo->GetAsVideoInfo()->mCodecSpecificConfig; + csc = mTrackInfo->GetAsVideoInfo()->mExtraData; } MOZ_RELEASE_ASSERT(csc); diff --git a/media/libstagefright/binding/DecoderData.cpp b/media/libstagefright/binding/DecoderData.cpp index eb3c6e04af54..b2ee8c942611 100644 --- a/media/libstagefright/binding/DecoderData.cpp +++ b/media/libstagefright/binding/DecoderData.cpp @@ -175,19 +175,6 @@ MP4VideoInfo::Update(const MetaData* aMetaData, const char* aMimeType) mRotation = VideoInfo::ToSupportedRotation(FindInt32(aMetaData, kKeyRotation)); FindData(aMetaData, kKeyAVCC, mExtraData); - if (!mExtraData->Length()) { - if (FindData(aMetaData, kKeyESDS, mExtraData)) { - ESDS esds(mExtraData->Elements(), mExtraData->Length()); - - const void* data; - size_t size; - if (esds.getCodecSpecificInfo(&data, &size) == OK) { - const uint8_t* cdata = reinterpret_cast(data); - mCodecSpecificConfig->AppendElements(cdata, size); - } - } - } - } static void