commit c87073d685eff98c0ed2d30139165eaecbf8ff13
author Iris Chang <iris.chang@mediatek.com> Fri Jan 18 15:02:32 2019 +0800
committer Marco Nelissen <marcone@google.com> Tue Jan 29 15:02:16 2019 -0800
tree 9afdba17c0d22f93806e84b2b66c469b9a7a7db4
parent 9c3e0dac4f3916e09204fdfbd092eccdbaf2ca65

Cannot play mov file with samr box

Problem: Cannot play mov file which has stsd->wave->samr.

Solution: delete the judge condition
"chunk_type == FOURCC('m','p','4','a')" to make other
audio type can play, not only mp4a can be played.

Bug: 123166627
Test: test with the file which has stsd->wave->samr and
check if it can be played normally.

Change-Id: I7816230af39d99b3f73085db04b8bd7acccd3a19

media/extractors/mp4/MPEG4Extractor.cpp

diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp
index c647079..ac54116 100755
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -1635,9 +1635,8 @@
         case FOURCC(".mp3"):
         case 0x6D730055: // "ms U" mp3 audio
         {
-            if (mIsQT && chunk_type == FOURCC("mp4a")
-                    && depth >= 1 && mPath[depth - 1] == FOURCC("wave")) {
-                // Ignore mp4a embedded in QT wave atom
+            if (mIsQT && depth >= 1 && mPath[depth - 1] == FOURCC("wave")) {
+                // Ignore all atoms embedded in QT wave atom
                 *offset += chunk_size;
                 break;
             }
@@ -1666,7 +1665,7 @@
             off64_t stop_offset = *offset + chunk_size;
             *offset = data_offset + sizeof(buffer);
 
-            if (mIsQT && chunk_type == FOURCC("mp4a")) {
+            if (mIsQT) {
                 if (version == 1) {
                     if (mDataSource->readAt(*offset, buffer, 16) < 16) {
                         return ERROR_IO;