OSDN Git Service

add support for mpeg1video. (fix fall.mpg)
authorMichael Chen <omxcodec@gmail.com>
Sat, 7 Sep 2013 16:05:39 +0000 (00:05 +0800)
committerMichael Chen <omxcodec@gmail.com>
Sat, 7 Sep 2013 16:05:39 +0000 (00:05 +0800)
ffmpeg mpeg2video decoder can process "CODEC_ID_MPEG2VIDEO" and "CODEC_ID_MPEG1VIDEO" codec

libstagefright/FFmpegExtractor/FFmpegExtractor.cpp

index 9ac8c11..fd62be3 100644 (file)
@@ -484,6 +484,7 @@ int FFmpegExtractor::stream_component_open(int stream_index)
     case CODEC_ID_MP1:
     case CODEC_ID_MP2:
     case CODEC_ID_MP3:
+    case CODEC_ID_MPEG1VIDEO:
     case CODEC_ID_MPEG2VIDEO:
     case CODEC_ID_WMV1:
     case CODEC_ID_WMV2:
@@ -611,8 +612,9 @@ int FFmpegExtractor::stream_component_open(int stream_index)
             ALOGV("H263");
             meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_H263);
             break;
+        case CODEC_ID_MPEG1VIDEO:
         case CODEC_ID_MPEG2VIDEO:
-            ALOGV("MPEG2VIDEO");
+            ALOGV("MPEG%dVIDEO", avctx->codec_id == CODEC_ID_MPEG2VIDEO ? 2 : 1);
             meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_MPEG2);
             {
                 sp<ABuffer> csd = new ABuffer(avctx->extradata_size);