History

lavc: add vp8/vp9 mediacodec decoders

Matthieu Bouron committed 10 years ago

Commit 0f7fce81 parent b8c158a7 files · +99 −4Browse files

Unified · Split

7 files
  1. Changelog +2 −2
  2. configure +4 −0
  3. libavcodec/Makefile +2 −0
  4. libavcodec/allcodecs.c +4 −0
  5. libavcodec/mediacodecdec.c +14 −0
  6. libavcodec/mediacodecdec_h2645.c +72 −1
  7. libavcodec/version.h +1 −1
Changelog+2−2
@@ -10,7 +10,7 @@ version <next>: · 9 unmodified lines
1010 - curves filter doesn't automatically insert points at x=0 and x=1 anymore
1111 - 16-bit support in curves filter and selectivecolor filter
1212 - OpenH264 decoder wrapper
13−- MediaCodec H.264 and HEVC hwaccel
13+- MediaCodec H.264/HEVC/VP8/VP9 hwaccel
1414 - True Audio (TTA) muxer
1515 - crystalizer audio filter
1616 - acrusher audio filter
@@ -28,7 +28,7 @@ version <next>: · 11 unmodified lines
2828 - gblur filter
2929 - avgblur filter
3030 - sobel and prewitt filter
31−- MediaCodec HEVC decoding
31+- MediaCodec HEVC/VP8/VP9 decoding
3232 - Meridian Lossless Packing (MLP) / TrueHD encoder
3333 - Non-Local Means (nlmeans) denoising filter
3434 - sdl2 output device and ffplay support
configure+4−0
@@ -2662,10 +2662,14 @@ vc1_vdpau_hwaccel_deps="vdpau" · 2661 unmodified lines
26622662 vc1_vdpau_hwaccel_select="vc1_decoder"
26632663 vp8_cuvid_hwaccel_deps="cuda cuvid"
26642664 vp9_cuvid_hwaccel_deps="cuda cuvid"
2665+vp8_mediacodec_decoder_deps="mediacodec"
2666+vp8_mediacodec_hwaccel_deps="mediacodec"
26652667 vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9"
26662668 vp9_d3d11va_hwaccel_select="vp9_decoder"
26672669 vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
26682670 vp9_dxva2_hwaccel_select="vp9_decoder"
2671+vp9_mediacodec_decoder_deps="mediacodec"
2672+vp9_mediacodec_hwaccel_deps="mediacodec"
26692673 vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9"
26702674 vp9_vaapi_hwaccel_select="vp9_decoder"
26712675 wmv3_crystalhd_decoder_select="crystalhd"
libavcodec/Makefile+2−0
@@ -595,9 +595,11 @@ OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o \ · 594 unmodified lines
595595 OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp56rac.o
596596 OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp56rac.o
597597 OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuvid.o
598+OBJS-$(CONFIG_VP8_MEDIACODEC_DECODER) += mediacodecdec_h2645.o
598599 OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9dsp.o vp56rac.o vp9dsp_8bpp.o \
599600 vp9dsp_10bpp.o vp9dsp_12bpp.o
600601 OBJS-$(CONFIG_VP9_CUVID_DECODER) += cuvid.o
602+OBJS-$(CONFIG_VP9_MEDIACODEC_DECODER) += mediacodecdec_h2645.o
601603 OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o
602604 OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
603605 OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o
libavcodec/allcodecs.c+4−0
@@ -115,9 +115,11 @@ void avcodec_register_all(void) · 114 unmodified lines
115115 REGISTER_HWACCEL(VC1_MMAL, vc1_mmal);
116116 REGISTER_HWACCEL(VC1_QSV, vc1_qsv);
117117 REGISTER_HWACCEL(VP8_CUVID, vp8_cuvid);
118+ REGISTER_HWACCEL(VP8_MEDIACODEC, vp8_mediacodec);
118119 REGISTER_HWACCEL(VP9_CUVID, vp9_cuvid);
119120 REGISTER_HWACCEL(VP9_D3D11VA, vp9_d3d11va);
120121 REGISTER_HWACCEL(VP9_DXVA2, vp9_dxva2);
122+ REGISTER_HWACCEL(VP9_MEDIACODEC, vp9_mediacodec);
121123 REGISTER_HWACCEL(VP9_VAAPI, vp9_vaapi);
122124 REGISTER_HWACCEL(WMV3_D3D11VA, wmv3_d3d11va);
123125 REGISTER_HWACCEL(WMV3_DXVA2, wmv3_dxva2);
@@ -657,7 +659,9 @@ void avcodec_register_all(void) · 533 unmodified lines
657659 REGISTER_DECODER(MPEG4_CUVID, mpeg4_cuvid);
658660 REGISTER_DECODER(VC1_CUVID, vc1_cuvid);
659661 REGISTER_DECODER(VP8_CUVID, vp8_cuvid);
662+ REGISTER_DECODER(VP8_MEDIACODEC, vp8_mediacodec);
660663 REGISTER_DECODER(VP9_CUVID, vp9_cuvid);
664+ REGISTER_DECODER(VP9_MEDIACODEC, vp9_mediacodec);
661665
662666 /* parsers */
663667 REGISTER_PARSER(AAC, aac);
libavcodec/mediacodecdec.c+14−0
@@ -766,3 +766,17 @@ AVHWAccel ff_hevc_mediacodec_hwaccel = { · 765 unmodified lines
766766 .id = AV_CODEC_ID_HEVC,
767767 .pix_fmt = AV_PIX_FMT_MEDIACODEC,
768768 };
769+
770+AVHWAccel ff_vp8_mediacodec_hwaccel = {
771+ .name = "mediacodec",
772+ .type = AVMEDIA_TYPE_VIDEO,
773+ .id = AV_CODEC_ID_VP8,
774+ .pix_fmt = AV_PIX_FMT_MEDIACODEC,
775+};
776+
777+AVHWAccel ff_vp9_mediacodec_hwaccel = {
778+ .name = "mediacodec",
779+ .type = AVMEDIA_TYPE_VIDEO,
780+ .id = AV_CODEC_ID_VP9,
781+ .pix_fmt = AV_PIX_FMT_MEDIACODEC,
782+};
libavcodec/mediacodecdec_h2645.c+72−1
@@ -1,5 +1,5 @@
11 /*
2− * Android MediaCodec H.264 / H.265 decoders
2+ * Android MediaCodec H.264 / H.265 / VP8 / VP9 decoders
33 *
44 * Copyright (c) 2015-2016 Matthieu Bouron <matthieu.bouron stupeflix.com>
55 *
@@ -65,6 +65,7 @@ static av_cold int mediacodec_decode_close(AVCodecContext *avctx) · 59 unmodified lines
6565 return 0;
6666 }
6767
68+#if CONFIG_H264_MEDIACODEC_DECODER || CONFIG_HEVC_MEDIACODEC_DECODER
6869 static int h2645_ps_to_nalu(const uint8_t *src, int src_size, uint8_t **out, int *out_size)
6970 {
7071 int i;
@@ -116,6 +117,7 @@ done: · 45 unmodified lines
116117
117118 return ret;
118119 }
120+#endif
119121
120122 #if CONFIG_H264_MEDIACODEC_DECODER
121123 static int h264_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format)
@@ -264,6 +266,19 @@ done: · 142 unmodified lines
264266 }
265267 #endif
266268
269+#if CONFIG_VP8_MEDIACODEC_DECODER || CONFIG_VP9_MEDIACODEC_DECODER
270+static int vpx_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format)
271+{
272+ int ret = 0;
273+
274+ if (avctx->extradata) {
275+ ff_AMediaFormat_setBuffer(format, "csd-0", avctx->extradata, avctx->extradata_size);
276+ }
277+
278+ return ret;
279+}
280+#endif
281+
267282 static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
268283 {
269284 int ret;
@@ -303,6 +318,24 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx) · 33 unmodified lines
303318 if (ret < 0)
304319 goto done;
305320 break;
321+#endif
322+#if CONFIG_VP8_MEDIACODEC_DECODER
323+ case AV_CODEC_ID_VP8:
324+ codec_mime = "video/x-vnd.on2.vp8";
325+
326+ ret = vpx_set_extradata(avctx, format);
327+ if (ret < 0)
328+ goto done;
329+ break;
330+#endif
331+#if CONFIG_VP9_MEDIACODEC_DECODER
332+ case AV_CODEC_ID_VP9:
333+ codec_mime = "video/x-vnd.on2.vp9";
334+
335+ ret = vpx_set_extradata(avctx, format);
336+ if (ret < 0)
337+ goto done;
338+ break;
306339 #endif
307340 default:
308341 av_assert0(0);
@@ -332,6 +365,7 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx) · 23 unmodified lines
332365 goto done;
333366 }
334367
368+ if (bsf_name) {
335369 bsf = av_bsf_get_by_name(bsf_name);
336370 if(!bsf) {
337371 ret = AVERROR_BSF_NOT_FOUND;
@@ -346,6 +380,7 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx) · 8 unmodified lines
346380 ((ret = av_bsf_init(s->bsf)) < 0)) {
347381 goto done;
348382 }
383+ }
349384
350385 av_init_packet(&s->filtered_pkt);
351386
@@ -436,6 +471,7 @@ static int mediacodec_decode_frame(AVCodecContext *avctx, void *data, · 84 unmodified lines
436471
437472 av_fifo_generic_read(s->fifo, &input_pkt, sizeof(input_pkt), NULL);
438473
474+ if (s->bsf) {
439475 ret = av_bsf_send_packet(s->bsf, &input_pkt);
440476 if (ret < 0) {
441477 return ret;
@@ -445,6 +481,9 @@ static int mediacodec_decode_frame(AVCodecContext *avctx, void *data, · 3 unmodified lines
445481 if (ret == AVERROR(EAGAIN)) {
446482 goto done;
447483 }
484+ } else {
485+ av_packet_move_ref(&s->filtered_pkt, &input_pkt);
486+ }
448487
449488 /* {h264,hevc}_mp4toannexb are used here and do not require flushing */
450489 av_assert0(ret != AVERROR_EOF);
@@ -512,3 +551,35 @@ AVCodec ff_hevc_mediacodec_decoder = { · 61 unmodified lines
512551 .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
513552 };
514553 #endif
554+
555+#if CONFIG_VP8_MEDIACODEC_DECODER
556+AVCodec ff_vp8_mediacodec_decoder = {
557+ .name = "vp8_mediacodec",
558+ .long_name = NULL_IF_CONFIG_SMALL("VP8 Android MediaCodec decoder"),
559+ .type = AVMEDIA_TYPE_VIDEO,
560+ .id = AV_CODEC_ID_VP8,
561+ .priv_data_size = sizeof(MediaCodecH264DecContext),
562+ .init = mediacodec_decode_init,
563+ .decode = mediacodec_decode_frame,
564+ .flush = mediacodec_decode_flush,
565+ .close = mediacodec_decode_close,
566+ .capabilities = CODEC_CAP_DELAY,
567+ .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
568+};
569+#endif
570+
571+#if CONFIG_VP9_MEDIACODEC_DECODER
572+AVCodec ff_vp9_mediacodec_decoder = {
573+ .name = "vp9_mediacodec",
574+ .long_name = NULL_IF_CONFIG_SMALL("VP9 Android MediaCodec decoder"),
575+ .type = AVMEDIA_TYPE_VIDEO,
576+ .id = AV_CODEC_ID_VP9,
577+ .priv_data_size = sizeof(MediaCodecH264DecContext),
578+ .init = mediacodec_decode_init,
579+ .decode = mediacodec_decode_frame,
580+ .flush = mediacodec_decode_flush,
581+ .close = mediacodec_decode_close,
582+ .capabilities = CODEC_CAP_DELAY,
583+ .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
584+};
585+#endif
libavcodec/version.h+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include "libavutil/version.h"
2929
3030 #define LIBAVCODEC_VERSION_MAJOR 57
31−#define LIBAVCODEC_VERSION_MINOR 61
31+#define LIBAVCODEC_VERSION_MINOR 62
3232 #define LIBAVCODEC_VERSION_MICRO 103
3333
3434 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t