From patchwork Mon Feb 5 17:03:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46045 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp882360pzh; Mon, 5 Feb 2024 09:04:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IEBrNlNbIPIDvsX8Aj+Nh7u6WJg15yjDXmfJl6bK9xakvOSRvcN2Aq84xdvRkFjiFvALzj5 X-Received: by 2002:a17:906:a450:b0:a37:1263:811 with SMTP id cb16-20020a170906a45000b00a3712630811mr36484ejb.1.1707152679860; Mon, 05 Feb 2024 09:04:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707152679; cv=none; d=google.com; s=arc-20160816; b=SSpjKbEZwUPkxXOs8NOe5/3AUG+a2g3Gd/yAgCCFoaRz88lUMbV5mgIDJ+PHjJWUO3 ss4T0LGagASJc+hmm0DfwwHJNVmiUJ5+rCeGMhx/j7ldvtp2knzBHNThq2f54VfU42fP vCYPqF7SuaUEU5KhxzKnZ4tycQFOvJO6rURkGVtyh08uOOFIhyULVUax0szDuxo1P8mj barYvbL94AauW4J9S9n51zp/PK/WsKvgFi5lP0qR2InUQKfJeZqdnMf/JvM3ZUsHoCkn sLqJOjh0IPpQ+QB0AtUDq+U49kFY3K0bIm+ie/DMxZOtSdJ37MdtZgfScxnA6SutexY/ ieYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Ve4aqIHATwyMnn/oiMa67soAHGtglSxf9pTOiQ2v/50=; fh=euOi7IPUSYHfvvFGZNzM+UPuJGn4t9zyupTpwJW2af4=; b=EUh/IGKEinrL6cJU3mqtgyhYfC29N/1YohJlQ2fXlkcixJFt/xFA0YvKIsrqz3freT Rgf9k3tI5Xh1mnbi+vW99cVTS8vve9nwCKfaj3tkmU0Hr3YDa2dGLXV2jQ8s2K8UHAWU kYSDH5Nh6GOyAyQTF3tLaZT01YgsM24KJOY6Bohal2T/A5GwIaVb52tv+9P4Zftp+MRi D7u1toE3oX95wnA5BQ/ksbLaeyUGQ16B2yzT0E3HBnEVIXxmGU+NLqomjAtsK/BrBfP6 iXs8pExzW4j77K/9zuwDbnMobFlAcxT2GT8Eq/x/DV5/0vFEZg+tDItfMr2teza+Skk0 oNHQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="LBGRMb/p"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org X-Forwarded-Encrypted: i=0; AJvYcCVEOKZ9kJSTluvXu+FeyKTRZg2OeTQYSCcp9pBGde3TCn3+tcJgG1+MHMn6Wn7VxV06c3aYE3a4bjZtYLjqe0Svit2FTqZcz3HPl3yeyN7eEFUyX2K0sDa6VQMoOHBVM4hHOCA6u69TzIiSCdAg8ljQeah1D5EhKBk1aSu3ymicUJaoJiAFU5rPGCoX2Thvr+3TGhbv9hj76X/eV7Qgj6OW2y+xe4Xfca/HEjxxtSEn7zdliIo6JFP29GyP+u0vOPIQzvIYhndFO8t2Yfz3mBwj2cLnO/um5UsyPXvg0Ux4MXfWjBgrC+CEG0+d0y4A/PFj6/mljQMrpFRW0dzaedESm/xYgnx+0z24rhNAvvNnsCc6oCYPORlqf7Tg6oN2LGADKYlFp/lHoqv8NE31a+paS5s93Aa7qKIz4puUlWh7xjRNxOrfPj4mRyecZKktY6RY5Fwjm/bRZHzmBs9pzVY9kDklToc7JIe8saYCui4+xo5puEJcu/IVX4OdOsigALCvUj004zK2duGAqsYxQ984ih03qCPTtgkozq/BwUSfhwT3REiYbs0gy5mVm/SDPadgRJ7FN+z3X0+XEFeZEH0v+d/0ChS3ZYuC8n4wkVy7j1EBEHmyok4CaFqmj8DYyph9fh+j/HVsU8Gp2KCPle1CQm2Qj+3+tXoWRP1DIeonajWYtuPowjMmFK0i1XXMsUpUxKfl6lbTR3HiIm8qHiZV5XqKNLIDkd/eTjvXmwKjUj0mSqfGKLZyM4sUH1kKNNAqD4NNs9ujglJcKkICygVnAFzSgK1fcCsgwFU/V2z9mp5CrmWKom45KYQ9J7HsXmwm2jRehxGkNPTsvSldmsWkC/tFPXq71xD5SCpZP1FAVQ68DTlSr5zhbKTaDB0g7vhWsLhhwhuwxvdffeM1mHa6N8xS6yR12uD9l6O+5xkGLcUvFD0qmX1iUFQWOwpGNPYfPZ otag0tWjZQB+LqjS0ZcMAc1A4E4bx3zTN2nt6v1NTf0YN7sLsNY6q3tvbW7IMPr05oH2M34vFU7nG6T0mDMWy2J4ItjbPP9jk3xSk3GyhQ1fDYejyxqw0dRqk68aF1slvtNgQGGyOKdW7cC2xdqOwguG1HKrHr/pRuw3tkCXzONAJNEpgBTmaFvSMWOj4K4vU0aG82ovQeFVcvRF8tDlc8eSD42T9Kyt6u3B4Jkb4GRc5YQwgD8D/pa3/m8lhCur1maXlXKzCMaE7O5FdUug3ay26bbsEHbdMsuonD2EeodAgCfYHBT+y+X6MuEVCZ700jvDwUYpl6NRlRG//wZ6XkLRKTmdNsOFSdFY+C0D5FMC2xCvTzHGjYNn3WXgMY8UhY8kVmtXD0e/iBdAL3o6ZcqRrw1ldUP4KHk2tO5jw9fx+xnfNPpKcxUPnrYeK8vK32QzDEF1S4jrPs8Z3ZyNnrc462IL07ZqC5yxmfexXqlCCR07VYBlpWoLLY+rN2xRuerQTmDwZK3CMuAFF4J0jJdjo2qMAkit0EWiAp3/h4grHvp3+dMlpyi7e9OFTrkmjSZOG3n6e6QjGV6GWdNg5CFeZ7IAl18A== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f12-20020a17090624cc00b00a2a4a9e8b92si23359ejb.940.2024.02.05.09.04.39; Mon, 05 Feb 2024 09:04:39 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="LBGRMb/p"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D89768D16F; Mon, 5 Feb 2024 19:04:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B84868C69B for ; Mon, 5 Feb 2024 19:04:29 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=LBGRMb/p; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 7B03519B9 for ; Mon, 5 Feb 2024 18:04:28 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 1RsK7jJ7SoOA for ; Mon, 5 Feb 2024 18:04:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1707152664; bh=JGhYduJyiubsbolEt0xKbaRUJeb10znuw6J+6A/1Vdw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=LBGRMb/puVSZzUEcyQN1vXNsdX+2ZsvAG5Vow9vY3Uf3udM7GxW/5lwsORJhKhYfa 3V8DGN5uZu19H3K+jEIBbw10y1vWlCAnzuYXduCmTOn7jfIA54rmEAUUCWLKW20bwX Z0qmD8lVOpm6Uqt+c88Iig4dOMsvB/J91NYPy7jX1F2eIr17XWsa1ATOyb/LBc4PFO dWNGxZM1WjWb7RTKpfoXhElc5QfpVgO4zxqGQA9QqeCedWlm2RaLPlTWwdcm9BquYX jlD3DLiEAq8OKZRyNe5NRoLbLPDbAQiLAIXpjn6e4Ee1hqduQdYIOx0W2VCdaGOo5H OEazB+7jWV9Dg== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 8683158B for ; Mon, 5 Feb 2024 18:04:24 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 2FEC73A0435 for ; Mon, 5 Feb 2024 18:04:16 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Feb 2024 18:03:54 +0100 Message-ID: <20240205170415.20391-1-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240201082938.16687-3-anton@khirnov.net> References: <20240201082938.16687-3-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0FNUjUuIv5y1 Replace it with recreating the codec context. This is the last remaining blocker for deprecating avcodec_close(). --- Applied review comments. --- libavformat/demux.c | 61 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 6f640b92b1..b70979c520 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1250,6 +1250,53 @@ 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) +{ + AVCodecContext *avctx_new = NULL; + AVCodecParameters *par_tmp = NULL; + int ret; + + 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; + ret = 0; + +fail: + avcodec_free_context(&avctx_new); + avcodec_parameters_free(&par_tmp); + + return ret; +} + static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) { FFFormatContext *const si = ffformatcontext(s); @@ -1286,8 +1333,10 @@ 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); + ret = codec_close(sti); sti->info->found_decoder = 0; + if (ret < 0) + return ret; } /* close parser, because it depends on the codec */ @@ -3013,14 +3062,16 @@ find_stream_info_err: for (unsigned i = 0; i < ic->nb_streams; i++) { AVStream *const st = ic->streams[i]; FFStream *const sti = ffstream(st); + int err; + if (sti->info) { 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); + + err = codec_close(sti); + if (err < 0 && ret >= 0) + ret = err; av_bsf_free(&sti->extract_extradata.bsf); } if (ic->pb) {