add kKeyRawCodecSpecificData in meta, it stores extradata

diff --git a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
index 1f57f71..86cfe97 100644 (file)
--- a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
+++ b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
@@ -643,12 +643,7 @@ int FFmpegExtractor::stream_component_open(int stream_index)
         case CODEC_ID_WMV2:
             LOGV("WMV2");
             meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_WMV12);
-            {
-                sp<ABuffer> csd = new ABuffer(avctx->extradata_size);
-                memcpy(csd->data(), avctx->extradata, avctx->extradata_size);
-                sp<ABuffer> esds = MakeRawCodecSpecificData(csd);
-                meta->setData(kKeyESDS, kTypeESDS, esds->data(), esds->size());
-            }
+            meta->setData(kKeyRawCodecSpecificData, 0, avctx->extradata, avctx->extradata_size);
             break;
         default:
             CHECK(!"Should not be here. Unsupported codec.");
@@ -753,12 +748,7 @@ int FFmpegExtractor::stream_component_open(int stream_index)
             LOGV("WMAV2");
             meta = new MetaData;
             meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_WMA);
-            {
-                sp<ABuffer> csd = new ABuffer(avctx->extradata_size);
-                memcpy(csd->data(), avctx->extradata, avctx->extradata_size);
-                sp<ABuffer> esds = MakeRawCodecSpecificData(csd);
-                meta->setData(kKeyESDS, kTypeESDS, esds->data(), esds->size());
-            }
+            meta->setData(kKeyRawCodecSpecificData, 0, avctx->extradata, avctx->extradata_size);
             break;
         default:
             CHECK(!"Should not be here. Unsupported codec.");
@@ -773,15 +763,6 @@ int FFmpegExtractor::stream_component_open(int stream_index)
         if (mFormatCtx->duration != AV_NOPTS_VALUE)
             meta->setInt64(kKeyDuration, mFormatCtx->duration);
 
-        if (avctx->codec_id != CODEC_ID_MP3 &&
-                avctx->codec_id != CODEC_ID_MP1 &&
-                avctx->codec_id != CODEC_ID_MP2 &&
-                avctx->codec_id != CODEC_ID_AC3) {
-            LOGV("audio meta esds:");
-            CHECK(meta->findData(kKeyESDS, &type, &data, &size));
-            hexdump(data, size);
-        }
-
         LOGV("create a audio track");
         index = mTracks.add(
             stream_index, new Track(this, meta, false, mAudioStream, &mAudioQ));