Bug 1118597 - Re-enable MoofParser for encrypted MP4 streams - r=jya a=lmandel
authorEdwin Flores <edwin@mozilla.com>
Tue, 27 Jan 2015 18:35:36 +1300
changeset 240831 6c9c716ffcad1f07e92bc54e10ecc840e4e2295c
parent 240830 b1e18ec6569565665cc1b3188b7256c59ac21f63
child 240832 c0260518150b9345e7c66420d051b053410ca451
push id7667
push userrgiles@mozilla.com
push dateSun, 22 Feb 2015 02:18:06 +0000
treeherdermozilla-aurora@c0260518150b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya, lmandel
bugs1118597
milestone37.0a2
Bug 1118597 - Re-enable MoofParser for encrypted MP4 streams - r=jya a=lmandel
media/libstagefright/binding/mp4_demuxer.cpp
--- a/media/libstagefright/binding/mp4_demuxer.cpp
+++ b/media/libstagefright/binding/mp4_demuxer.cpp
@@ -118,31 +118,31 @@ MP4Demuxer::Init()
         return false;
       }
       mPrivate->mAudio = track;
       mAudioConfig.Update(metaData, mimeType);
       nsRefPtr<Index> index = new Index(mPrivate->mAudio->exportIndex(),
                                         mSource, mAudioConfig.mTrackId,
                                         mTimestampOffset, mMonitor);
       mPrivate->mIndexes.AppendElement(index);
-      if (index->IsFragmented() && !mAudioConfig.crypto.valid) {
+      if (index->IsFragmented()) {
         mPrivate->mAudioIterator = new SampleIterator(index);
       }
     } else if (!mPrivate->mVideo.get() && !strncmp(mimeType, "video/", 6)) {
       sp<MediaSource> track = e->getTrack(i);
       if (track->start() != OK) {
         return false;
       }
       mPrivate->mVideo = track;
       mVideoConfig.Update(metaData, mimeType);
       nsRefPtr<Index> index = new Index(mPrivate->mVideo->exportIndex(),
                                         mSource, mVideoConfig.mTrackId,
                                         mTimestampOffset, mMonitor);
       mPrivate->mIndexes.AppendElement(index);
-      if (index->IsFragmented() && !mVideoConfig.crypto.valid) {
+      if (index->IsFragmented()) {
         mPrivate->mVideoIterator = new SampleIterator(index);
       }
     }
   }
   sp<MetaData> metaData = e->getMetaData();
   mCrypto.Update(metaData);
 
   int64_t movieDuration;