mediacodec_h264.patch (2228B)
1 diff --git a/media/ffvpx/libavcodec/mediacodecdec.c b/media/ffvpx/libavcodec/mediacodecdec.c 2 --- a/media/ffvpx/libavcodec/mediacodecdec.c 3 +++ b/media/ffvpx/libavcodec/mediacodecdec.c 4 @@ -36,9 +36,13 @@ 5 #include "avcodec.h" 6 #include "codec_internal.h" 7 #include "decode.h" 8 +#if CONFIG_H264_MEDIACODEC_DECODER_EXTRADATA 9 #include "h264_parse.h" 10 #include "h264_ps.h" 11 +#endif 12 +#if CONFIG_HEVC_MEDIACODEC_DECODER_EXTRADATA 13 #include "hevc/parse.h" 14 +#endif 15 #include "hwconfig.h" 16 #include "internal.h" 17 #include "fffjni.h" 18 @@ -127,7 +131,7 @@ done: 19 } 20 #endif 21 22 -#if CONFIG_H264_MEDIACODEC_DECODER 23 +#if CONFIG_H264_MEDIACODEC_DECODER_EXTRADATA 24 static int h264_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format) 25 { 26 int i; 27 @@ -193,7 +197,7 @@ done: 28 } 29 #endif 30 31 -#if CONFIG_HEVC_MEDIACODEC_DECODER 32 +#if CONFIG_HEVC_MEDIACODEC_DECODER_EXTRADATA 33 static int hevc_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format) 34 { 35 int i; 36 @@ -344,7 +348,11 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx) 37 case AV_CODEC_ID_H264: 38 codec_mime = "video/avc"; 39 40 +#if CONFIG_H264_MEDIACODEC_DECODER_EXTRADATA 41 ret = h264_set_extradata(avctx, format); 42 +#else 43 + ret = 0; 44 +#endif 45 if (ret < 0) 46 goto done; 47 break; 48 @@ -353,7 +361,11 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx) 49 case AV_CODEC_ID_HEVC: 50 codec_mime = "video/hevc"; 51 52 +#if CONFIG_HEVC_MEDIACODEC_DECODER_EXTRADATA 53 ret = hevc_set_extradata(avctx, format); 54 +#else 55 + ret = 0; 56 +#endif 57 if (ret < 0) 58 goto done; 59 break; 60 @@ -637,11 +649,11 @@ const FFCodec ff_ ## short_name ## _mediacodec_decoder = { 61 }; \ 62 63 #if CONFIG_H264_MEDIACODEC_DECODER 64 -DECLARE_MEDIACODEC_VDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb") 65 +DECLARE_MEDIACODEC_VDEC(h264, "H.264", AV_CODEC_ID_H264, NULL) 66 #endif 67 68 #if CONFIG_HEVC_MEDIACODEC_DECODER 69 -DECLARE_MEDIACODEC_VDEC(hevc, "H.265", AV_CODEC_ID_HEVC, "hevc_mp4toannexb") 70 +DECLARE_MEDIACODEC_VDEC(hevc, "H.265", AV_CODEC_ID_HEVC, NULL) 71 #endif 72 73 #if CONFIG_MPEG2_MEDIACODEC_DECODER