Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Anton Khirnov <anton@khirnov.net>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 3/7] avformat/matroskadec: export Dynamic HDR10+ packet side data
Date: Fri, 24 Mar 2023 12:18:33 +0100
Message-ID: <167965671325.27013.3780588815943637840@lain.khirnov.net> (raw)
In-Reply-To: <20230321170637.10907-3-jamrial@gmail.com>

Quoting James Almer (2023-03-21 18:06:33)
> @@ -3615,12 +3635,54 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska,
>  }
>  
>  static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
> -                                           AVPacket *pkt,
> +                                           MatroskaTrack *track, AVPacket *pkt,
>                                             const uint8_t *data, int size, uint64_t id)
>  {
> -    uint8_t *side_data = av_packet_new_side_data(pkt,
> -                                                 AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
> -                                                 size + 8);
> +    uint8_t *side_data;
> +    int res;
> +
> +    switch (id) {
> +    case 4: {
> +        int country_code, provider_code;
> +        int provider_oriented_code, application_identifier;
> +        size_t hdrplus_size;
> +        AVDynamicHDRPlus *hdrplus;
> +
> +        if (!track->blockaddid_itu_t_t35)
> +            break; //ignore
> +
> +        /* ITU-T T.35 metadata */
> +        country_code  = bytestream_get_byte(&data);
> +        provider_code = bytestream_get_be16(&data);
> +
> +        if (country_code != 0xB5 || provider_code != 0x3C)
> +            break; // ignore
> +
> +        provider_oriented_code = bytestream_get_be16(&data);
> +        application_identifier = bytestream_get_byte(&data);

Does something guarantee data is large enough for all thse
bytestream_*()?


-- 
Anton Khirnov
_______________________________________________
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:[~2023-03-24 11:18 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-21 17:06 [FFmpeg-devel] [PATCH 1/7] avformat/matroskadec: support parsing more than one BlockMore element James Almer
2023-03-21 17:06 ` [FFmpeg-devel] [PATCH 2/7] avformat/matroskadec: set the default value for BlockAddIDType James Almer
2023-03-21 17:06 ` [FFmpeg-devel] [PATCH 3/7] avformat/matroskadec: export Dynamic HDR10+ packet side data James Almer
2023-03-24 11:18   ` Anton Khirnov [this message]
2023-03-24 11:28     ` James Almer
2023-03-24 11:40       ` Anton Khirnov
2023-03-24 12:34         ` James Almer
2023-03-21 17:06 ` [FFmpeg-devel] [PATCH 4/7] avformat/matroska: add a few more Block Addition ID Type enum values James Almer
2023-03-21 17:06 ` [FFmpeg-devel] [PATCH 5/7] avformat/matroskaenc: write a MaxBlockAdditionID element James Almer
2023-03-21 17:59   ` [FFmpeg-devel] [PATCH v2 " James Almer
2023-03-24 11:37   ` [FFmpeg-devel] [PATCH " Anton Khirnov
2023-03-24 11:41     ` James Almer
2023-03-24 11:43       ` Anton Khirnov
2023-03-21 17:06 ` [FFmpeg-devel] [PATCH 6/7] avformat/matroskaenc: support writing Dynamic HDR10+ packet side data James Almer
2023-03-21 18:00   ` [FFmpeg-devel] [PATCH v2 " James Almer
2023-03-24 11:45     ` Anton Khirnov
2023-03-24 11:50       ` James Almer
2023-03-24 11:58         ` Anton Khirnov
2023-03-24 12:59           ` James Almer
2023-03-24 15:11             ` Jerome Martinez
2023-03-24 15:39               ` James Almer
2023-03-21 17:06 ` [FFmpeg-devel] [PATCH 7/7] fate/matroska: add HDR10+ muxing tests James Almer
2023-03-21 18:00   ` [FFmpeg-devel] [PATCH v2 " 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=167965671325.27013.3780588815943637840@lain.khirnov.net \
    --to=anton@khirnov.net \
    --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