| Message ID | 20230906141402.54565-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | 1652f2492f88434010053289d946dab6a57e4d58 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/av1dec: don't set aspect ratio when it's not yet known | expand |
On Wed, 2023-09-06 at 11:14 -0300, James Almer wrote: > Makes the output of the native decoder consistent with external > decoders like > libdav1d with fate-enhanced-flv-av1. > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > libavcodec/av1dec.c | 1 - > tests/ref/fate/enhanced-flv-av1 | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c > index 03283ab064..ec8401f4e0 100644 > --- a/libavcodec/av1dec.c > +++ b/libavcodec/av1dec.c > @@ -755,7 +755,6 @@ static int > set_context_with_sequence(AVCodecContext *avctx, > if (ret < 0) > return ret; > } > - avctx->sample_aspect_ratio = (AVRational) { 1, 1 }; > > if (seq->timing_info_present_flag) > avctx->framerate = ff_av1_framerate(1LL + seq- > >timing_info.num_ticks_per_picture_minus_1, > diff --git a/tests/ref/fate/enhanced-flv-av1 > b/tests/ref/fate/enhanced-flv-av1 > index b2a624e41e..c50da5d430 100644 > --- a/tests/ref/fate/enhanced-flv-av1 > +++ b/tests/ref/fate/enhanced-flv-av1 > @@ -3,7 +3,7 @@ > #media_type 0: video > #codec_id 0: av1 > #dimensions 0: 320x176 > -#sar 0: 1/1 > +#sar 0: 0/1 > 0, 0, 0, 41, 4718, 0xc4d912ec > 0, 42, 42, 41, 5109, 0xc065dd7d, F=0x0 > 0, 83, 83, 41, 192, 0x160c5335, F=0x0 LGTM. I searched mailbox just before sending the same patch :P
diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 03283ab064..ec8401f4e0 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -755,7 +755,6 @@ static int set_context_with_sequence(AVCodecContext *avctx, if (ret < 0) return ret; } - avctx->sample_aspect_ratio = (AVRational) { 1, 1 }; if (seq->timing_info_present_flag) avctx->framerate = ff_av1_framerate(1LL + seq->timing_info.num_ticks_per_picture_minus_1, diff --git a/tests/ref/fate/enhanced-flv-av1 b/tests/ref/fate/enhanced-flv-av1 index b2a624e41e..c50da5d430 100644 --- a/tests/ref/fate/enhanced-flv-av1 +++ b/tests/ref/fate/enhanced-flv-av1 @@ -3,7 +3,7 @@ #media_type 0: video #codec_id 0: av1 #dimensions 0: 320x176 -#sar 0: 1/1 +#sar 0: 0/1 0, 0, 0, 41, 4718, 0xc4d912ec 0, 42, 42, 41, 5109, 0xc065dd7d, F=0x0 0, 83, 83, 41, 192, 0x160c5335, F=0x0
Makes the output of the native decoder consistent with external decoders like libdav1d with fate-enhanced-flv-av1. Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/av1dec.c | 1 - tests/ref/fate/enhanced-flv-av1 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)