| Message ID | DBAPR02MB61656446F17F24BF8BE056E2ED6B9@DBAPR02MB6165.eurprd02.prod.outlook.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/mediacodec: Add VP8 encoder | expand |
| Context | Check | Description |
|---|---|---|
| andriy/configure_x86 | warning | Failed to apply patch |
fre 2023-04-28 klockan 11:07 +0000 skrev Samuel Raposo Vieira Mira: > > Connected FFmpeg to Mediacodec VP8 encoder. > Minor Version bump. > --- > configure | 1 + > libavcodec/Makefile | 1 + > libavcodec/allcodecs.c | 1 + > libavcodec/mediacodec_wrapper.c | 4 ++++ > libavcodec/mediacodecenc.c | 29 +++++++++++++++++++++++++++++ > libavcodec/version.h | 2 +- > 6 files changed, 37 insertions(+), 1 deletion(-) Looks OK but maybe Zhao wants to chime in? /Tomas
On Fri, 2023-04-28 at 11:07 +0000, Samuel Raposo Vieira Mira wrote: > Connected FFmpeg to Mediacodec VP8 encoder. > Minor Version bump. > --- > configure | 1 + > libavcodec/Makefile | 1 + > libavcodec/allcodecs.c | 1 + > libavcodec/mediacodec_wrapper.c | 4 ++++ > libavcodec/mediacodecenc.c | 29 +++++++++++++++++++++++++++++ > libavcodec/version.h | 2 +- > 6 files changed, 37 insertions(+), 1 deletion(-) The patch file format is broken (missing a space before unchanged lines). Please send it via git send-email or add the patch as attachment. > > @@ -387,6 +389,8 @@ int ff_AMediaCodecProfile_getProfileFromAVCodecContext(AVCodecContext *avctx) > case FF_PROFILE_HEVC_MAIN_10: > return HEVCProfileMain10; > } > + } else if (avctx->codec_id == AV_CODEC_ID_VP8) { > + return VP8ProfileMain; > } else if (avctx->codec_id == AV_CODEC_ID_VP9) { > switch (avctx->profile) { > case FF_PROFILE_VP9_0: The function is a map from avctx->profile to MediaCodec profile. It's not supposed to select a default profile.
> > Connected FFmpeg to Mediacodec VP8 encoder. > > Minor Version bump. > --- > > configure | 1 + > > libavcodec/Makefile | 1 + > > libavcodec/allcodecs.c | 1 + > > libavcodec/mediacodec_wrapper.c | 4 ++++ > > libavcodec/mediacodecenc.c | 29 +++++++++++++++++++++++++++++ > > libavcodec/version.h | 2 +- > > 6 files changed, 37 insertions(+), 1 deletion(-) > > The patch file format is broken (missing a space before unchanged lines). > Please send it via git send-email or add the patch as attachment. Thanks for noticing the issue! will send as patch next time. > > > > @@ -387,6 +389,8 @@ int ff_AMediaCodecProfile_getProfileFromAVCodecContext(AVCodecContext *avctx) > > case FF_PROFILE_HEVC_MAIN_10: > > return HEVCProfileMain10; > > } > > + } else if (avctx->codec_id == AV_CODEC_ID_VP8) { > > + return VP8ProfileMain; > > } else if (avctx->codec_id == AV_CODEC_ID_VP9) { > > switch (avctx->profile) { > > case FF_PROFILE_VP9_0: > > The function is a map from avctx->profile to MediaCodec profile. > It's not supposed to select a default profile. But there is no avctx->profile for VP8. Should I create an FF_PROFILE_VP8? From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> on behalf of Zhao Zhili <quinkblack@foxmail.com> Date: Sunday, 7. May 2023 at 11.26 To: Samuel Raposo Vieira Mira <samuel.mira@qt.io>, FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH] avcodec/mediacodec: Add VP8 encoder On Fri, 2023-04-28 at 11:07 +0000, Samuel Raposo Vieira Mira wrote: > Connected FFmpeg to Mediacodec VP8 encoder. > Minor Version bump. > --- > configure | 1 + > libavcodec/Makefile | 1 + > libavcodec/allcodecs.c | 1 + > libavcodec/mediacodec_wrapper.c | 4 ++++ > libavcodec/mediacodecenc.c | 29 +++++++++++++++++++++++++++++ > libavcodec/version.h | 2 +- > 6 files changed, 37 insertions(+), 1 deletion(-) The patch file format is broken (missing a space before unchanged lines). Please send it via git send-email or add the patch as attachment. > > @@ -387,6 +389,8 @@ int ff_AMediaCodecProfile_getProfileFromAVCodecContext(AVCodecContext *avctx) > case FF_PROFILE_HEVC_MAIN_10: > return HEVCProfileMain10; > } > + } else if (avctx->codec_id == AV_CODEC_ID_VP8) { > + return VP8ProfileMain; > } else if (avctx->codec_id == AV_CODEC_ID_VP9) { > switch (avctx->profile) { > case FF_PROFILE_VP9_0: The function is a map from avctx->profile to MediaCodec profile. It's not supposed to select a default profile.
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Samuel Raposo Vieira Mira > Sent: 2023年5月17日 0:16 > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH] avcodec/mediacodec: Add VP8 encoder > > > > Connected FFmpeg to Mediacodec VP8 encoder. > > > Minor Version bump. > > --- > > > configure | 1 + > > > libavcodec/Makefile | 1 + > > > libavcodec/allcodecs.c | 1 + > > > libavcodec/mediacodec_wrapper.c | 4 ++++ > > > libavcodec/mediacodecenc.c | 29 +++++++++++++++++++++++++++++ > > > libavcodec/version.h | 2 +- > > > 6 files changed, 37 insertions(+), 1 deletion(-) > > > > The patch file format is broken (missing a space before unchanged lines). > > Please send it via git send-email or add the patch as attachment. > > Thanks for noticing the issue! will send as patch next time. > > > > > > > @@ -387,6 +389,8 @@ int ff_AMediaCodecProfile_getProfileFromAVCodecContext(AVCodecContext *avctx) > > > case FF_PROFILE_HEVC_MAIN_10: > > > return HEVCProfileMain10; > > > } > > > + } else if (avctx->codec_id == AV_CODEC_ID_VP8) { > > > + return VP8ProfileMain; > > > } else if (avctx->codec_id == AV_CODEC_ID_VP9) { > > > switch (avctx->profile) { > > > case FF_PROFILE_VP9_0: > > > > The function is a map from avctx->profile to MediaCodec profile. > > It's not supposed to select a default profile. > > But there is no avctx->profile for VP8. > Should I create an FF_PROFILE_VP8? Since there is only one profile and unlikely to change in the future, it seems profile is useless for VP8 decoder and encoder. I think we can just ignore/skip it for VP8. > > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> on behalf of Zhao Zhili <quinkblack@foxmail.com> > Date: Sunday, 7. May 2023 at 11.26 > To: Samuel Raposo Vieira Mira <samuel.mira@qt.io>, FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH] avcodec/mediacodec: Add VP8 encoder > On Fri, 2023-04-28 at 11:07 +0000, Samuel Raposo Vieira Mira wrote: > > Connected FFmpeg to Mediacodec VP8 encoder. > > Minor Version bump. > > --- > > configure | 1 + > > libavcodec/Makefile | 1 + > > libavcodec/allcodecs.c | 1 + > > libavcodec/mediacodec_wrapper.c | 4 ++++ > > libavcodec/mediacodecenc.c | 29 +++++++++++++++++++++++++++++ > > libavcodec/version.h | 2 +- > > 6 files changed, 37 insertions(+), 1 deletion(-) > > The patch file format is broken (missing a space before unchanged lines). > Please send it via git send-email or add the patch as attachment. > > > > > @@ -387,6 +389,8 @@ int ff_AMediaCodecProfile_getProfileFromAVCodecContext(AVCodecContext *avctx) > > case FF_PROFILE_HEVC_MAIN_10: > > return HEVCProfileMain10; > > } > > + } else if (avctx->codec_id == AV_CODEC_ID_VP8) { > > + return VP8ProfileMain; > > } else if (avctx->codec_id == AV_CODEC_ID_VP9) { > > switch (avctx->profile) { > > case FF_PROFILE_VP9_0: > > The function is a map from avctx->profile to MediaCodec profile. > It's not supposed to select a default profile. > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/configure b/configure index bb7be67676..1aef227cd4 100755 --- a/configure +++ b/configure @@ -3239,6 +3239,7 @@ vc1_qsv_decoder_select="qsvdec" vc1_v4l2m2m_decoder_deps="v4l2_m2m vc1_v4l2_m2m" vp8_cuvid_decoder_deps="cuvid" vp8_mediacodec_decoder_deps="mediacodec" +vp8_mediacodec_encoder_deps="mediacodec" vp8_qsv_decoder_select="qsvdec" vp8_rkmpp_decoder_deps="rkmpp" vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b0971ce833..512d5bd1b0 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -766,6 +766,7 @@ OBJS-$(CONFIG_VP7_DECODER) += vp8.o vpx_rac.o OBJS-$(CONFIG_VP8_DECODER) += vp8.o vpx_rac.o OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VP8_MEDIACODEC_DECODER) += mediacodecdec.o +OBJS-$(CONFIG_VP8_MEDIACODEC_ENCODER) += mediacodecenc.o OBJS-$(CONFIG_VP8_QSV_DECODER) += qsvdec.o OBJS-$(CONFIG_VP8_RKMPP_DECODER) += rkmppdec.o OBJS-$(CONFIG_VP8_VAAPI_ENCODER) += vaapi_encode_vp8.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 8eeed34e57..2e37db69fa 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -880,6 +880,7 @@ extern const FFCodec ff_prores_videotoolbox_encoder; extern const FFCodec ff_vc1_cuvid_decoder; extern const FFCodec ff_vp8_cuvid_decoder; extern const FFCodec ff_vp8_mediacodec_decoder; +extern const FFCodec ff_vp8_mediacodec_encoder; extern const FFCodec ff_vp8_qsv_decoder; extern const FFCodec ff_vp8_v4l2m2m_encoder; extern const FFCodec ff_vp8_vaapi_encoder; diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c index 1c29bb7406..8619735bfc 100644 --- a/libavcodec/mediacodec_wrapper.c +++ b/libavcodec/mediacodec_wrapper.c @@ -319,6 +319,8 @@ int ff_AMediaCodecProfile_getProfileFromAVCodecContext(AVCodecContext *avctx) static const int HEVCProfileMain10HDR10 = 0x1000; static const int HEVCProfileMain10HDR10Plus = 0x2000; + static const int VP8ProfileMain = 0x01; + static const int VP9Profile0 = 0x01; static const int VP9Profile1 = 0x02; static const int VP9Profile2 = 0x04; @@ -387,6 +389,8 @@ int ff_AMediaCodecProfile_getProfileFromAVCodecContext(AVCodecContext *avctx) case FF_PROFILE_HEVC_MAIN_10: return HEVCProfileMain10; } + } else if (avctx->codec_id == AV_CODEC_ID_VP8) { + return VP8ProfileMain; } else if (avctx->codec_id == AV_CODEC_ID_VP9) { switch (avctx->profile) { case FF_PROFILE_VP9_0: diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c index e4b583a542..6f80dbb4a5 100644 --- a/libavcodec/mediacodecenc.c +++ b/libavcodec/mediacodecenc.c @@ -164,6 +164,9 @@ static av_cold int mediacodec_init(AVCodecContext *avctx) case AV_CODEC_ID_HEVC: codec_mime = "video/hevc"; break; + case AV_CODEC_ID_VP8: + codec_mime = "video/x-vnd.on2.vp8"; + break; case AV_CODEC_ID_VP9: codec_mime = "video/x-vnd.on2.vp9"; break; @@ -775,6 +778,32 @@ DECLARE_MEDIACODEC_ENCODER(hevc, "H.265", AV_CODEC_ID_HEVC) #endif // CONFIG_HEVC_MEDIACODEC_ENCODER +#if CONFIG_VP8_MEDIACODEC_ENCODER + +enum MediaCodecVP8Level { + VP8Level_Version0 = 0x01, + VP8Level_Version1 = 0x02, + VP8Level_Version2 = 0x04, + VP8Level_Version3 = 0x08, +}; + +static const AVOption vp8_options[] = { + COMMON_OPTION + { "level", "Specify tier and level", + OFFSET(level), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, VE, "level" }, + { "V0", "Level Version 0", + 0, AV_OPT_TYPE_CONST, { .i64 = VP8Level_Version0 }, 0, 0, VE, "level" }, + { "V1", "Level Version 1", + 0, AV_OPT_TYPE_CONST, { .i64 = VP8Level_Version1 }, 0, 0, VE, "level" }, + { "V2", "Level Version 2", + 0, AV_OPT_TYPE_CONST, { .i64 = VP8Level_Version2 }, 0, 0, VE, "level" }, + { "V3", "Level Version 3", + 0, AV_OPT_TYPE_CONST, { .i64 = VP8Level_Version3 }, 0, 0, VE, "level" }, + { NULL, } +}; + +#endif // CONFIG_VP8_MEDIACODEC_ENCODER + #if CONFIG_VP9_MEDIACODEC_ENCODER enum MediaCodecVP9Level { diff --git a/libavcodec/version.h b/libavcodec/version.h index 80e2ae630d..8b53586be1 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 10 +#define LIBAVCODEC_VERSION_MINOR 11 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \