From patchwork Tue Jan 30 12:48:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 45901 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2130621pzb; Tue, 30 Jan 2024 04:51:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IGt0WUybKRufJaxS20AbexPaUVK7WJ36QvsP+3Dd4lKlq4dqhVEOBsTBiNFss2PZWf76sDw X-Received: by 2002:a05:6402:281:b0:55f:3975:209c with SMTP id l1-20020a056402028100b0055f3975209cmr1137504edv.18.1706619059791; Tue, 30 Jan 2024 04:50:59 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f25-20020a056402161900b0055f15762772si1489961edv.32.2024.01.30.04.50.59; Tue, 30 Jan 2024 04:50:59 -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=@outlook.com header.s=selector1 header.b=cKbFcL7d; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 71F0C68D349; Tue, 30 Jan 2024 14:50:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01olkn2015.outbound.protection.outlook.com [40.92.107.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4874268D2F2 for ; Tue, 30 Jan 2024 14:50:50 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ab/JQqdsldhR4sDMsy8ktL6uHbc5cdi21xR4YOW15JWu6tnk3t1w7LlFDPG+aOhmjxGqcis1ayJhupj07pcpSxn8x7SUZOdoybIKqK1ukiYsRIT+ZQhW2p8AswleJMmJSXi2a3lQIlI0za3E6DtzC0SVXwuujwVLWAqA6ZYdSXx80RzXTc5E7+0Nhh/NJnJ1+yl5T8DUhfoYL03j6uqJIE+oZHrXA+ikozzvOlbPJtnlovETX+EwXfK0XWBAsbD8Xkbs0IY/DXSkRg/A/qPFwn93WdaWG9agHu495OHH3GCvUdXhuOxQCktIONMgnmDr9Xg4BqkyWO1HwaRHzK5OZA== 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=l4LjObjmA5n/06oN7f6DOnVd8fANF0gDN1CEocYblpU=; b=frg3JL84QJkLSSB09WUUEtHuMBDN6jzJBFVjIr5lPb7vjlHTclVi9Q3yfLP25y0kxqZQEpKa2OmtHTEix2zNHssHC2xiUbGloBf0rvwdHScAm0y35YKvgmKRnWvlRgJwBWgT3QtqQiT0jbjkYN/+xGStGwnZZ3xsVlhA2dVaEQ9HmsPrFUpJq5Ddvoj0BzsSf0xpeb6PKductNenTm9n9guaPTnaU5NknNaUDJUJlrP9aPMFl3RDYl4ioM0zFTq7wCCUPDZ2ngCeHKXmMZv1Pa4MeaQ/T3/SCea6KtXqwS2XiiPzt9Tq5nZ2qnLtYxjwbtua/LhVzXe42mcLlMiy6g== 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=l4LjObjmA5n/06oN7f6DOnVd8fANF0gDN1CEocYblpU=; b=cKbFcL7dWNck86YQQv5kI4+nXqtibw6YtE+ud0nWbHX+6J9b2osAIWen7WmelJqKv9ebVl9+IssTYs8O2855lHd5rfOv5EAnsBv1w4VPJpWMOi8RZPOWfclbkm3fNTPaZJp3nlpEombSjP29KWpWCDrTEttoETJTuHRLwJG1rTqPeIhLV7uVlhUl5uewJclO4LKBKApcsi+x3IE8HrM4Z1PiFR2E3jRqGFZba+hUjxtp/I/NdeUJUCJerfaCJSk6i8+/oG/1hSwrkXwJqM3/sLmzKj4WtYaTLvbb3XX7vMD7U5+tzTEsl+iJ5zfxKfNHnoihb00yUZOlGBHWttlQHw== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYZPR06MB7274.apcprd06.prod.outlook.com (2603:1096:405:ab::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Tue, 30 Jan 2024 12:50:45 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::e139:fd7a:1b66:a3f7]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::e139:fd7a:1b66:a3f7%7]) with mapi id 15.20.7228.029; Tue, 30 Jan 2024 12:50:45 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jan 2024 20:48:59 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240130124903.16892-1-nuomi2021@gmail.com> References: <20240130124903.16892-1-nuomi2021@gmail.com> X-TMN: [6ucquX9K4c3rflKf9ime3x9Ez4XbIXxz] X-ClientProxiedBy: SI2PR02CA0035.apcprd02.prod.outlook.com (2603:1096:4:195::22) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240130124903.16892-3-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYZPR06MB7274:EE_ X-MS-Office365-Filtering-Correlation-Id: f7730a59-6498-4fad-0ce6-08dc21921399 X-MS-Exchange-SLBlob-MailProps: Vs63Iqe4sQmENacaprcsf8K7uW5aY0aB8oW0MSUSc0xswzBDk5H9buDKTSzH208phJd6f+L+rY5KjNYNMDrHdAQZ6zCUkheYqA68cazLRZZbYj9sJZt6HAzwiPc85u8/OPkCA4LYd//3dITJF63KHTgvWdklZqidfywbE8LtKnayStrYmU6Fo/sj3ZlGWbiwIxTR6wroTYk2RCN0XaL5fwNHg34nRL7nRVmZvn21OK1SbcTzBN4ZgZYgadqkeplHu+DhnDuyYOBuW7L68YvdAqopj0+YR5iCU5dM1pyS0nDGaLkEDiuvdkTlulrtN5M8xVVbcgcBTGhzisdu+uQWfqMRqD4IJYQ5l+hSh9Xd4ZWvEGyUQ3tL/3g53dHDfEK0iqzorWfMkSc0sOVLAJ0h3o5vwCtVuD35iWv/VJGD5z5h6JdB0Hbr/lMttgNtB/rcNt8nFVwT96Le8WJDN4K1NzkwOQjhh/F5gd1h2zmHZjkzDaWI+L9T+v1x+wtApJRpejCoOSIzraU39dJMXNXu3KSEfI0DmSOpQQw4kvyT15Cr72Aia8T07Dm7Pc0tF2xVaE4lvshVy6otSV30urB5iunMdt4LqqVSWpDgG6KJlSbDeBTJtV2KdJLU3rPBxnLBF9R0bwNBQWrJf2VO2/L36vZQDbnUPMtqSBDqDgoc1K8p6+m8zTSJpt6Fd/5KriWG3zddw2ONymMwSVTkcE2jl4432OIVZACIZRXyuXUvAHI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LdrCBOeO1Jy/mRThXc7G1m+YiPWSLIZzjxSpbzvRorVBLKD1tNb6y2ymWNQ65xjO8OkteYrhMSZSHZ61efzJkdCr2xAuhjfY+HSLkXNwnE2uX0NvYzBPYHfF/dc5enT33kYbMdRoU3btcRjOWAyXvofP6kAQyWlBFtvUTRbkaEuXpMSmWDSLMzqogRAczte/6QHrquYZaNjAomOKHIC3iqcqX3EeZu/paRGxpnzv7VZ8ffMTS15PzBb9gtAH9XaBmFZYA2UraR+J0AMfRVYsuBAYbrZiYZvEnP6k2VI4rfwMD4lAehn4j7P+lkybBJ8+KYXXr+kvJEqfr/WwEGhhGYMmKoxsWoJ2XF/CMpWnOdZh/7rstXvZrUSopGYm1++wYFD/G/zARRJ1UGXkRFV2TXp6rPbHwTIYdesCaqevxdfHjASkoBLc5JNwFFzsyG71c8dOLvQZfwwSK5G+vtmkiQbKNkRN4k9CQtrJEzHK+O4MNTtL443boh8U2gwXmZOqBPvnmxxFr9pip3kWpP2SbEK9+Yteje8sFfqPByhTGAYLu71M4sOngYTYMb5Dif66MRIB31A2+jdc4jwSAkhblkvcbBjalmy84uI0ERj91e7/uth7Wa2L8uIgOugkEtb0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0kdoUNxPXW9sRe38u2Pxr7DyLErcfRDBEj5vZgSaUDNhpf+gYqTA4a6mfX/OCc8mb3JvjJfI92aoLV8Wdeh1qmyTrAYlrOS8pRTx/HVIKmjZsNIs7g+x9e7pQNDJc5BFUhp+QcrCtHOtsRauqWs8ff+JZwCAMZf4M0SzQiiUORz6lcZwpe2Wf8k0S0HRJVokaR7yFH88UCr6fj/yWXjuuu19oojZARRgoSvGV+yE0qwvSm/j58HDHV0MVfUi+O7iymjEIaWxz/Nocm7CNGGCW65A32I4j/weskLYc6FF0XeEG7TocvqO0Ax8hZK3El1XMVbNdMnwBMgZrdkV7cCnpFL9rcNBkvvrzXA9oX9mZKjXcEwAh3JmmxVyruVbHNT75HWvrnLJqHTJxwtAGnBMHwUiCBJj9Cta91em16Qi3Dq++mHlJ26yJvQkrfMnCo+42nHTVmWwlVdOxMrtWu2RlRN+x+l+0vQrnF08MVF/Ms5WchYR1E6c8iPRaEiVfSD5JJhNASBkb4Jfwt5EgR99miLevOGJxtops2uKJGKQQBtwEmvvHGKheKa4JXCDuZ+kuIsNz+GtP8O1pU0cEg/E2pmzc6jqGnFB5Z5/c20SDJjli1uIXE0sWpO2gQwFQdYlS7g84iR5aUnpIpOt398IAQanKTT+5XdFnMZcjVbcXgSijVO1F5pSp/GdAR9w3A/lDfsRzSIgtCxmmu78Sj9VQzZnbh6EqfhrQVOrvWIEQTgXjSARartmy6N5Xq8H2kQfvFzNlSLuerRffWS8yCVq3DPRro/g0OZUD/pw0htUwHN9iEBDttI783naYqVbZJG8WvNABUuzftz5wF86gzr03ms/ucWDIqwAWOx1HHWNW/MyTHc3/SorWLRvCvo9anNERc1gPMKqLbFok0XR+dX3nB3XH1qmBNfSAwCBUtu7IXYSpHIpWuJO+Bp9lioKPqLUp4Sriae7I1pI5ODtgbi8NRytbIKiXtPYJOpcGfCizsq+4g5x8eGW+6KVXQMigfW9iPNSUPGzKCq3E1ej4Pkx9jAGqPbcL8j694DCUw8RqemhSAzU2yJWiVEQUqBgUTVWhUFt4CvKEFCfXEcC5iOMH9VtwrUdgYjUNiWQH0sjN+3SNOOpCQ2EHOn9jiJL0ytNBEwgBY5SauAKHkxByCFCEg1ZWmP7Nj5FEu9kFDZ3uRdSGug8TvDUADWUj03IPZprvm0mUSXZfoKXa7V7UCgXizn1AXUK2fF1JwCHO//LMnwXWA1/DkZbwCgZX5cF23vl X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7730a59-6498-4fad-0ce6-08dc21921399 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 12:50:45.8984 (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: TYZPR06MB7274 Subject: [FFmpeg-devel] [PATCH v5 2/6] avformat/mpegtsenc: refact mpegts_check_bitstream to loop up table 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 Cc: Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qBrsK9yeh0DY --- libavformat/mpegtsenc.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 84edd418f0..4e5c264d2a 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -2257,23 +2257,26 @@ static void mpegts_deinit(AVFormatContext *s) static int mpegts_check_bitstream(AVFormatContext *s, AVStream *st, const AVPacket *pkt) { - int ret = 1; + const struct Entry { + enum AVCodecID id; + const char *bsf_name; + uint8_t mask; + uint8_t value; + } list[] = { + { AV_CODEC_ID_H264, "h264_mp4toannexb", 0xff, 0x01 /* configurationVersion in AVCDecoderConfigurationRecord */}, + { AV_CODEC_ID_HEVC, "hevc_mp4toannexb", 0xff, 0x01 /* configurationVersion in HEVCDecoderConfigurationRecord */}, + }; - if (st->codecpar->codec_id == AV_CODEC_ID_H264) { - if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && - (AV_RB24(pkt->data) != 0x000001 || - (st->codecpar->extradata_size > 0 && - st->codecpar->extradata[0] == 1))) - ret = ff_stream_add_bitstream_filter(st, "h264_mp4toannexb", NULL); - } else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) { - if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && - (AV_RB24(pkt->data) != 0x000001 || - (st->codecpar->extradata_size > 0 && - st->codecpar->extradata[0] == 1))) - ret = ff_stream_add_bitstream_filter(st, "hevc_mp4toannexb", NULL); + for (int i = 0; i < FF_ARRAY_ELEMS(list); i++) { + const struct Entry *e = list + i; + if (e->id == st->codecpar->codec_id && + pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && + (AV_RB24(pkt->data) != 0x000001 || + (st->codecpar->extradata_size > 0 && + (st->codecpar->extradata[0] & e->mask == e->value)))) + return ff_stream_add_bitstream_filter(st, e->bsf_name, NULL); } - - return ret; + return 1; } #define OFFSET(x) offsetof(MpegTSWrite, x)