From patchwork Sun May 15 20:18:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Theisen X-Patchwork-Id: 35781 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1254221pzb; Sun, 15 May 2022 13:19:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBIQXuCY9De87OzWMTOMmRm0g7HhK41C1tR31uxOIixNC4DruGyYPhhl6WkTPMge9YPh1z X-Received: by 2002:a17:906:b50:b0:6f3:ce99:3c39 with SMTP id v16-20020a1709060b5000b006f3ce993c39mr12450094ejg.52.1652645981885; Sun, 15 May 2022 13:19:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652645981; cv=none; d=google.com; s=arc-20160816; b=FjvsIZQm/LhW5jLr0jjpHCGaGSZA3yYAyeoRx7CgIhauYmsh/ICqIU7/+jF/76TiQL aL8XTI1FX5ag85O4zuPZnR4pOve3/L/+EwLBviRpOh0J2KF3p1D1gh/tcW1yOpANEwwJ 8gNiM5dvGr4DKCGEgHnRJb7EHOoIm8z+yxtexhJB5DO4vCMqCzJtR5sr6ZIbxGBh6DKd 9PV5GbF6bhqBrzqHuWziGi6ynAwYWgFJbch5bbOFwTClGDBh1c2WWd5Kb1p+YmtlHG2Q ffz8Vo/70Yi7u8SYCPRjqdMEv2CCEsVhDA/wXsXnvmtSEnQJ/8ALbrH11pI5JatVq+nJ 0jJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=vesecjMxlUX2kAu1o1IfWlQw0wNBj1aCa0ijCMusj4c=; b=c4oLYBnV+2lCkLGp2S0ljP9MZOPhkUG0LBqhconO6f6Haxhyn0yyv74DxyeSzhXDQW guJYtn/QMOLoIkM2bXcPhDyuQv7uAitm0+8iEu5xmWDchVbVuJt9y+gdt7xHU/DdetF+ LX+AzK7NRErpNzk7ekgqWWWfc26mpoVPUlS3RGLVh7zvsNbAXC1i+ZT30+25Q24zIl6+ er+IH+0xGjfGxFjKGJB3+6pGlD6Wm4xu5xnDiLonymVNQgoLDDzrT3znfIyT68HRj8aX gS+W66rWmF6GecGNzh6hmHRLx327p4CHOT9eQPQEX4Or4nh/fZP/M0kp0vc0zMQFO/PL sTsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XhVwDQoN; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e9-20020a17090658c900b006e844990dcdsi8794590ejs.334.2022.05.15.13.19.41; Sun, 15 May 2022 13:19:41 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=XhVwDQoN; 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 DAECC68B1FD; Sun, 15 May 2022 23:19:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F47868B331 for ; Sun, 15 May 2022 23:19:32 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id e17so10784280qvj.11 for ; Sun, 15 May 2022 13:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hl/ESYkllnP9fmMDITjkbYXWto6KrDvg8wgymyJYpHo=; b=XhVwDQoNLnsktzk+WSh77+Ve/OFHI4UDZFr4cwxBHbBWLFBg6mUO3EHp9pN5e+9JrZ suAI7zsBcZzDMIg9iF9e1Hf3xBeym+mvtdrG40pOHB6RWpki0yr4yq4zhQTxYSb1rsFA UI1XNgwRbbuIJO0ZjZC+B4JY7XOCXv3S8asA+DRe9pDOcQ5iMv0YWrGV3InGIWQ56AOo oqkiouGlJuCik95dpv240XHim52Oo6zUMWe2/K9KHYXke9w4Rmi7HfIj3s/HcDo3ggoE nSlZQlwIeiSwS6E7L/m3wCPPHfBbayJrbpSQ7VG1OCUffz9MtFmJcTNafflOeq3LcQBQ HCng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hl/ESYkllnP9fmMDITjkbYXWto6KrDvg8wgymyJYpHo=; b=AdKO14k3NmvDBvUJVyOf8g3KN81/Ih3Pu7QiuNpmq5Z7d/vMQj2iFdpgBpiuJn7uGU 9f1xK3Fg75D9lIBVTIncB4L16QvypeI1buQ/eU3kleQBDmBq8uyDlOWM/Hdpb3geBLuu TzQP/PYq3Pgc1x+ZxTdLlpgZxnk6XnWuxy4ExsazukX9nImsQbwRewlz0VLzrvgO5Ybu /p5+qhN4K6CUQWir3uJztx8vpgK+zh4bZDLIx++wYn5i4KJL95hPt5Sm3bPLDAI0Jtb9 Zms23ARGd9WwDxXrkJ5O2m1FOP4JhFosDHVKghnlMuhqbgpR/aNtJWvsVHkjSLn6YnfE vJug== X-Gm-Message-State: AOAM533xa2qLd3ivJb3RpJU9X0eq1NjLq1rGMPpz361N2cd7wTxRLH69 4gROiqxna0Ad1t/Vp7vmAqHzOlxuX+o= X-Received: by 2002:a05:6214:2388:b0:460:2238:5996 with SMTP id fw8-20020a056214238800b0046022385996mr12747361qvb.44.1652645970564; Sun, 15 May 2022 13:19:30 -0700 (PDT) Received: from scott-desktop.. ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id x26-20020a05620a14ba00b0069fc13ce1e5sm4648798qkj.22.2022.05.15.13.19.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 May 2022 13:19:30 -0700 (PDT) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 May 2022 16:18:44 -0400 Message-Id: <20220515201844.370158-1-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220213224237.178797-1-scott.the.elm@gmail.com> References: <20220213224237.178797-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] lavf/mpeg.c: improve readability of packet identification logic 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: Scott Theisen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: odi+MflNQBv6 switch-case over es_type and then perform a linear search over startcode. --- This version doesn't use stdbool.h but is otherwise identical. libavformat/mpeg.c | 213 +++++++++++++++++++++++++++------------------ 1 file changed, 130 insertions(+), 83 deletions(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 864b08d8f8..dfa6852453 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -483,6 +483,7 @@ static int mpegps_read_packet(AVFormatContext *s, AVStream *st; FFStream *sti; int len, startcode, i, es_type, ret; + int identified = 0; int pcm_dvd = 0; int request_probe= 0; enum AVCodecID codec_id = AV_CODEC_ID_NONE; @@ -523,92 +524,138 @@ redo: goto found; } + // identify packet encoding + identified = 1; es_type = m->psm_es_type[startcode & 0xff]; - if (es_type == STREAM_TYPE_VIDEO_MPEG1) { - codec_id = AV_CODEC_ID_MPEG2VIDEO; - type = AVMEDIA_TYPE_VIDEO; - } else if (es_type == STREAM_TYPE_VIDEO_MPEG2) { - codec_id = AV_CODEC_ID_MPEG2VIDEO; - type = AVMEDIA_TYPE_VIDEO; - } else if (es_type == STREAM_TYPE_AUDIO_MPEG1 || - es_type == STREAM_TYPE_AUDIO_MPEG2) { - codec_id = AV_CODEC_ID_MP3; - type = AVMEDIA_TYPE_AUDIO; - } else if (es_type == STREAM_TYPE_AUDIO_AAC) { - codec_id = AV_CODEC_ID_AAC; - type = AVMEDIA_TYPE_AUDIO; - } else if (es_type == STREAM_TYPE_VIDEO_MPEG4) { - codec_id = AV_CODEC_ID_MPEG4; - type = AVMEDIA_TYPE_VIDEO; - } else if (es_type == STREAM_TYPE_VIDEO_H264) { - codec_id = AV_CODEC_ID_H264; - type = AVMEDIA_TYPE_VIDEO; - } else if (es_type == STREAM_TYPE_VIDEO_HEVC) { - codec_id = AV_CODEC_ID_HEVC; - type = AVMEDIA_TYPE_VIDEO; - } else if (es_type == STREAM_TYPE_AUDIO_AC3) { - codec_id = AV_CODEC_ID_AC3; - type = AVMEDIA_TYPE_AUDIO; - } else if (m->imkh_cctv && es_type == 0x91) { - codec_id = AV_CODEC_ID_PCM_MULAW; - type = AVMEDIA_TYPE_AUDIO; - } else if (startcode >= 0x1e0 && startcode <= 0x1ef) { - static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 }; - unsigned char buf[8]; - - avio_read(s->pb, buf, 8); - avio_seek(s->pb, -8, SEEK_CUR); - if (!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1)) - codec_id = AV_CODEC_ID_CAVS; - else - request_probe= 1; - type = AVMEDIA_TYPE_VIDEO; - } else if (startcode == PRIVATE_STREAM_2) { - type = AVMEDIA_TYPE_DATA; - codec_id = AV_CODEC_ID_DVD_NAV; - } else if (startcode >= 0x1c0 && startcode <= 0x1df) { - type = AVMEDIA_TYPE_AUDIO; - if (m->sofdec > 0) { - codec_id = AV_CODEC_ID_ADPCM_ADX; - // Auto-detect AC-3 - request_probe = 50; - } else if (m->imkh_cctv && startcode == 0x1c0 && len > 80) { - codec_id = AV_CODEC_ID_PCM_ALAW; - request_probe = 50; - } else { - codec_id = AV_CODEC_ID_MP2; - if (m->imkh_cctv) - request_probe = 25; + switch (es_type) { + case STREAM_TYPE_VIDEO_MPEG1: // 0x01 + case STREAM_TYPE_VIDEO_MPEG2: // 0x02 + codec_id = AV_CODEC_ID_MPEG2VIDEO; + type = AVMEDIA_TYPE_VIDEO; + break; + case STREAM_TYPE_VIDEO_MPEG4: // 0x10 + codec_id = AV_CODEC_ID_MPEG4; + type = AVMEDIA_TYPE_VIDEO; + break; + case STREAM_TYPE_VIDEO_H264: // 0x1B + codec_id = AV_CODEC_ID_H264; + type = AVMEDIA_TYPE_VIDEO; + break; + case STREAM_TYPE_VIDEO_HEVC: // 0x24 + codec_id = AV_CODEC_ID_HEVC; + type = AVMEDIA_TYPE_VIDEO; + break; + case STREAM_TYPE_AUDIO_MPEG1: // 0x03 + case STREAM_TYPE_AUDIO_MPEG2: // 0x04 + codec_id = AV_CODEC_ID_MP3; + type = AVMEDIA_TYPE_AUDIO; + break; + case STREAM_TYPE_AUDIO_AAC: // 0x0F + codec_id = AV_CODEC_ID_AAC; + type = AVMEDIA_TYPE_AUDIO; + break; + case STREAM_TYPE_AUDIO_AC3: // 0x81 + codec_id = AV_CODEC_ID_AC3; + type = AVMEDIA_TYPE_AUDIO; + break; + default: + if (m->imkh_cctv && es_type == 0x91) { + codec_id = AV_CODEC_ID_PCM_MULAW; + type = AVMEDIA_TYPE_AUDIO; + break; + } + identified = 0; + break; + } + if (!identified) { + identified = 1; + if (startcode < 0x20) { + identified = 0; } - } else if (startcode >= 0x80 && startcode <= 0x87) { - type = AVMEDIA_TYPE_AUDIO; - codec_id = AV_CODEC_ID_AC3; - } else if ((startcode >= 0x88 && startcode <= 0x8f) || - (startcode >= 0x98 && startcode <= 0x9f)) { - /* 0x90 - 0x97 is reserved for SDDS in DVD specs */ - type = AVMEDIA_TYPE_AUDIO; - codec_id = AV_CODEC_ID_DTS; - } else if (startcode >= 0xa0 && startcode <= 0xaf) { - type = AVMEDIA_TYPE_AUDIO; - if (!pcm_dvd) { - codec_id = AV_CODEC_ID_MLP; - } else { - codec_id = AV_CODEC_ID_PCM_DVD; + else if (startcode <= 0x3F) { // 0x20 to 0x3F + type = AVMEDIA_TYPE_SUBTITLE; + codec_id = AV_CODEC_ID_DVD_SUBTITLE; } - } else if (startcode >= 0xb0 && startcode <= 0xbf) { - type = AVMEDIA_TYPE_AUDIO; - codec_id = AV_CODEC_ID_TRUEHD; - } else if (startcode >= 0xc0 && startcode <= 0xcf) { - /* Used for both AC-3 and E-AC-3 in EVOB files */ - type = AVMEDIA_TYPE_AUDIO; - codec_id = AV_CODEC_ID_AC3; - } else if (startcode >= 0x20 && startcode <= 0x3f) { - type = AVMEDIA_TYPE_SUBTITLE; - codec_id = AV_CODEC_ID_DVD_SUBTITLE; - } else if (startcode >= 0xfd55 && startcode <= 0xfd5f) { - type = AVMEDIA_TYPE_VIDEO; - codec_id = AV_CODEC_ID_VC1; - } else { + else if (startcode < 0x80) { // 0x40 to 0x7F + identified = 0; + } + else if (startcode <= 0x87) { // 0x80 to 0x87 + type = AVMEDIA_TYPE_AUDIO; + codec_id = AV_CODEC_ID_AC3; + } + else if (startcode <= 0x8F) { // 0x88 to 0x8F (to 0x9F excluding 0x90 - 0x97) + type = AVMEDIA_TYPE_AUDIO; + codec_id = AV_CODEC_ID_DTS; + } + else if (startcode <= 0x97) { // exclude 0x90 to 0x97 + identified = 0; // 0x90 - 0x97 is reserved for SDDS in DVD specs + } + else if (startcode <= 0x9F) { // 0x98 to 0x9F (from 0x88 excluding 0x90 - 0x97) + type = AVMEDIA_TYPE_AUDIO; + codec_id = AV_CODEC_ID_DTS; + } + else if (startcode <= 0xAF) { // 0xA0 to 0xAF + type = AVMEDIA_TYPE_AUDIO; + codec_id = (!pcm_dvd) ? AV_CODEC_ID_MLP : AV_CODEC_ID_PCM_DVD; + } + else if (startcode <= 0xBF) { // 0xB0 to 0xBF + type = AVMEDIA_TYPE_AUDIO; + codec_id = AV_CODEC_ID_TRUEHD; + } + else if (startcode <= 0xCF) { // 0xC0 to 0xCF + /* Used for both AC-3 and E-AC-3 in EVOB files */ + type = AVMEDIA_TYPE_AUDIO; + codec_id = AV_CODEC_ID_AC3; + } + else if (startcode < 0x1BF) { // 0xD0 to 0x1BE + identified = 0; + } + else if (startcode == PRIVATE_STREAM_2) { // 0x1BF + type = AVMEDIA_TYPE_DATA; + codec_id = AV_CODEC_ID_DVD_NAV; + } + else if (startcode <= 0x1DF) { // 0x1C0 to 0x1DF + type = AVMEDIA_TYPE_AUDIO; + if (m->sofdec > 0) { + codec_id = AV_CODEC_ID_ADPCM_ADX; + // Auto-detect AC-3 + request_probe = 50; + } + else if (m->imkh_cctv && startcode == 0x1c0 && len > 80) { + codec_id = AV_CODEC_ID_PCM_ALAW; + request_probe = 50; + } + else { + codec_id = AV_CODEC_ID_MP2; + if (m->imkh_cctv) + request_probe = 25; + } + } + else if (startcode <= 0x1EF) { // 0x1E0 to 0x1EF + static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 }; + unsigned char buf[8]; + + avio_read(s->pb, buf, 8); + avio_seek(s->pb, -8, SEEK_CUR); + if (!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1)) + codec_id = AV_CODEC_ID_CAVS; + else + request_probe= 1; + type = AVMEDIA_TYPE_VIDEO; + } + else if (startcode < 0xFD55) { // 0x01F0 to 0xFD54 + identified = 0; + } + else if (startcode <= 0xFD5F) { // 0xFD55 to 0xFD5F + type = AVMEDIA_TYPE_VIDEO; + codec_id = AV_CODEC_ID_VC1; + } + else { + identified = 0; + } + } + + if (!identified) { skip: /* skip packet */ avio_skip(s->pb, len);