From patchwork Sun Jun 19 09:45:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 36329 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1056928pzb; Sun, 19 Jun 2022 02:46:06 -0700 (PDT) X-Google-Smtp-Source: AGRyM1utmhiEtgIjY0uRCLXj2afyBa5a1kanxOPoOJwVmOvmjd5k/h9A0x1HQWn6iW0WccrWYUah X-Received: by 2002:a17:907:160f:b0:70f:cceb:d78c with SMTP id hb15-20020a170907160f00b0070fccebd78cmr16413335ejc.247.1655631965982; Sun, 19 Jun 2022 02:46:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655631965; cv=none; d=google.com; s=arc-20160816; b=iQ4Hc5N0rMx6x2obgVhvmJ4+GIMQzb8y0f45FlvCfA+KIx5HM6id57iTc5vgXu4j3u xIg6kToApKp/6TaHN7POKKb3Gdu9QvCBcFZEiXEDn5of7DWkYOBTtrcD4MUf+rcE62X4 SLAy5uT4zwp9HxXxrHCnh6qHQCDKZLYTwKVXo968YSW42KwxaSH2L1WWBybka+UK99v5 Tuu631thx4+pzxCjkF+f6FxUpVnevpyYRrgJJ8I7ksbMVmFFTbwEzmZfAvqhbd9Itfau IWygVZEJ+X+EpiOqzkVKv0Bh8FtTnXCoX8evMtAY3DXpOFiTYW5xkiGlzGrfWfTO4BnK 29Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=FBP+TuXWuSzXLqUqvtfeqj/HDgLuWRBhXHk3hreoamI=; b=riZJw2nbyJIdwBG6EMo0wSQDkOJlMKtiU8Si2XaPKOcnIxrxEDgO+cKQ5XmtpnqWm8 ud46S1F+de6Y3XCWujpgleaSxrHl8EyYyq6etLECd/eHykIvkB6wQ0Ea+BcId7c7x6pc eT9TNoPN9i0WXYdph7GUBkuuniPKXuVHACsU+yeR6E0wNeyHOWXv4j9SLFXWh7BJQLGj PzGAV6kaktvxCU/wVydIPUuB3Vp/4CkC+s1/V+Q7i7Ui3RcCqrQL1nibRwXyI5yEDEvc 1qqgAj0+RTSfZR3RG+x3y9cNOnrncW9e2qcijsID7AlJqL3OfDwh6Qxs0KLPcejq1OR4 ajCQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d12-20020a1709067a0c00b0071728eab6dbsi6027016ejo.121.2022.06.19.02.46.04; Sun, 19 Jun 2022 02:46:05 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D199268B5CD; Sun, 19 Jun 2022 12:46:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9AEA68B2E5 for ; Sun, 19 Jun 2022 12:45:53 +0300 (EEST) Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4LQnvz3gv8z9sZT for ; Sun, 19 Jun 2022 11:45:51 +0200 (CEST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Jun 2022 15:15:22 +0530 Message-Id: <20220619094522.6133-1-ffmpeg@gyani.pro> In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] avcodec/mfenc: set variable frame size flag. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WkeoRZAWYg2M 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);