commit d089a740e1e61d9503d2c84259bacb3e06c58a0e
author Chong Zhang <chz@google.com> Thu Jul 31 00:01:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 25 23:00:08 2014 +0000
tree 23f1ee561ed96656f37cd4b71bd20525ac758501
parent cb48eacb6f8857c7857bb28d6a13d4a0d417f2bd
parent 9bf32f06e8971c1d3eb4fc5edd74b69557f97212

Merge "ATSParser: treat stream type 0x83 as TrueHD AC3" into lmp-dev

media/libstagefright/MediaCodecList.cpp

diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp
index 8f54343..d021533 100644
--- a/media/libstagefright/MediaCodecList.cpp
+++ b/media/libstagefright/MediaCodecList.cpp
@@ -803,7 +803,7 @@
 
 bool MediaCodecList::isEncoder(size_t index) const {
     if (index >= mCodecInfos.size()) {
-        return NULL;
+        return false;
     }
 
     const CodecInfo &info = mCodecInfos.itemAt(index);
@@ -813,7 +813,7 @@
 bool MediaCodecList::codecHasQuirk(
         size_t index, const char *quirkName) const {
     if (index >= mCodecInfos.size()) {
-        return NULL;
+        return false;
     }
 
     const CodecInfo &info = mCodecInfos.itemAt(index);

media/libstagefright/mpeg2ts/ATSParser.cpp

diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp
index 3d241e0..eda6387 100644
--- a/media/libstagefright/mpeg2ts/ATSParser.cpp
+++ b/media/libstagefright/mpeg2ts/ATSParser.cpp
@@ -503,11 +503,7 @@
                     ElementaryStreamQueue::MPEG4_VIDEO);
             break;
 
-        case STREAMTYPE_PCM_AUDIO:
-            mQueue = new ElementaryStreamQueue(
-                    ElementaryStreamQueue::PCM_AUDIO);
-            break;
-
+        case STREAMTYPE_LPCM_AC3:
         case STREAMTYPE_AC3:
             mQueue = new ElementaryStreamQueue(
                     ElementaryStreamQueue::AC3);
@@ -622,7 +618,7 @@
         case STREAMTYPE_MPEG1_AUDIO:
         case STREAMTYPE_MPEG2_AUDIO:
         case STREAMTYPE_MPEG2_AUDIO_ADTS:
-        case STREAMTYPE_PCM_AUDIO:
+        case STREAMTYPE_LPCM_AC3:
         case STREAMTYPE_AC3:
             return true;
 

media/libstagefright/mpeg2ts/ATSParser.h

diff --git a/media/libstagefright/mpeg2ts/ATSParser.h b/media/libstagefright/mpeg2ts/ATSParser.h
index 86b025f..8986a22 100644
--- a/media/libstagefright/mpeg2ts/ATSParser.h
+++ b/media/libstagefright/mpeg2ts/ATSParser.h
@@ -93,7 +93,9 @@
         // From ATSC A/53 Part 3:2009, 6.7.1
         STREAMTYPE_AC3                  = 0x81,
 
-        STREAMTYPE_PCM_AUDIO            = 0x83,
+        // Stream type 0x83 is non-standard,
+        // it could be LPCM or TrueHD AC3
+        STREAMTYPE_LPCM_AC3             = 0x83,
     };
 
 protected: