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 97E1C4892B for ; Sun, 21 Apr 2024 15:32:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AE3768CFCE; Sun, 21 Apr 2024 18:32:21 +0300 (EEST) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2033.outbound.protection.outlook.com [40.92.49.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3211468BAD8 for ; Sun, 21 Apr 2024 18:32:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jyXtoOUDqyiquT0gbixK7w2SLGRstnG8OV1VOVDr1hQhW8/G/0UOxh9FqFB4A87fi/U0QTYf7EgKQtzpdf8SdePBId7MO0YZsGAbECkmZX0XHIP4Gjo+Ihbejdf2FyKLfZRq0LoFWmW2H3QKteaUZv3ybDxLE2Lmr1CiEjH0mzJ6kBzz9sU5G77Ch1ZeCs9Z4739wJby/+InpqYWJdYScSiS2wklTobzr539okXSBVbFskIr3s8Owb7500cpkqiRTWgAx+zMWafPxZbI0lgbdX1GDZYi3FHjueD8dKXc97grHuI2FdhIfeTalmwDc44IVGrGFE8NgfQw9L0AsJ2CRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8z0D5+JyDJcz+UFVYEkTeIYXV2B9GiZJkwHLEIjTfH8=; b=PIwZNPrBEp7DfUdT2+O3KaCcuyvLRaQWX2W97L2ddC09VaGNEwq1Qi6yEo4aAHzaV71BULd54oelp8SUl2sPJf/lZL3Jg0egYjU3CMMNN4Yhk7nEuRX5nMVeZChQdZ77RhA9mvJOrVrw83RpPXu7nw1rafbuwinuG/v8HEVP11416BRewT/3e2bCcM5PVQBFOQOHbKCZpoE+rufFp/efb4H5oxhKGTQVkAxGRIjlW+chGpIYeSdwzOHyUi/t0sGVS5jJJTi9DMdEynjjlmlK6r/sz1H8JTHjSvuE80Os6i9cI94vYXa93eaQsvnCnc/rulevROXknUQSJ1GoidbR+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8z0D5+JyDJcz+UFVYEkTeIYXV2B9GiZJkwHLEIjTfH8=; b=RO5PpJkJsomFvYuYM52KTonlOvyWTCZ+Sz0EMFPFzyzy/HzwKGsxhL7lMLrcwkSLa6xqiONF1YMVERaI9pafA1PJ1rphVjvSGA3xMan/YoGXRkOwNYRcKQjzzpseS7f/kVNqloDUJBhVk01m/hI4PffXXu8RmcqqHp8QOG54oWDUMCPjRbg3f4CAvylxYkOD742ArrgwolWMriz7mab9p85JAKfYuSVs3muy3PKUa6mf1vgSRXA+V7atKgQ4L30eTrWUQoPY0UwQaG4cPAISeQzE35Fi0fhaylg48npJKSZ9zGl1eeGYgMvoNzSKq7Sk/Eegb322SokjTcrIRcCFZw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0581.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4af::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.44; Sun, 21 Apr 2024 15:32:14 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7409.042; Sun, 21 Apr 2024 15:32:14 +0000 Message-ID: Date: Sun, 21 Apr 2024 17:32:11 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240420234312.36464-2-jamrial@gmail.com> <20240421151851.1165-1-jamrial@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240421151851.1165-1-jamrial@gmail.com> X-TMN: [tSlgAid/yt0XKWJWSDudGF9VFNI1ZUaztrDXMjbLqr0=] X-ClientProxiedBy: ZR0P278CA0155.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <378fab32-6681-4501-bfe7-ce3ec6b6c8f6@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0581:EE_ X-MS-Office365-Filtering-Correlation-Id: 844ba8df-d760-47f6-735a-08dc621837f1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ic2PtsgHJ6OgE16a251E8dhW5OJrWGJBSGpRdUeE7e3cHs6J/ewn7n45j398FSvk+yF+Zab4rxHpug4bTtxlYvpH3O2r1XLP8qSQ+fv05SJOPQ53iqrBk9cjT+WMvUViJ7SldSpbXGHzD1hsYlnXsn6dA7mXQcvuCxsO8DySI0e+nDYDLPfywqvX8dub+a1AYBeEhhu2/8FI0btIkid/K0dcFXzogd4RUnQ7UdimK/cKMcAtppfqGn3ppGhUXq3aECfL7AahrCzhMB7+huBxOfw9TqO9+xj6g/FIgOKBAmZ4mJ43MPrtb+zYNN/Mks0KU1Lt93YVePu2SVM8KBkRmV4CnPM5RNcZmjBCl9txXiYC6J3ZnxZfHwKE73l+CvXClzco2Jif9yRiDshvjMKO9hB4rBVrGBBnP45Biws6sMf9H6iP9KRcGhroyvtipCLwu+91puPsdqty5L5j/QXQsAgB7gG+nmk8jBZZokfl3tW4uhpShKoLjhV+r/vnmrOBE2ZHqsPs9b3FM9Pw0vpf4Y8LHDukPQInqXeIq1Yf1USzQ/z4o0W2+pLwhV6FtABN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bmNWVVppNnh0Z3d5QW5ieHFVOGxqM1lmb1lLTjZPK1hMTVl5ZE9SL2M3V1dp?= =?utf-8?B?MXRnVTl0MFlhY2hJRUt0YkRUMUM3SHNQOVBkK3hnSEE4TTVLSVlpQWxveFU5?= =?utf-8?B?cHZuTXlWdWtZa3B5ZE1keE5wZ0RGeStTUVhxTTBPVGZzOUpkNktTdG9MK0Y0?= =?utf-8?B?VUpram1jVG02VVNCQzVCaTg0SCtyaWRiOSs2NG5MNDlDVmE1RE1LZk9PK0xp?= =?utf-8?B?ajNucjl2R2VaS0x4TEk3NnlGY05MRlZ6bEdlSU50NjVYemY3WTdwMVFlSmE3?= =?utf-8?B?a0U2cThoKzNzTDhJaWVrRmxNc2dFSjU2SWd6TFIwZU9HaWQrdzlVYWNudzVh?= =?utf-8?B?aHpOeFA0QVlaWHF0QjA0L1B3ZG04TVRWeU1XdDhIRlg5M1pYUXBaYWpIc21J?= =?utf-8?B?MlY2cXVXaGkwK2RxdG9aRDBCTHdoOW0yTHJjL2o1OVkwUzlYWFZ2S21JamVP?= =?utf-8?B?SER0RUZSR3JhWVREN1Y5NStBR1hJaElEbkJtaEZGRCtZY2F0ZmJEbEk2cHFK?= =?utf-8?B?RU5rTU93NmN1dTNtQzVLN1BqVHZWcHJlMCtzem90ZW5KODNQTmlVSms1aXY0?= =?utf-8?B?c21WRTJCYkdGYmE3UGtWRlhKWTgwSEx0cGtQUi9LNjFQNjZNajNHN0NodldN?= =?utf-8?B?WndOTHptcXZacG1TTUNyYkNoVVZzU1doOEdUK1E3bVV2Q3pFdllCL1N4UjRk?= =?utf-8?B?NkZGWWE5TXE0ZlZqQ2F1Ylh5bmNiL0hFL2FCSksrUjJ2dkRpQ0NVRUZBWmhS?= =?utf-8?B?Ri90aDlzR0pncEJNUmV6Y20yU2pnL2gwWU40dEVMdlVNcGhKTU5YZmFUS291?= =?utf-8?B?bzRpVFFYeHNpR0o0SUJDbUxCQkZWbXdVcXJhTUlCMHhiTEZDTWFUclBBbmI5?= =?utf-8?B?blp1bnVvdlF2a2tlbGFISS9CMkw4Q2ZuUGo1S3l2d0xtaFhLaWlrbjdwbnVi?= =?utf-8?B?VDY2TTN3bWh4cEltUTQ2SVAvdTJOUlNLdTd5OFFrYWNMU3RZVE9LaE5nQ1U2?= =?utf-8?B?RDRtdmVaWERTNGNOTTZFOW05SWpsR0Jzdll3a0pJZTBqODJOaUFpR01BUFQ2?= =?utf-8?B?OGduNVA5VnlrVDRaZGtpOGhZQjFTNUFaTGlEWW1hYk5aL1hoMy9nTlNCK0dl?= =?utf-8?B?ZDFGcTZGaHByZTlPZzJLZFROMWlTdXRMbmFMMnM5eFhIQnBsdWlkMWhNZDgy?= =?utf-8?B?U3daajdTaDBkUTd0bU83M1lMakh0K2lkeUpJcVNGaGdiVlZ3VU9vVnc2OXZ4?= =?utf-8?B?SWpiVjl1Y3FHTHdHdWZPQTNPR3h3RTB3S0hEUHVrdWdMUHRJN3pZdDNyM1VE?= =?utf-8?B?TkptNVVoODBNWmNCUFdBNmpDems5WSs3QVM0OWF0TzRMKzM1dm1FS0RjRHQ0?= =?utf-8?B?eU5jUW5nUDNVMFV0SDBrVEd2VjdlR0J6bzZtbHludStmZk0rMzI1U0Y1MU0r?= =?utf-8?B?RFZQb3dyWjdzRnhnTTc3NGRDNjFmblBUL09meDZYbVNHUzR5M2FQVStWREZM?= =?utf-8?B?T1lTaGJiU1B4YUpra0NYTmZkRnlvMEJFZGZvZnJTczZYZVMrRG45MWhwOVJv?= =?utf-8?B?ajhjV0Vxcjc3YStwb3llRlFudld2TUlvQktrT2dhVTY0MUR2MGZ0dWhqeENG?= =?utf-8?B?NDVJQW9iM1ZUU0FBc2l4OXRMNC92ZnV6K1Znc2VkaXV1MGVMR3daMjM5RnFu?= =?utf-8?B?c0ZpNkNTb0EwazRxazRDNURnSTdWOWs0TlFDTElGWXpnQ0VNd3ZBU3VRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 844ba8df-d760-47f6-735a-08dc621837f1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2024 15:32:13.9323 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1P250MB0581 Subject: Re: [FFmpeg-devel] [PATCH 2/2 v2] avformat/demux: extract extradata from packets when context update is requested 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: James Almer: > If the demuxer doesn't set extradata in the stream's codecpar, a > need_context_update request will delete the previously extracted extradata in > the stream's internal AVCodecContext. > As we can't ensure the old extradata is valid for the stream in its post > context update request state, try to get extradata from the new packet instead > of attempting to preserve the old in some form. > > Signed-off-by: James Almer > --- > libavformat/demux.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/libavformat/demux.c b/libavformat/demux.c > index abfd5fee7d..39aa1cd4e3 100644 > --- a/libavformat/demux.c > +++ b/libavformat/demux.c > @@ -1319,6 +1319,8 @@ fail: > return ret; > } > > +static int extract_extradata(FFFormatContext *si, AVStream *st, const AVPacket *pkt); > + > static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) > { > FFFormatContext *const si = ffformatcontext(s); > @@ -1373,6 +1375,11 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) > return ret; > } > > + if (!sti->avctx->extradata && > + (ret = extract_extradata(si, st, pkt)) < 0) { > + av_packet_unref(pkt); > + return ret; > + } > sti->codec_desc = avcodec_descriptor_get(sti->avctx->codec_id); > > sti->need_context_update = 0; > @@ -2470,6 +2477,8 @@ static int extract_extradata(FFFormatContext *si, AVStream *st, const AVPacket * > if (ret < 0) > return ret; > > + av_bsf_flush(sti->extract_extradata.bsf); > + > ret = av_bsf_send_packet(sti->extract_extradata.bsf, pkt_ref); > if (ret < 0) { > av_packet_unref(pkt_ref); > @@ -3090,7 +3099,8 @@ find_stream_info_err: > err = codec_close(sti); > if (err < 0 && ret >= 0) > ret = err; > - av_bsf_free(&sti->extract_extradata.bsf); > + if (sti->extract_extradata.bsf) > + av_bsf_flush(sti->extract_extradata.bsf); > } > if (ic->pb) { > FFIOContext *const ctx = ffiocontext(ic->pb); This will keep the BSF around for longer than necessary, although only a tiny minority of demuxers ever set need_context_update at all. - Andreas _______________________________________________ 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".