stagefright-plugins: Fix HEVC extradata handling

[android-x86/external-stagefright-plugins.git] / extractor / FFmpegExtractor.cpp

diff --git a/extractor/FFmpegExtractor.cpp b/extractor/FFmpegExtractor.cpp
index 0a409bf..38b0a33 100644 (file)
--- a/extractor/FFmpegExtractor.cpp
+++ b/extractor/FFmpegExtractor.cpp
@@ -94,6 +94,7 @@ private:
     mutable Mutex mLock;
 
     bool mIsAVC;
+    bool mIsHEVC;
     size_t mNALLengthSize;
     bool mNal2AnnexB;
 
@@ -1297,6 +1298,7 @@ FFmpegSource::FFmpegSource(
     : mExtractor(extractor),
       mTrackIndex(index),
       mIsAVC(false),
+      mIsHEVC(false),
       mNal2AnnexB(false),
       mStream(mExtractor->mTracks.itemAt(index).mStream),
       mQueue(mExtractor->mTracks.itemAt(index).mQueue),
@@ -1329,6 +1331,26 @@ FFmpegSource::FFmpegSource(
             ALOGV("the stream is AVC, the length of a NAL unit: %d", mNALLengthSize);
 
             mNal2AnnexB = true;
+        } else if (avctx->codec_id == AV_CODEC_ID_HEVC
+                && avctx->extradata_size > 0) {
+            mIsHEVC = true;
+
+            uint32_t type;
+            const void *data;
+            size_t size;
+            CHECK(meta->findData(kKeyHVCC, &type, &data, &size));
+
+            const uint8_t *ptr = (const uint8_t *)data;
+
+            CHECK(size >= 7);
+            //CHECK_EQ((unsigned)ptr[0], 1u);  // configurationVersion == 1
+
+            // The number of bytes used to encode the length of a NAL unit.
+            mNALLengthSize = 1 + (ptr[21] & 3);
+
+            ALOGD("the stream is HEVC, the length of a NAL unit: %d", mNALLengthSize);
+
+            mNal2AnnexB = true;
         }
     }
 
@@ -1441,7 +1463,7 @@ retry:
     mediaBuffer->set_range(0, pkt.size);
 
     //copy data
-    if (mIsAVC && mNal2AnnexB) {
+    if ((mIsAVC || mIsHEVC) && mNal2AnnexB) {
         /* This only works for NAL sizes 3-4 */
         CHECK(mNALLengthSize == 3 || mNALLengthSize == 4);