From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH v2 2/3] avcodec/decode: check the output frame for discard samples with all decoders
Date: Sun, 9 Jul 2023 16:37:36 -0300
Message-ID: <453707c4-3bf0-b882-5593-db8de829e87e@gmail.com> (raw)
In-Reply-To: <20230709133917.5403-2-jamrial@gmail.com>
On 7/9/2023 10:39 AM, James Almer wrote:
> And not just those with the old decode() API.
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> libavcodec/decode.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/libavcodec/decode.c b/libavcodec/decode.c
> index a39af2d014..b3e4b066e5 100644
> --- a/libavcodec/decode.c
> +++ b/libavcodec/decode.c
> @@ -597,6 +597,14 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
> if (codec->cb_type == FF_CODEC_CB_TYPE_RECEIVE_FRAME) {
> ret = codec->cb.receive_frame(avctx, frame);
> emms_c();
> + if (!ret) {
> + if (avctx->codec->type == AVMEDIA_TYPE_VIDEO)
> + ret = (frame->flags & AV_FRAME_FLAG_DISCARD) ? AVERROR(EAGAIN) : 0;
> + else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
> + int64_t discarded_samples = 0;
> + ret = discard_samples(avctx, frame, &discarded_samples);
> + }
> + }
> } else
> ret = decode_simple_receive_frame(avctx, frame);
I'm withdrawing this patch for now. discard_samples() uses
avci->last_pkt_props to fetch SKIP_SAMPLES packet side data which is not
necessarily correct on receive_frame() decoders (like those setting
FF_CODEC_CAP_SETS_FRAME_PROPS).
_______________________________________________
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".
next prev parent reply other threads:[~2023-07-09 19:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-09 13:39 [FFmpeg-devel] [PATCH v2 1/3] avcodec/decode: move processing discard samples to its own function James Almer
2023-07-09 13:39 ` [FFmpeg-devel] [PATCH v2 2/3] avcodec/decode: check the output frame for discard samples with all decoders James Almer
2023-07-09 19:37 ` James Almer [this message]
2023-07-09 13:39 ` [FFmpeg-devel] [PATCH v2 3/3] avcodec/decode: fill missing frame fields for " James Almer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=453707c4-3bf0-b882-5593-db8de829e87e@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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