From: Leo Izen <leo.izen@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] avformat/mov: ensure pasp box derived SAR is used if present
Date: Wed, 10 Jul 2024 12:02:47 -0400
Message-ID: <bd57f395-5a8b-4e53-84b1-aa09073844d1@gmail.com> (raw)
In-Reply-To: <20240709172140.48976-1-jamrial@gmail.com>
On 7/9/24 1:21 PM, James Almer wrote:
> It's meant to override any codec specific (but container level) information,
> but its position is not guaranteed, so apply the values after the entire trak
> structure has been parsed.
> Also, replace the ugly roundabout int -> double -> int method to set SAR from
> existing dimensions while at it.
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> libavformat/isom.h | 2 ++
> libavformat/mov.c | 16 ++++++++++++----
> 2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/libavformat/isom.h b/libavformat/isom.h
> index a0498f45e5..5b6125a908 100644
> --- a/libavformat/isom.h
> +++ b/libavformat/isom.h
> @@ -215,6 +215,8 @@ typedef struct MOVStreamContext {
> int timecode_track;
> int width; ///< tkhd width
> int height; ///< tkhd height
> + int h_spacing; ///< pasp hSpacing
> + int v_spacing; ///< pasp vSpacing
> int dts_shift; ///< dts shift when ctts is negative
> uint32_t palette[256];
> int has_palette;
> diff --git a/libavformat/mov.c b/libavformat/mov.c
> index ced4b2e6b3..ce95842ce5 100644
> --- a/libavformat/mov.c
> +++ b/libavformat/mov.c
> @@ -1287,14 +1287,18 @@ static int mov_read_pasp(MOVContext *c, AVIOContext *pb, MOVAtom atom)
> const int num = avio_rb32(pb);
> const int den = avio_rb32(pb);
> AVStream *st;
> + MOVStreamContext *sc;
>
> if (c->fc->nb_streams < 1)
> return 0;
> st = c->fc->streams[c->fc->nb_streams-1];
> + sc = st->priv_data;
> +
> + av_log(c->fc, AV_LOG_TRACE, "pasp: hSpacing %d, vSpacing %d\n", num, den);
>
> if (den != 0) {
> - av_reduce(&st->sample_aspect_ratio.num, &st->sample_aspect_ratio.den,
> - num, den, 32767);
> + sc->h_spacing = num;
> + sc->v_spacing = den;
> }
If den == 0, nothing is assigned at all, but if den != 0 and if num ==
0, we assign 0 to h_spacing, which will end up doing nothing because we
check h_spacing && v_spacing later on in the other line you add.
Is this intentional? Is this desired behavior? etc.
- Leo Izen (Traneptora)
_______________________________________________
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:[~2024-07-10 16:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 17:21 James Almer
2024-07-10 16:02 ` Leo Izen [this message]
2024-07-10 16:09 ` James Almer
2024-07-11 12:43 ` 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=bd57f395-5a8b-4e53-84b1-aa09073844d1@gmail.com \
--to=leo.izen@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