From patchwork Mon Sep 4 11:27:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43526 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1146191pzb; Mon, 4 Sep 2023 04:47:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHY/OtOuf8txYytretaVvVYGQ+oFrkv/+k/KAKqD8YySYpEzj1qMnbsBe7JMC1DCtEOqWJ0 X-Received: by 2002:a05:6402:553:b0:52a:1d54:2533 with SMTP id i19-20020a056402055300b0052a1d542533mr8542894edx.9.1693828064677; Mon, 04 Sep 2023 04:47:44 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e21-20020a056402149500b0052a121af5a7si6243867edv.452.2023.09.04.04.47.44; Mon, 04 Sep 2023 04:47:44 -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=@outlook.com header.s=selector1 header.b=YcUko+td; 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36B8D68C65B; Mon, 4 Sep 2023 14:47:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2082.outbound.protection.outlook.com [40.92.73.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2811C68C519 for ; Mon, 4 Sep 2023 14:47:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jaxrvt5tdANz91TpiiNRX0B7OaCfV55C/aMqXxi6ibqrs/kRgzEgVI81aCqOVsFcnxmcun/iB4KVk++MURBsJYNX8Vvx9OqLrb6C9SkTgruMpZsnVAuo8bTSBjlW/9jvH6cOni3KZe58GDe8sVj6og2MypseSLFyWeo7HNxHhiuIVotIP1jVjzSkapur7J8TgxTfh/CcDHsi4G7xdWHR9s+rs78et0VYbfYlNqqyblxyVdVT3zfoWznMf8Ec/qMorU0cWW3UimYjQDq47ZBzLHGS9cpNSMG91nffBQE1urkNrL+bdAqUbpeVaN2fItV/Mf6BL7VbymEpD4/1d/I0Iw== 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=OQda0QKHuJUSXAr0IpWKc+ysx0fQ5K+/B61+rX4jjKk=; b=Mko1xnislq23IqLEnWCW/HsG99Vco2uWq+MWNT+oQmnHxX8sUqfe0uSOwbuEk9ir8BCUgTWCLQ5rd8WqkBu6klZToTP2/4DYaj0I+JiPHhV2hY4YW06nYIdgM+sGBUN3aVIzTgpVd5HGqeSDNfAi49d2AVr2kdzpv6ihY+OSrMKYeonKOI1Ej0xWiJyEwh6lkjIH87re/7XRJ0vc1mb2rKVXNZ+QVhFMlHKp4zh5PJw58MIZ1IZQcHkeS2m4nD6tS0LDTVLVvqiS+kEc/ILJ5jQzSt4OH8y/sn8V36lM4vuwonvzjPFyJz8kEWPRezOGqwxgzX+qT2z65LLfF1okWg== 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=OQda0QKHuJUSXAr0IpWKc+ysx0fQ5K+/B61+rX4jjKk=; b=YcUko+tdgiSxzHBy8LFmbGw3dmba+KQIVttLiuHGceDvdkSBQoi7u/IVivpulTaMkMGKfMseyBjN02cjD7W359bp08zvblePagEimcO/GEze8BIVSMGJbXAghUF3s7dGoB7r9apbT4tJ9DYRJuseSynLRLrSREKhiEqIWWIQ1ogYYg59CunVBX7ZoCHtRD34oKhXt/yzL7Q5wr4/JNP7YQydir11AaLhGsKDwaCdS9KcnMrWbg5CjYJpwKkEbmDOlSFl8hnbDFXaQCJb45hC15CvAiFv/jmwmdMhQ5XWieA5ENGSHK1fXKMp+Mo2KDtfpRK6mSev0H6mejPKpkAjiA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0017.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3d8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 11:31:37 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 11:31:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 13:27:59 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [4owAndzbUGFZ4gi02SCURK8M13iOoY8eMaNV0eL6BLs=] X-ClientProxiedBy: ZR2P278CA0078.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230904112759.2652347-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0017:EE_ X-MS-Office365-Filtering-Correlation-Id: a055b706-3645-41ca-8407-08dbad3a7f66 X-MS-Exchange-SLBlob-MailProps: 70qbaZjg4msS5Ik6K0Q5QnvM6p6iC6nwl3jSY60pqamhUQKWrqnw7GTXpAUZiyZYOfGCZsJUxcbnsKnREO6dmDRVBSbmFdRnhYG1wkk3QhGwirZn5RpiIpn2qmYVQSZe+HQpmcTiZLekF8jH14tvv++suQRhNhwfbyoFsFGXbj/slLUvSnE2SGzY+bTRP4buWrBQDB3dc2Nx8SJKh0IWk4cMEDN4tdXhARHrx3Jazn9m70kqzU+d/Xp3i4fEBI1Ah0SUllGcnmLWu9d/S1Ie3VS80GyzjFU9VA1LHfJiy+QflLuaC3CC9gTdJRr1uYrJlMtDElA82UtSXIdsPtCxxHrl6UJ6auRQ9G3I79S5891ZKokaPjPTgiZ7/MzaOJiq+WqWjEYjuxxilq18xYhQiU4qebYWDQSr5zqnXMoQZAujj/1ztiX0tJD5lRbd9zfprEcTx7Zqb7WA65Z4deLLpu4w+z/JOEOLtyLv3MlPR5Kvpf72K0blv3aZ4VqKxy3ywL8RD6JJy0XudFgT7obj4AblULQ5aDy3PY+FTdzUezMrS75ZlLSMoSB04TvDvcnFHhOYYlNbZAp15TE1f7Eu0DwZyyUYrguztbf486/Q3Q1PGvEZtN3rK0H082JftgPhSoHoD9Vbt/JUCDVQ+T1f5cmhUZvcJjZA5C8D7G2VpyScwt5BsnoLyyPGfg9Sl0kSE4SlCy4ctTd4+BKwtfPZU6pUv3JMg2dQCYmc8meh9kjxKrpEC81Kxg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1yivynMTB4u2nHGxZl+m4kdMrCk61nGfiE/phn+13ouGyHiPGcr5vHHhGMcRUNQn32lWF+p0l/+EGUkyX23Pisf5Oh9mVtKUZTdt+CH2T6QQzShLlmcU+NJFisZRIe6oMdcSkUNFSVKSAyNjgtgy0aYjhmN8A795ycy1kHJfsY5n0MLCVUkTRDlkR8Qq5MKuDGIR25mXZuoCp1df3W9Bs5rMWGuqor9U1UEhQPYXe4Koy25OVeMw0sqwlZxh/73Nw9Sof5068pwNm4T3GQo3AFR7tyImAA4coigX42n6Lqhk7SDFd0ebpN6am5GxqF5Zg9tSW8D3Ao/NdhmtDtLS7okZ9UGIMt2GPoux2BPvMF+inZXvGj/6K6LVUBkhi2SMquvYOlQzyDZwnWqduWUpMObmLuz/pU6Jb+j6x76RSd65ORd+eTY2l4nXr0tmemJailFf/IIVAlCGuKSW+nUlQyPt6Hr94QpHWQRybR9fHRR5e0tZBkESSihUhGC0SoLBJGiWstc+7ax6bA9v01sYvG7XCqebNcJRK+5oEBImsRxsXLNES5Q9leY+ieATFCjdJpqEmMYnr6QlbJvLcIHN69f2VlCHR9zeRw2D178WjuojXw67xUglyt8K9UqHaHAr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OaYXywrg92PMDi5wk88eE9GAyZ2IxaUHrevHObi2cNAFwlARCdeSTEJwrLbXUdis8JfgJhvXsMeWgi0FDrdNoJZziqap2nwTAoOBgzQSP5SNTL3r1ogvnQ7WEPvPGLxYIYA6Tc7QdxUFsXrR0myVxNdChgFJ640E3mFORALrI/zvlaNO29nbm2CrIjRxwygkCtVAhTs6xsPz9LzuP/9aGCUKuFXxCl3Sf5Hq1bLlwRcXV2ON34jaE6949cU1ktDQliFw7/uO3azHd9Nbh4gXVuIwPAPjtQ8JofM/KLmIiDvQihtqgXRdLiKe2UQdiefRIDt0rtZuL8GBogLN5GR9bWhara9IPpLHMwQ/SOwS/zBb3AlEluG4WRNUK/BbDt2uap2JVJWJvhS6Z37DXiFl0xgy0khWIOk/HwNN8pZ+33M++ZT95DXMVhP73bmjw2sR5LIcUQl9tCTkXiUrEIe7E7/KeLylTWcfeMgZuLFUEJ0Ed8ILfFGqJrvN+f73CU5gy0EQlkOor3DhrSwdz3VaE83mOiW80HjjCr0QX7Lc0Whd5nB8ti+EkiCWJHkmabB7qDb/vypLuViUdM4EL8dobM+25+DTvKrBRo7ms7iMdFriSlqSOs2uJ32/G8EHGLthGcLl65I1bOqpvpcVBb65Wt5gXnJZ2icKMiTx4yMX0imHGCOsdV5e2cSjVMzNSl3V8IjRPsHE92ZhKFK7mMrCDzacqN/eZ6n05PVMbXO4THSlZIsXiIpMAJJOPHpnc3XXdu8a2bABzLdIwDmGXSgeywfvPKwiDmAjVGA44SgJMbLEPXdERvg+eJafIbSZCPP+p99DncrYszdnRbY0zftNgr64jwQuBN6Cm1mDEHQsnu3PKc3aqBypJKNszAq1zOBAaj+xdxhzqx8QDfpQIg0Nz5ideiGHwVMMzZo0wRqW84idK+A3AzSoEwhD375otC9BmBw3Ajv6/gLumpUCbX61sgTNCjXRZiFqVJT+WnI9i7/HUI3DOxsZS161G8KYOuBkb9bgJ3bpZ4Gqydt8M4Ccbko5hJ26QctVUG2TKHrfRLephC+bOoWb/KidmkOTmngcmZ9U6ImLqqYWj2Ht5VtTO/SnO84tT6u6DByo+qLqqkYORLZ8inxuQ4d2KBydsjfP17DCVCI5HG15lY5hqbu9tLf/6CaqNutAZhp96jzC4fg6hUDMXE3vL2rU0hiMBPjPMNamHhX+qL3J4PYgqIIu4WwEeN5BmNyVZ5mCwQPjPx5dAUk6SLJOh9pb9IFsh90/ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a055b706-3645-41ca-8407-08dbad3a7f66 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 11:31:36.2819 (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: AM8P250MB0017 Subject: [FFmpeg-devel] [PATCH 20/20] avformat/matroskadec: Factor parsing content encodings out 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +QvNZbC7EuQW Namely, out of matroska_parse_tracks(). Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 146 +++++++++++++++++++++----------------- 1 file changed, 79 insertions(+), 67 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 51c47e9404..0d6f153d18 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2029,6 +2029,80 @@ static void matroska_parse_cues(MatroskaDemuxContext *matroska) { matroska_add_index_entries(matroska); } +static int matroska_parse_content_encodings(MatroskaTrackEncoding *encodings, + unsigned nb_encodings, + MatroskaTrack *track, + char **key_id_base64, void *logctx) +{ + if (nb_encodings > 1) { + av_log(logctx, AV_LOG_ERROR, + "Multiple combined encodings not supported"); + return 0; + } + if (!nb_encodings) + return 0; + if (encodings->type) { + if (encodings->encryption.key_id.size > 0) { + /* Save the encryption key id to be stored later + * as a metadata tag. */ + const int b64_size = AV_BASE64_SIZE(encodings->encryption.key_id.size); + *key_id_base64 = av_malloc(b64_size); + if (!*key_id_base64) + return AVERROR(ENOMEM); + + av_base64_encode(*key_id_base64, b64_size, + encodings->encryption.key_id.data, + encodings->encryption.key_id.size); + } else { + encodings->scope = 0; + av_log(logctx, AV_LOG_ERROR, "Unsupported encoding type"); + } + } else if ( +#if CONFIG_ZLIB + encodings->compression.algo != MATROSKA_TRACK_ENCODING_COMP_ZLIB && +#endif +#if CONFIG_BZLIB + encodings->compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB && +#endif + encodings->compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO && + encodings->compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) { + encodings->scope = 0; + av_log(logctx, AV_LOG_ERROR, "Unsupported encoding type"); + } else if (track->codec_priv.size && encodings[0].scope & 2) { + uint8_t *codec_priv = track->codec_priv.data; + int ret = matroska_decode_buffer(&track->codec_priv.data, + &track->codec_priv.size, + track); + if (ret < 0) { + track->codec_priv.data = NULL; + track->codec_priv.size = 0; + av_log(logctx, AV_LOG_ERROR, + "Failed to decode codec private data\n"); + } + + if (codec_priv != track->codec_priv.data) { + av_buffer_unref(&track->codec_priv.buf); + if (track->codec_priv.data) { + track->codec_priv.buf = av_buffer_create(track->codec_priv.data, + track->codec_priv.size + AV_INPUT_BUFFER_PADDING_SIZE, + NULL, NULL, 0); + if (!track->codec_priv.buf) { + av_freep(&track->codec_priv.data); + track->codec_priv.size = 0; + return AVERROR(ENOMEM); + } + } + } + } + track->needs_decoding = !encodings->type && + encodings->scope & 1 && + (encodings->compression.algo != + MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP || + encodings->compression.settings.size); + + return 0; +} + static int matroska_aac_profile(char *codec_id) { static const char *const aac_profiles[] = { "MAIN", "LC", "SSR" }; @@ -3008,8 +3082,6 @@ static int matroska_parse_tracks(AVFormatContext *s) for (i = 0; i < matroska->tracks.nb_elem; i++) { MatroskaTrack *track = &tracks[i]; enum AVCodecID codec_id = AV_CODEC_ID_NONE; - EbmlList *encodings_list = &track->encodings; - MatroskaTrackEncoding *encodings = encodings_list->elem; AVCodecParameters *par; MatroskaTrackType type; int extradata_offset = 0; @@ -3065,71 +3137,11 @@ static int matroska_parse_tracks(AVFormatContext *s) if (!track->audio.out_samplerate) track->audio.out_samplerate = track->audio.samplerate; } - if (encodings_list->nb_elem > 1) { - av_log(matroska->ctx, AV_LOG_ERROR, - "Multiple combined encodings not supported"); - } else if (encodings_list->nb_elem == 1) { - if (encodings[0].type) { - if (encodings[0].encryption.key_id.size > 0) { - /* Save the encryption key id to be stored later as a - metadata tag. */ - const int b64_size = AV_BASE64_SIZE(encodings[0].encryption.key_id.size); - key_id_base64 = av_malloc(b64_size); - if (key_id_base64 == NULL) - return AVERROR(ENOMEM); - - av_base64_encode(key_id_base64, b64_size, - encodings[0].encryption.key_id.data, - encodings[0].encryption.key_id.size); - } else { - encodings[0].scope = 0; - av_log(matroska->ctx, AV_LOG_ERROR, - "Unsupported encoding type"); - } - } else if ( -#if CONFIG_ZLIB - encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_ZLIB && -#endif -#if CONFIG_BZLIB - encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB && -#endif - encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO && - encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) { - encodings[0].scope = 0; - av_log(matroska->ctx, AV_LOG_ERROR, - "Unsupported encoding type"); - } else if (track->codec_priv.size && encodings[0].scope & 2) { - uint8_t *codec_priv = track->codec_priv.data; - int ret = matroska_decode_buffer(&track->codec_priv.data, - &track->codec_priv.size, - track); - if (ret < 0) { - track->codec_priv.data = NULL; - track->codec_priv.size = 0; - av_log(matroska->ctx, AV_LOG_ERROR, - "Failed to decode codec private data\n"); - } - - if (codec_priv != track->codec_priv.data) { - av_buffer_unref(&track->codec_priv.buf); - if (track->codec_priv.data) { - track->codec_priv.buf = av_buffer_create(track->codec_priv.data, - track->codec_priv.size + AV_INPUT_BUFFER_PADDING_SIZE, - NULL, NULL, 0); - if (!track->codec_priv.buf) { - av_freep(&track->codec_priv.data); - track->codec_priv.size = 0; - return AVERROR(ENOMEM); - } - } - } - } - } - track->needs_decoding = encodings && !encodings[0].type && - encodings[0].scope & 1 && - (encodings[0].compression.algo != - MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP || - encodings[0].compression.settings.size); + ret = matroska_parse_content_encodings(track->encodings.elem, + track->encodings.nb_elem, + track, &key_id_base64, matroska->ctx); + if (ret < 0) + return ret; for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { if (av_strstart(track->codec_id, ff_mkv_codec_tags[j].str, NULL)) {