Back out 1ee5457afe8c (bug 1142433) for frequent w-p-t-3 failures
authorPhil Ringnalda <philringnalda@gmail.com>
Thu, 12 Mar 2015 20:28:14 -0700
changeset 233453 aa48e92f7e57791f4446aa0e745125751bee415d
parent 233452 35690b2e6d73c1389ce6d8ed8bcdd907c3eaf5f8
child 233454 cbb20d85f7fe52ef1bf672e0f8e888e7d9fc087b
push id56849
push userphilringnalda@gmail.com
push dateFri, 13 Mar 2015 03:28:48 +0000
treeherdermozilla-inbound@aa48e92f7e57 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1142433
milestone39.0a1
backs out1ee5457afe8c943473dac36202ff31514bc44df0
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out 1ee5457afe8c (bug 1142433) for frequent w-p-t-3 failures CLOSED TREE
media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
--- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
@@ -1784,19 +1784,18 @@ status_t MPEG4Extractor::parseChunk(off6
                 uint32_t duration32;
                 if (mDataSource->readAt(
                             data_offset + 4, &duration32, sizeof(duration32))
                         < (ssize_t)sizeof(duration32)) {
                     return ERROR_IO;
                 }
                 duration = ntohl(duration32);
             }
-            if (duration && mHeaderTimescale) {
-                mFileMetaData->setInt64(
-                        kKeyMovieDuration, (duration * 1000000) / mHeaderTimescale);
+            if (duration) {
+              mFileMetaData->setInt64(kKeyMovieDuration, duration * 1000LL);
             }
 
             *offset += chunk_size;
             break;
         }
 
         case FOURCC('m', 'd', 'a', 't'):
         {