Bug 1347765 - add audio codec specific data assertion. r=kinetik draft
authorAlfredo.Yang <ayang@mozilla.com>
Thu, 16 Mar 2017 09:38:44 +0800
changeset 499655 ae51eb46a87eb57915e1d74f905a7611c8e5d0a6
parent 498697 8dd496fd015a2b6e99573070279d9d1593836ea9
child 499832 fe24335a0b4dbc7c8eb8a5fbdbc3c2375ebac0e0
push id49465
push userbmo:ayang@mozilla.com
push dateThu, 16 Mar 2017 01:51:30 +0000
reviewerskinetik
bugs1347765
milestone55.0a1
Bug 1347765 - add audio codec specific data assertion. r=kinetik MozReview-Commit-ID: CQI452xqeMV
media/libstagefright/binding/MP4Metadata.cpp
--- a/media/libstagefright/binding/MP4Metadata.cpp
+++ b/media/libstagefright/binding/MP4Metadata.cpp
@@ -360,16 +360,18 @@ MP4Metadata::GetTrackInfo(mozilla::Track
     switch (aType) {
     case mozilla::TrackInfo::kAudioTrack: {
       AudioInfo *audioRust = infoRust->GetAsAudioInfo(), *audio = info->GetAsAudioInfo();
       MOZ_DIAGNOSTIC_ASSERT(audioRust->mRate == audio->mRate);
       MOZ_DIAGNOSTIC_ASSERT(audioRust->mChannels == audio->mChannels);
       MOZ_DIAGNOSTIC_ASSERT(audioRust->mBitDepth == audio->mBitDepth);
       MOZ_DIAGNOSTIC_ASSERT(audioRust->mProfile == audio->mProfile);
       MOZ_DIAGNOSTIC_ASSERT(audioRust->mExtendedProfile == audio->mExtendedProfile);
+      MOZ_DIAGNOSTIC_ASSERT(*audioRust->mExtraData == *audio->mExtraData);
+      MOZ_DIAGNOSTIC_ASSERT(*audioRust->mCodecSpecificConfig == *audio->mCodecSpecificConfig);
       break;
     }
     case mozilla::TrackInfo::kVideoTrack: {
       VideoInfo *videoRust = infoRust->GetAsVideoInfo(), *video = info->GetAsVideoInfo();
       MOZ_DIAGNOSTIC_ASSERT(videoRust->mDisplay == video->mDisplay);
       MOZ_DIAGNOSTIC_ASSERT(videoRust->mImage == video->mImage);
       MOZ_DIAGNOSTIC_ASSERT(*videoRust->mExtraData == *video->mExtraData);
       // mCodecSpecificConfig is for video/mp4-es, not video/avc. Since video/mp4-es