* Re: [FFmpeg-devel] [PATCH v3] avcodec/mfenc: set variable frame size flag.
@ 2022-06-19 15:44 Gyan Doshi
2022-06-20 9:36 ` Gyan Doshi
0 siblings, 1 reply; 3+ messages in thread
From: Gyan Doshi @ 2022-06-19 15:44 UTC (permalink / raw)
To: ffmpeg-devel
On 2022-06-19 03:15 pm, Gyan Doshi wrote:
> Default avctx->frame_size is 0 which led to init failure for
> audio MediaFoundation encoders since 827d6fe73d.
>
> The MF audio encoders accept variable frame size input buffers.
>
> Fixes #9802
Plan to push tomorrow.
> ---
> libavcodec/mfenc.c | 23 ++++++++++++++---------
> 1 file changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
> index 13ed7b3e11..bbe78605a9 100644
> --- a/libavcodec/mfenc.c
> +++ b/libavcodec/mfenc.c
> @@ -1220,7 +1220,7 @@ static int mf_init(AVCodecContext *avctx)
>
> #define OFFSET(x) offsetof(MFContext, x)
>
> -#define MF_ENCODER(MEDIATYPE, NAME, ID, OPTS, EXTRA) \
> +#define MF_ENCODER(MEDIATYPE, NAME, ID, OPTS, FMTS, CAPS) \
> static const AVClass ff_ ## NAME ## _mf_encoder_class = { \
> .class_name = #NAME "_mf", \
> .item_name = av_default_item_name, \
> @@ -1237,9 +1237,8 @@ static int mf_init(AVCodecContext *avctx)
> .init = mf_init, \
> .close = mf_close, \
> FF_CODEC_RECEIVE_PACKET_CB(mf_receive_packet), \
> - EXTRA \
> - .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HYBRID | \
> - AV_CODEC_CAP_DR1, \
> + FMTS \
> + CAPS \
> .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | \
> FF_CODEC_CAP_INIT_CLEANUP, \
> };
> @@ -1247,10 +1246,13 @@ static int mf_init(AVCodecContext *avctx)
> #define AFMTS \
> .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, \
> AV_SAMPLE_FMT_NONE },
> +#define ACAPS \
> + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HYBRID | \
> + AV_CODEC_CAP_DR1 | AV_CODEC_CAP_VARIABLE_FRAME_SIZE,
>
> -MF_ENCODER(AUDIO, aac, AAC, NULL, AFMTS);
> -MF_ENCODER(AUDIO, ac3, AC3, NULL, AFMTS);
> -MF_ENCODER(AUDIO, mp3, MP3, NULL, AFMTS);
> +MF_ENCODER(AUDIO, aac, AAC, NULL, AFMTS, ACAPS);
> +MF_ENCODER(AUDIO, ac3, AC3, NULL, AFMTS, ACAPS);
> +MF_ENCODER(AUDIO, mp3, MP3, NULL, AFMTS, ACAPS);
>
> #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
> static const AVOption venc_opts[] = {
> @@ -1283,6 +1285,9 @@ static const AVOption venc_opts[] = {
> .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, \
> AV_PIX_FMT_YUV420P, \
> AV_PIX_FMT_NONE },
> +#define VCAPS \
> + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HYBRID | \
> + AV_CODEC_CAP_DR1,
>
> -MF_ENCODER(VIDEO, h264, H264, venc_opts, VFMTS);
> -MF_ENCODER(VIDEO, hevc, HEVC, venc_opts, VFMTS);
> +MF_ENCODER(VIDEO, h264, H264, venc_opts, VFMTS, VCAPS);
> +MF_ENCODER(VIDEO, hevc, HEVC, venc_opts, VFMTS, VCAPS);
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread[parent not found: <DB6PR0101MB2214A19821CA08F85C864E518FB19@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~>]
* [FFmpeg-devel] [PATCH v3] avcodec/mfenc: set variable frame size flag.
[not found] <DB6PR0101MB2214A19821CA08F85C864E518FB19@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~>
@ 2022-06-19 9:45 ` Gyan Doshi
0 siblings, 0 replies; 3+ messages in thread
From: Gyan Doshi @ 2022-06-19 9:45 UTC (permalink / raw)
To: ffmpeg-devel
Default avctx->frame_size is 0 which led to init failure for
audio MediaFoundation encoders since 827d6fe73d.
The MF audio encoders accept variable frame size input buffers.
Fixes #9802
---
libavcodec/mfenc.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
index 13ed7b3e11..bbe78605a9 100644
--- a/libavcodec/mfenc.c
+++ b/libavcodec/mfenc.c
@@ -1220,7 +1220,7 @@ static int mf_init(AVCodecContext *avctx)
#define OFFSET(x) offsetof(MFContext, x)
-#define MF_ENCODER(MEDIATYPE, NAME, ID, OPTS, EXTRA) \
+#define MF_ENCODER(MEDIATYPE, NAME, ID, OPTS, FMTS, CAPS) \
static const AVClass ff_ ## NAME ## _mf_encoder_class = { \
.class_name = #NAME "_mf", \
.item_name = av_default_item_name, \
@@ -1237,9 +1237,8 @@ static int mf_init(AVCodecContext *avctx)
.init = mf_init, \
.close = mf_close, \
FF_CODEC_RECEIVE_PACKET_CB(mf_receive_packet), \
- EXTRA \
- .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HYBRID | \
- AV_CODEC_CAP_DR1, \
+ FMTS \
+ CAPS \
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | \
FF_CODEC_CAP_INIT_CLEANUP, \
};
@@ -1247,10 +1246,13 @@ static int mf_init(AVCodecContext *avctx)
#define AFMTS \
.p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, \
AV_SAMPLE_FMT_NONE },
+#define ACAPS \
+ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HYBRID | \
+ AV_CODEC_CAP_DR1 | AV_CODEC_CAP_VARIABLE_FRAME_SIZE,
-MF_ENCODER(AUDIO, aac, AAC, NULL, AFMTS);
-MF_ENCODER(AUDIO, ac3, AC3, NULL, AFMTS);
-MF_ENCODER(AUDIO, mp3, MP3, NULL, AFMTS);
+MF_ENCODER(AUDIO, aac, AAC, NULL, AFMTS, ACAPS);
+MF_ENCODER(AUDIO, ac3, AC3, NULL, AFMTS, ACAPS);
+MF_ENCODER(AUDIO, mp3, MP3, NULL, AFMTS, ACAPS);
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption venc_opts[] = {
@@ -1283,6 +1285,9 @@ static const AVOption venc_opts[] = {
.p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, \
AV_PIX_FMT_YUV420P, \
AV_PIX_FMT_NONE },
+#define VCAPS \
+ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HYBRID | \
+ AV_CODEC_CAP_DR1,
-MF_ENCODER(VIDEO, h264, H264, venc_opts, VFMTS);
-MF_ENCODER(VIDEO, hevc, HEVC, venc_opts, VFMTS);
+MF_ENCODER(VIDEO, h264, H264, venc_opts, VFMTS, VCAPS);
+MF_ENCODER(VIDEO, hevc, HEVC, venc_opts, VFMTS, VCAPS);
--
2.36.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-20 9:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-19 15:44 [FFmpeg-devel] [PATCH v3] avcodec/mfenc: set variable frame size flag Gyan Doshi
2022-06-20 9:36 ` Gyan Doshi
[not found] <DB6PR0101MB2214A19821CA08F85C864E518FB19@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~^[[3~>
2022-06-19 9:45 ` Gyan Doshi
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git