From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0E01B4853B for ; Sat, 6 Jan 2024 14:22:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C63F968CCB8; Sat, 6 Jan 2024 16:22:14 +0200 (EET) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0694F68CBD2 for ; Sat, 6 Jan 2024 16:22:08 +0200 (EET) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1d3ea5cc137so3968905ad.0 for ; Sat, 06 Jan 2024 06:22:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704550924; x=1705155724; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=elih++6hFsUvP04q2hWSfsrd4v14pOligtl9dW9qR8Q=; b=ha/38ULyDVKSPha18IBA38y0sM13Ik/HuEiw9DB/4guJtLdv70c8r08yAf50tr9tjG lXuUIA47IAvuGCaVHyyCnn4n1WlAmYV7c0ckGQ+M16pNa/ROLZe8zz+c9LIoEZYZbBAn 7QrJ708sVNcXgwznQqlMK7b46saPDkPUON4qjlO5LO+DYm5ayHMVqM7NORDNWJVd2O7r E7o27AKbpjxMX4HWhYKLnN+/1MoO+IW3ug2FN6lJrGaVd7Sz3TFS1kFU6SVwYmwZWkmD N9ZhV5FuQlP73S9d+LrP5bqvGIjMmRPjU74oVEx4Hwd/z7tfNhiCgQpHyzzkwlmP/dKv AYOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704550924; x=1705155724; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=elih++6hFsUvP04q2hWSfsrd4v14pOligtl9dW9qR8Q=; b=q/4RtuUJFfwuszEj+NpWyzEfLVMxvfsAZh4ZQIQEk46fjm7wkuYOpSgHlRiJC9KWOW ut2komErSl1on236r26AESY94pixlbIo47X84HdiNwxBhb3Il8Ng3mTDgB3nMetf0tyS EVBrKesg+7eZjjHAiGD/d0N3lUGOq8U4r9q43RHQ4FfLEOILPDkYdYw1ZqBO9ILejvrc j4065btia9+sebejPl1RIPHljmESMyoIpg4+t3DZaRl75q7hWmNwyL1uDmgHMcP3wYcf mZ3eYPHfDjb6rXXXyqJQIKcRppBfyOuyhhWwZiIGyOsPS9jawDu/6n3H4DyeeN6F+I5j PHpg== X-Gm-Message-State: AOJu0YyUb39wimUANl4jTRNc4JYiabrgqec76PdWshWWnayJmytzYEVP iytzpyFtGtSrGIfKYfw8xEv/rlgNGJ0= X-Google-Smtp-Source: AGHT+IHQHFiTU91LFs7L57uFUX4R6sl4NCOJs3iwwGtVcS1lDd9iW2zJHjYs+AcwYazMG8W78xwVuw== X-Received: by 2002:a17:903:22c5:b0:1d4:c203:5f5d with SMTP id y5-20020a17090322c500b001d4c2035f5dmr1443957plg.89.1704550924199; Sat, 06 Jan 2024 06:22:04 -0800 (PST) Received: from [192.168.0.13] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id h9-20020a170902b94900b001d486882d79sm3110601pls.179.2024.01.06.06.22.03 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 06 Jan 2024 06:22:03 -0800 (PST) Message-ID: <14452fc1-6135-487f-92a4-c6bbdde94267@gmail.com> Date: Sat, 6 Jan 2024 11:22:10 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240105164251.28935-1-anton@khirnov.net> <20240105164251.28935-4-anton@khirnov.net> Content-Language: en-US From: James Almer Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: <20240105164251.28935-4-anton@khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 4/8] fftools/ffmpeg_demux: set options on codec parameters rather than decoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 1/5/2024 1:42 PM, Anton Khirnov wrote: > This avoids the requirement to always have a decoder context. > --- > fftools/ffmpeg_demux.c | 43 +++++++++++++++++++++--------------------- > 1 file changed, 21 insertions(+), 22 deletions(-) > > diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c > index cacdc76a71..892094c512 100644 > --- a/fftools/ffmpeg_demux.c > +++ b/fftools/ffmpeg_demux.c > @@ -899,19 +899,18 @@ static int choose_decoder(const OptionsContext *o, AVFormatContext *s, AVStream > } > } > > -static int guess_input_channel_layout(InputStream *ist, int guess_layout_max) > +static int guess_input_channel_layout(InputStream *ist, AVCodecParameters *par, > + int guess_layout_max) > { > - AVCodecContext *dec = ist->dec_ctx; > - > - if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) { > + if (par->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) { > char layout_name[256]; > > - if (dec->ch_layout.nb_channels > guess_layout_max) > + if (par->ch_layout.nb_channels > guess_layout_max) > return 0; > - av_channel_layout_default(&dec->ch_layout, dec->ch_layout.nb_channels); > - if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) > + av_channel_layout_default(&par->ch_layout, par->ch_layout.nb_channels); > + if (par->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) > return 0; > - av_channel_layout_describe(&dec->ch_layout, layout_name, sizeof(layout_name)); > + av_channel_layout_describe(&par->ch_layout, layout_name, sizeof(layout_name)); > av_log(ist, AV_LOG_WARNING, "Guessed Channel Layout: %s\n", layout_name); > } > return 1; > @@ -1145,16 +1144,6 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) > ist->user_set_discard = ist->st->discard; > } > > - ist->dec_ctx = avcodec_alloc_context3(ist->dec); > - if (!ist->dec_ctx) > - return AVERROR(ENOMEM); > - > - ret = avcodec_parameters_to_context(ist->dec_ctx, par); > - if (ret < 0) { > - av_log(ist, AV_LOG_ERROR, "Error initializing the decoder context.\n"); > - return ret; > - } > - > if (o->bitexact) > av_dict_set(&ist->decoder_opts, "flags", "+bitexact", AV_DICT_MULTIKEY); > > @@ -1181,7 +1170,7 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) > case AVMEDIA_TYPE_AUDIO: { > int guess_layout_max = INT_MAX; > MATCH_PER_STREAM_OPT(guess_layout_max, i, guess_layout_max, ic, st); > - guess_input_channel_layout(ist, guess_layout_max); > + guess_input_channel_layout(ist, par, guess_layout_max); > break; > } > case AVMEDIA_TYPE_DATA: > @@ -1190,7 +1179,7 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) > MATCH_PER_STREAM_OPT(fix_sub_duration, i, ist->fix_sub_duration, ic, st); > MATCH_PER_STREAM_OPT(canvas_sizes, str, canvas_size, ic, st); > if (canvas_size) { > - ret = av_parse_video_size(&ist->dec_ctx->width, &ist->dec_ctx->height, > + ret = av_parse_video_size(&par->width, &par->height, > canvas_size); > if (ret < 0) { > av_log(ist, AV_LOG_FATAL, "Invalid canvas size: %s.\n", canvas_size); > @@ -1201,8 +1190,8 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) > /* Compute the size of the canvas for the subtitles stream. > If the subtitles codecpar has set a size, use it. Otherwise use the > maximum dimensions of the video streams in the same file. */ > - ist->sub2video.w = ist->dec_ctx->width; > - ist->sub2video.h = ist->dec_ctx->height; > + ist->sub2video.w = par->width; > + ist->sub2video.h = par->height; > if (!(ist->sub2video.w && ist->sub2video.h)) { > for (int j = 0; j < ic->nb_streams; j++) { > AVCodecParameters *par1 = ic->streams[j]->codecpar; > @@ -1226,6 +1215,16 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) > default: av_assert0(0); > } > > + ist->dec_ctx = avcodec_alloc_context3(ist->dec); > + if (!ist->dec_ctx) > + return AVERROR(ENOMEM); > + > + ret = avcodec_parameters_to_context(ist->dec_ctx, par); > + if (ret < 0) { > + av_log(ist, AV_LOG_ERROR, "Error initializing the decoder context.\n"); > + return ret; > + } > + > ist->par = avcodec_parameters_alloc(); > if (!ist->par) > return AVERROR(ENOMEM); This does not fix the issue of the guessed channel layout not being present on the output stream, but might be a change in the right direction. before: > $ ./ffmpeg -i ~/samples/wav/200828-005.wav out.wav > [aist#0:0/pcm_s16le @ 00000252b1d2d420] Guessed Channel Layout: stereo > Input #0, wav, from '../samples/wav/200828-005.wav': > Duration: 00:00:12.80, bitrate: 1536 kb/s > Stream #0:0: Audio: pcm_s16le ([1][0][0][0] / 0x0001), 48000 Hz, 2 channels, s16, 1536 kb/s > Stream mapping: > Stream #0:0 -> #0:0 (pcm_s16le (native) -> pcm_s16le (native)) > Press [q] to stop, [?] for help > Output #0, wav, to 'out.wav': > Stream #0:0: Audio: pcm_s16le ([1][0][0][0] / 0x0001), 48000 Hz, stereo, s16, 1536 kb/s > > > $ ./ffmpeg -i out.wav > [aist#0:0/pcm_s16le @ 000001d616b1d3e0] Guessed Channel Layout: stereo > Duration: 00:00:12.80, bitrate: 1536 kb/s > Stream #0:0: Audio: pcm_s16le ([1][0][0][0] / 0x0001), 48000 Hz, 2 channels, s16, 1536 kb/s After: > $ ./ffmpeg -i ../samples/wav/200828-005.wav out.wav > [aist#0:0/pcm_s16le @ 0000024603c9d420] Guessed Channel Layout: stereo > Input #0, wav, from '../samples/wav/200828-005.wav': > Duration: 00:00:12.80, bitrate: 1536 kb/ > Stream #0:0: Audio: pcm_s16le ([1][0][0][0] / 0x0001), 48000 Hz, stereo, s16, 1536 kb/s > Stream mapping: > Stream #0:0 -> #0:0 (pcm_s16le (native) -> pcm_s16le (native)) > Press [q] to stop, [?] for help > Output #0, wav, to 'out.wav': > Stream #0:0: Audio: pcm_s16le ([1][0][0][0] / 0x0001), 48000 Hz, stereo, s16, 1536 kb/s > > $ ./ffmpeg -i out.wav > [aist#0:0/pcm_s16le @ 000001a1467ed3e0] Guessed Channel Layout: stereo > Duration: 00:00:12.80, bitrate: 1536 kb/s > Stream #0:0: Audio: pcm_s16le ([1][0][0][0] / 0x0001), 48000 Hz, stereo, s16, 1536 kb/s So the printed output shows the guessed layout for the input stream, but the written output stream is still unspec. _______________________________________________ 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".