Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] avformat/av1dec: fix setting AVPacket->pos in Annex-B demuxer
Date: Thu, 1 May 2025 14:23:04 -0300
Message-ID: <52b29915-0029-486a-b340-d27b94509bcd@gmail.com> (raw)
In-Reply-To: <20250428220207.1624-1-jamrial@gmail.com>


[-- Attachment #1.1.1: Type: text/plain, Size: 1634 bytes --]

On 4/28/2025 7:02 PM, James Almer wrote:
> This demuxers reads encapsulation bytes before reading codec data into the
> output packets, so take such offset into consideration.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>   libavformat/av1dec.c | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c
> index 8c0b8fe975..38001b124f 100644
> --- a/libavformat/av1dec.c
> +++ b/libavformat/av1dec.c
> @@ -36,6 +36,7 @@ typedef struct AV1DemuxContext {
>       AVRational framerate;
>       uint32_t temporal_unit_size;
>       uint32_t frame_unit_size;
> +    int64_t pos;
>   } AV1DemuxContext;
>   
>   //return < 0 if we need more data
> @@ -96,6 +97,8 @@ static int av1_read_header(AVFormatContext *s)
>       if (ret < 0)
>           return ret;
>   
> +    c->pos = avio_tell(s->pb);
> +
>       return 0;
>   }
>   
> @@ -224,6 +227,7 @@ static int annexb_read_packet(AVFormatContext *s, AVPacket *pkt)
>   {
>       AV1DemuxContext *const c = s->priv_data;
>       uint32_t obu_unit_size;
> +    int64_t pos = c->pos;
>       int ret, len;
>   
>   retry:
> @@ -234,6 +238,7 @@ retry:
>       }
>   
>       if (!c->temporal_unit_size) {
> +        c->pos = avio_tell(s->pb);
>           len = leb(s->pb, &c->temporal_unit_size, 1);
>           if (len == AVERROR_EOF) goto end;
>           else if (len < 0) return len;
> @@ -279,6 +284,9 @@ end:
>       if (ret == AVERROR(EAGAIN))
>           goto retry;
>   
> +    if (!ret)
> +        pkt->pos = pos;
> +
>       return ret;
>   }

Will apply.


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".

      reply	other threads:[~2025-05-01 17:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-28 22:02 James Almer
2025-05-01 17:23 ` James Almer [this message]

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=52b29915-0029-486a-b340-d27b94509bcd@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