diff options
| -rwxr-xr-x | media/libstagefright/MPEG4Extractor.cpp | 40 | 
1 files changed, 20 insertions, 20 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 4c6bc40..84e07b5 100755 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1555,22 +1555,14 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {              *offset += chunk_size; -            // Ignore stss block for audio even if its present -            // All audio sample are sync samples itself, -            // self decodeable and playable. -            // Parsing this block for audio restricts audio seek to few entries -            // available in this block, sometimes 0, which is undesired. -            const char *mime; -            CHECK(mLastTrack->meta->findCString(kKeyMIMEType, &mime)); -            if (strncasecmp("audio/", mime, 6)) { -                status_t err = -                    mLastTrack->sampleTable->setSyncSampleParams( -                            data_offset, chunk_data_size); +            status_t err = +                mLastTrack->sampleTable->setTimeToSampleParams( +                        data_offset, chunk_data_size); -                if (err != OK) { -                    return err; -                } +            if (err != OK) { +                return err;              } +              break;          } @@ -1598,13 +1590,21 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {                  return ERROR_MALFORMED;              *offset += chunk_size; +            // Ignore stss block for audio even if its present +            // All audio sample are sync samples itself, +            // self decodeable and playable. +            // Parsing this block for audio restricts audio seek to few entries +            // available in this block, sometimes 0, which is undesired. +            const char *mime; +            CHECK(mLastTrack->meta->findCString(kKeyMIMEType, &mime)); +            if (strncasecmp("audio/", mime, 6)) { +                status_t err = +                    mLastTrack->sampleTable->setSyncSampleParams( +                            data_offset, chunk_data_size); -            status_t err = -                mLastTrack->sampleTable->setSyncSampleParams( -                        data_offset, chunk_data_size); - -            if (err != OK) { -                return err; +                if (err != OK) { +                    return err; +                }              }              break;  | 
