Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 1/3] avformat/aeadec: Export title
Date: Mon, 18 Mar 2024 01:52:38 +0100
Message-ID: <AS8P250MB074447879F1EA53B2BA2B0B38F2D2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB07449B9C77EBEA759D1F775F8F282@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>

Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavformat/aeadec.c | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/libavformat/aeadec.c b/libavformat/aeadec.c
> index 4cb2da6639..20170a89b3 100644
> --- a/libavformat/aeadec.c
> +++ b/libavformat/aeadec.c
> @@ -23,6 +23,7 @@
>  #include "libavutil/channel_layout.h"
>  #include "libavutil/intreadwrite.h"
>  #include "avformat.h"
> +#include "avio_internal.h"
>  #include "demux.h"
>  #include "pcm.h"
>  
> @@ -59,12 +60,20 @@ static int aea_read_probe(const AVProbeData *p)
>  static int aea_read_header(AVFormatContext *s)
>  {
>      AVStream *st = avformat_new_stream(s, NULL);
> -    int channels;
> +    char title[256 + 1];
> +    int channels, ret;
>      if (!st)
>          return AVERROR(ENOMEM);
>  
> -    /* Parse the amount of channels and skip to pos 2048(0x800) */
> -    avio_skip(s->pb, 264);
> +    /* Read the title, parse the number of channels and skip to pos 2048(0x800) */
> +    avio_rl32(s->pb); // magic
> +    ret = ffio_read_size(s->pb, title, sizeof(title) - 1);
> +    if (ret < 0)
> +        return ret;
> +    title[sizeof(title) - 1] = '\0';
> +    if (title[0] != '\0')
> +        av_dict_set(&st->metadata, "title", title, 0);
> +    avio_rl32(s->pb); // Block count
>      channels = avio_r8(s->pb);
>      avio_skip(s->pb, 1783);
>  

Will apply this patchset tonight unless there are objections.

- Andreas

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

      parent reply	other threads:[~2024-03-18  0:52 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-15 16:42 Andreas Rheinhardt
2024-03-15 16:43 ` [FFmpeg-devel] [PATCH 2/3] avformat/aeadec: Use sample rate as time base Andreas Rheinhardt
2024-03-15 16:43 ` [FFmpeg-devel] [PATCH 3/3] fate/atrac: Add atrac->aea, atrac->matroska remux tests Andreas Rheinhardt
2024-03-18  0:52 ` Andreas Rheinhardt [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=AS8P250MB074447879F1EA53B2BA2B0B38F2D2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
    --to=andreas.rheinhardt@outlook.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