Rather than access the AVStream one.
This is a step towards decoupling Decoder and InputStream.
---
fftools/ffmpeg_dec.c | 9 +++++++--
fftools/ffmpeg_demux.c | 3 +++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
index d16049ab4c..b5a0ce9080 100644
--- a/fftools/ffmpeg_dec.c
+++ b/fftools/ffmpeg_dec.c
@@ -42,6 +42,9 @@ typedef struct DecoderPriv {
AVFrame *frame;
AVPacket *pkt;
+ // override output video sample aspect ratio with this value
+ AVRational sar_override;
+
enum AVPixelFormat hwaccel_pix_fmt;
// pts/estimated duration of the last decoded frame
@@ -311,8 +314,8 @@ static int video_frame_process(InputStream *ist, AVFrame
*frame)
frame->time_base.num, frame->time_base.den);
}
- if (ist->st->sample_aspect_ratio.num)
- frame->sample_aspect_ratio = ist->st->sample_aspect_ratio;
+ if (dp->sar_override.num)
+ frame->sample_aspect_ratio = dp->sar_override;
return 0;
}
@@ -922,6 +925,8 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned
sch_idx,
return AVERROR(ENOMEM);
}
+ dp->sar_override = ist->par->sample_aspect_ratio;
+
dp->dec_ctx = avcodec_alloc_context3(codec);
if (!dp->dec_ctx)
return AVERROR(ENOMEM);
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 11db118b72..a58217223b 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -1336,6 +1336,9 @@ static int ist_add(const OptionsContext *o, Demuxer *d,
AVStream *st)
return ret;
}
+ if (ist->st->sample_aspect_ratio.num)
+ ist->par->sample_aspect_ratio = ist->st->sample_aspect_ratio;
+
MATCH_PER_STREAM_OPT(bitstream_filters, str, bsfs, ic, st);
if (bsfs) {
ret = av_bsf_list_parse_str(bsfs, &ds->bsf);
--
2.42.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
