diff mbox series

[FFmpeg-devel] avformat/utils: force lowres to 0 in avformat_find_stream_info()

Message ID 20210206173924.53030-1-jamrial@gmail.com
State Accepted
Commit a80fbbdab5becb82de11983f1ee61014ce2d85b0
Headers show
Series [FFmpeg-devel] avformat/utils: force lowres to 0 in avformat_find_stream_info() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

James Almer Feb. 6, 2021, 5:39 p.m. UTC 
Instead of applying it and then restoring the original codecpar dimensions.

Signed-off-by: James Almer <jamrial@gmail.com>
---
Alternative to "[PATCH] avformat/utils: always preserve container dimensions
for all streams" while we figure out and decide how to properly make
avformat_find_stream_info() export the container dimensions and not what the
probing decoder uses internally.

 libavformat/utils.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Comments

James Almer Feb. 13, 2021, 4:24 p.m. UTC | #1 
On 2/6/2021 2:39 PM, James Almer wrote:
> Instead of applying it and then restoring the original codecpar dimensions.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> Alternative to "[PATCH] avformat/utils: always preserve container dimensions
> for all streams" while we figure out and decide how to properly make
> avformat_find_stream_info() export the container dimensions and not what the
> probing decoder uses internally.

Applied.
diff mbox series

Patch

diff --git a/libavformat/utils.c b/libavformat/utils.c
index fb3299503e..3e955b85bc 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3021,6 +3021,10 @@  static int try_decode_frame(AVFormatContext *s, AVStream *st,
         /* Force thread count to 1 since the H.264 decoder will not extract
          * SPS and PPS to extradata during multi-threaded decoding. */
         av_dict_set(options ? options : &thread_opt, "threads", "1", 0);
+        /* Force lowres to 0. The decoder might reduce the video size by the
+         * lowres factor, and we don't want that propagated to the stream's
+         * codecpar */
+        av_dict_set(options ? options : &thread_opt, "lowres", "0", 0);
         if (s->codec_whitelist)
             av_dict_set(options ? options : &thread_opt, "codec_whitelist", s->codec_whitelist, 0);
         ret = avcodec_open2(avctx, codec, options ? options : &thread_opt);
@@ -3662,6 +3666,10 @@  FF_ENABLE_DEPRECATION_WARNINGS
         /* Force thread count to 1 since the H.264 decoder will not extract
          * SPS and PPS to extradata during multi-threaded decoding. */
         av_dict_set(options ? &options[i] : &thread_opt, "threads", "1", 0);
+        /* Force lowres to 0. The decoder might reduce the video size by the
+         * lowres factor, and we don't want that propagated to the stream's
+         * codecpar */
+        av_dict_set(options ? &options[i] : &thread_opt, "lowres", "0", 0);
 
         if (ic->codec_whitelist)
             av_dict_set(options ? &options[i] : &thread_opt, "codec_whitelist", ic->codec_whitelist, 0);
@@ -4108,21 +4116,12 @@  FF_ENABLE_DEPRECATION_WARNINGS
         st = ic->streams[i];
 
         if (st->internal->avctx_inited) {
-            int orig_w = st->codecpar->width;
-            int orig_h = st->codecpar->height;
             ret = avcodec_parameters_from_context(st->codecpar, st->internal->avctx);
             if (ret < 0)
                 goto find_stream_info_err;
             ret = add_coded_side_data(st, st->internal->avctx);
             if (ret < 0)
                 goto find_stream_info_err;
-#if FF_API_LOWRES
-            // The decoder might reduce the video size by the lowres factor.
-            if (st->internal->avctx->lowres && orig_w) {
-                st->codecpar->width = orig_w;
-                st->codecpar->height = orig_h;
-            }
-#endif
         }
 
 #if FF_API_LAVF_AVCTX