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 72C6B4845A for ; Sat, 3 Feb 2024 03:13:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F9C968D14E; Sat, 3 Feb 2024 05:13:38 +0200 (EET) Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22FC468AB1D for ; Sat, 3 Feb 2024 05:13:31 +0200 (EET) Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-59a99ef8c7fso1179300eaf.0 for ; Fri, 02 Feb 2024 19:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706930008; x=1707534808; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=OqCYV4TO7Dnz6Nyc2FiKeC3ObPvG6HqFrYe812x74IQ=; b=R3icR++Cqz9GReh8Jz7X5J6kuBR7XyzwJSqsfiRnbPFglXF+o4XMJdMtVMKNOHuMLG pkJ59Tk6t6zOqVKxEHn4YsSiJVtVxJYN0KtScZe6VECUiHD+ZW4J1M0gtAtrAdM2ti4x x0rPDjGvVWgbctLusKFl4p4vfBRy6VZp4HuxH2NzCRATxtQMgCx7+DadJ46Ztkpsgm4Z 0mYLvjChshN5ulf6Qske/RLYKmtyCrCNzcm4pRN427kioenNpLenxXCFox0uj/5+hCq5 OTamH4+0CLTRxQJlpSgaqzTu2/OqKbm5zFrhpW+djEqrH5Qd4pVCdZJMBgv1+fHziaVk hMGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706930008; x=1707534808; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OqCYV4TO7Dnz6Nyc2FiKeC3ObPvG6HqFrYe812x74IQ=; b=qlkJ3lXe7o1+QbhWgNLewj/AKA+VU95swQgivlTrkd1Xzt5YD2uSSOIq+OhLua5UGB KtNcRuk8TsP4dTPxM1IKqVjR0J8Fs/dEpiNVir7++Es+EmNBfgCklPUqmC0cSvLNyEvp 22RiWFZSA6GecuZCegsoQHhYvrf68uxziYXoVt29Ro6IsxQexHyLZBH8QI4swfsntTdc Af7mV/IFuaiU8yVc7azpbJJAadMLsPhgU3IjjsoTJD3N9fvApHUtRFqPAF7WDnvQLaZt yFy7r5PSqwBmVu4mMp2yGAsjkArydgeeFIEeXzz6sb4E6sjVz7W5U+o4TBxeoV8tbyuf Rasw== X-Gm-Message-State: AOJu0YwMYMBKlwzEdv7gSIVnvQCoG2s4JLflNnfrvtwAD9otkQNcAfe9 Q9jwLgBQgAWsR1yEoxkC90lHAi8PkKpmKs9Gvfq7zW46tqKLHByQPbgj+6fd X-Google-Smtp-Source: AGHT+IHd9/KCapxapWTkAkzNG0+CY9aQXzbhR5Tft/TxOJWWy61pCAAysywOSGQQln/0/YYNWOxunA== X-Received: by 2002:a05:6358:6e89:b0:178:95b6:f87c with SMTP id q9-20020a0563586e8900b0017895b6f87cmr4215498rwm.11.1706930007929; Fri, 02 Feb 2024 19:13:27 -0800 (PST) Received: from [192.168.0.18] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id ff23-20020a056a002f5700b006d97f80c4absm2374882pfb.41.2024.02.02.19.13.26 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Feb 2024 19:13:27 -0800 (PST) Message-ID: <6c436bf8-cbf3-4882-8ff4-f882ffc8bb46@gmail.com> Date: Sat, 3 Feb 2024 00:13:55 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240201082938.16687-1-anton@khirnov.net> <20240201082938.16687-3-anton@khirnov.net> 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: <20240201082938.16687-3-anton@khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 3/4] lavf/demux: stop calling avcodec_close() 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 2/1/2024 5:29 AM, Anton Khirnov wrote: > Replace it with recreating the codec context. > > This is the last remaining blocker for deprecating avcodec_close(). > --- > libavformat/demux.c | 53 ++++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 48 insertions(+), 5 deletions(-) > > diff --git a/libavformat/demux.c b/libavformat/demux.c > index 6f640b92b1..c1640c459c 100644 > --- a/libavformat/demux.c > +++ b/libavformat/demux.c > @@ -1250,6 +1250,52 @@ static int64_t ts_to_samples(AVStream *st, int64_t ts) > return av_rescale(ts, st->time_base.num * st->codecpar->sample_rate, st->time_base.den); > } > > +static int codec_close(FFStream *sti) This returns an error code but you're not checking it. > +{ > + AVCodecContext *avctx_new = NULL; > + AVCodecParameters *par_tmp = NULL; > + int ret = 0; > + > + avctx_new = avcodec_alloc_context3(sti->avctx->codec); > + if (!avctx_new) { > + ret = AVERROR(ENOMEM); > + goto fail; > + } > + > + par_tmp = avcodec_parameters_alloc(); > + if (!par_tmp) { > + ret = AVERROR(ENOMEM); > + goto fail; > + } > + > + ret = avcodec_parameters_from_context(par_tmp, sti->avctx); > + if (ret < 0) > + goto fail; > + > + ret = avcodec_parameters_to_context(avctx_new, par_tmp); > + if (ret < 0) > + goto fail; > + > + avctx_new->pkt_timebase = sti->avctx->pkt_timebase; > + > +#if FF_API_TICKS_PER_FRAME > +FF_DISABLE_DEPRECATION_WARNINGS > + avctx_new->ticks_per_frame = sti->avctx->ticks_per_frame; > +FF_ENABLE_DEPRECATION_WARNINGS > +#endif > + > + avcodec_free_context(&sti->avctx); > + sti->avctx = avctx_new; > + > + avctx_new = NULL; > + > +fail: > + avcodec_free_context(&avctx_new); > + avcodec_parameters_free(&par_tmp); > + > + return ret; For success scenarios, this will return whatever was last set on ret, which in this case is the return value of avcodec_parameters_to_context() that just happens to be 0. But something else could be added later that also sets ret after it, so the proper thing to do is to set ret to 0 immediately above the fail label. > +} > + > static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) > { > FFFormatContext *const si = ffformatcontext(s); > @@ -1286,7 +1332,7 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) > if (sti->need_context_update) { > if (avcodec_is_open(sti->avctx)) { > av_log(s, AV_LOG_DEBUG, "Demuxer context update while decoder is open, closing and trying to re-open\n"); > - avcodec_close(sti->avctx); > + codec_close(sti); > sti->info->found_decoder = 0; > } > > @@ -3017,10 +3063,7 @@ find_stream_info_err: > av_freep(&sti->info->duration_error); > av_freep(&sti->info); > } > - avcodec_close(sti->avctx); > - // FIXME: avcodec_close() frees AVOption settable fields which includes ch_layout, > - // so we need to restore it. > - av_channel_layout_copy(&sti->avctx->ch_layout, &st->codecpar->ch_layout); > + codec_close(sti); > av_bsf_free(&sti->extract_extradata.bsf); > } > if (ic->pb) { _______________________________________________ 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".