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 D2B9A483D1 for ; Thu, 1 Feb 2024 08:30:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 792BC68CE0F; Thu, 1 Feb 2024 10:29:57 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61AB468C8F6 for ; Thu, 1 Feb 2024 10:29:49 +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=DpItBafj; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id E801072E for ; Thu, 1 Feb 2024 09:29:48 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id zXBwy4H6tYni for ; Thu, 1 Feb 2024 09:29:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1706776187; bh=g+mwqDFaMLU3M1HrPuUtiz+FmcceuE2Xzm1IEZgMikk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=DpItBafjj3JiNLayA0wF/3xV4CxVpDY7DMYn2jW3HG0ZwepqQoA/P7WM/Qw8fHz4u 0Boc25RhM3j+IGDLGTNJ1Zf6Bki4BL6Er9OCV9GkfXosCglgYQLeUEFIWREFnY6XnG b/sjHiuhpRZMeb8Tgfma3HKkEzf8d2AK/t94I2DuB5ZFWD+1AVA2rofNFunz/xogXY ILqdWEi22gpY5sNrtNFmMuVuf640sM6s7/KecK1dNANxo4rpKelevC9Vrr0k4ttp9P tcIYsCJeL9R05t48ZafKXPAALK8wG7/zXqIj7kjF+kYEYXSLGPOQnVpb+9cEDPx5Mi qDyq95G+Pq7DA== 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 5BAF0115 for ; Thu, 1 Feb 2024 09:29:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 15EB33A076E for ; Thu, 1 Feb 2024 09:29:41 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Feb 2024 09:29:36 +0100 Message-ID: <20240201082938.16687-2-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240201082938.16687-1-anton@khirnov.net> References: <20240201082938.16687-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavf/flacdec: stop accessing FFStream.avctx 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The demuxer opens an internal parser instance in read_timestamp(), which requires a codec context. There is no need for it to access the FFStream one which is used for other purposes, it can allocate its own internal one. --- libavformat/flacdec.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index ab9ef052f9..bbb205078a 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -36,6 +36,8 @@ typedef struct FLACDecContext { FFRawDemuxerContext rawctx; int found_seektable; + + AVCodecContext *parser_dec; } FLACDecContext; static void reset_index_position(int64_t metadata_head_size, AVStream *st) @@ -269,6 +271,7 @@ static int flac_probe(const AVProbeData *p) static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_index, int64_t *ppos, int64_t pos_limit) { + FLACDecContext *flac = s->priv_data; FFFormatContext *const si = ffformatcontext(s); AVPacket *const pkt = si->parse_pkt; AVStream *st = s->streams[stream_index]; @@ -285,6 +288,16 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde } parser->flags |= PARSER_FLAG_USE_CODEC_TS; + if (!flac->parser_dec) { + flac->parser_dec = avcodec_alloc_context3(NULL); + if (!flac->parser_dec) + return AV_NOPTS_VALUE; + + ret = avcodec_parameters_to_context(flac->parser_dec, st->codecpar); + if (ret < 0) + return ret; + } + for (;;){ uint8_t *data; int size; @@ -298,7 +311,7 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde av_assert1(!pkt->size); } } - av_parser_parse2(parser, ffstream(st)->avctx, + av_parser_parse2(parser, flac->parser_dec, &data, &size, pkt->data, pkt->size, pkt->pts, pkt->dts, *ppos); @@ -318,6 +331,15 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde return pts; } +static int flac_close(AVFormatContext *s) +{ + FLACDecContext *flac = s->priv_data; + + avcodec_free_context(&flac->parser_dec); + + return 0; +} + static int flac_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { AVStream *const st = s->streams[0]; FFStream *const sti = ffstream(st); @@ -347,6 +369,7 @@ const AVInputFormat ff_flac_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("raw FLAC"), .read_probe = flac_probe, .read_header = flac_read_header, + .read_close = flac_close, .read_packet = ff_raw_read_partial_packet, .read_seek = flac_seek, .read_timestamp = flac_read_timestamp, -- 2.42.0 _______________________________________________ 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".