From patchwork Sun Jan 16 23:03:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33624 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2273312iog; Sun, 16 Jan 2022 15:06:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJzzJ0ke1Cu/UVVzPFHoNCUidrtgA+1zNftUg//cVrFf5YBgzopc/rsLh23V8IEK1UslclvA X-Received: by 2002:a05:6402:1d4a:: with SMTP id dz10mr3074117edb.206.1642374363628; Sun, 16 Jan 2022 15:06:03 -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 y16si6491648edu.291.2022.01.16.15.06.03; Sun, 16 Jan 2022 15:06:03 -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=LSSu6IbK; 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 3ED2468AF5C; Mon, 17 Jan 2022 01:05:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073103.outbound.protection.outlook.com [40.92.73.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D35568AF11 for ; Mon, 17 Jan 2022 01:05:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EFx/TBtIjS6Imxy2VYTLm7jn/77o95qD7dKMw57AWxO4d8/iru4RJJzKnwkDJvU7P4xqUChmC9V4747SpkVDNu9KK5gvT/vijMYrWRGh/i69g9NoNyCXdPtkb546sTG34e18HCEAH48MniklCFUA2yCSpwvHEf/Qu2mrgQmyFTjvi5kHgu29Q0MwcDi+gW0PZkmyi5GnHmt8bxFKFj/E+dEgPKsoJX9Pzl1oH3x3nzeFDii+eI5A9kw79QIsQ14XBpqf7E8FoqnzxzI1NN5VcLOXzp23g63Fz7sekPtAbkLQIc/CHWLLnrEzr2O9z5HyeT0KmnkF8TmbaZ+RIwQ9sg== 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=tjGZtttuxeLiTsXcy19VOV4PwWmbpd4kO/SpRYLt+fQ=; b=JuWdPQ+0KLfos9uPQitsAjzSgFiTIrMwlIVnAwMi5EKSLyrZ+yPQ9mdz7UdFT+1HPN7I/kglUgWP2Tv7J4jm5WV+LkLAIlVjwwZ3RyGl/UgOdLWaJNwDbb7uu1OjQ+pwAf8FiQLNTTE1w6JBAuGVk8tO0ozdUITrbxXgNUOUA1kP7E6ICk0zONPKotyMm7gu11mv5bqN+rNeOAizAhGuWs7NpV9ZLV5fGpXVNgVbj+vSFqQVxQazQzP/MEwfikXPEu7H/yzDpaZnQZZ3nevSDBTDpO+d8BF4rJNxpl58qqqvaQahwqCQEeFBSvoEwv3RqDZ4WxAfFBIzEhe6re2JeQ== 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=tjGZtttuxeLiTsXcy19VOV4PwWmbpd4kO/SpRYLt+fQ=; b=LSSu6IbKkScBqVFGPYMLL31rTnBNEZ12fGroAFyufJNIGc9zixmlEu8awerD7j0+tkE19zKlPCa5AMPLrYVC2DKpGbym8s8VGfwty+ewsMYdJNBMH1QrHlkWR4kl58sh158nA5VK+7AenWQG3ozgapzA/XXoNPrr4VpFtbwhzP7M8IorAyPF8jNGWZwLWC2Xt6hJiRGEYUpQXs0bpv2LzCLsyC9edwlJpJYcL4JTmQ3Uc/G+V8IABoX+qom6KCDLf4NbwNpFFN4ACu/eA9WkEFNPx/ck37hdlCGDLhd6HCuskYQo8Su7vxh9Qk+1oxtOfpaKJbBA8k/+fXB/L+qs9Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7704.eurprd03.prod.outlook.com (2603:10a6:20b:403::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Sun, 16 Jan 2022 23:05:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 23:05:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jan 2022 00:03:52 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [x4QrV6tB5n0m4f2MeH8wSzLhAwQO/pHj] X-ClientProxiedBy: AM0PR10CA0070.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:15::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220116230405.194506-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0545d9fb-f6b8-4dc4-b3da-08d9d944a1f7 X-MS-Exchange-SLBlob-MailProps: sTyj/kSftou7kRWZu+p1Yy70c3quhp4i1T6Zy3lB4vqoCOR2GrCcsvN9PRvPGzeO6eYs+PmiUbDjwEg5fcfue4nkfiMK52jW+nJLfu6A6ZBDJW1Jd3KvPDvA6dWN3OtkUfmC8ux+L/NcwsoUZNhVStBaZW0au3KiH20HhG3LLE+aMjVRWKtKyz2XfRdYRcK7zjEdvraVd2XKgqSWFV+Z0KokYzoTLtt+gdFsLDlKkAOa0uvzIMHYyxHXAc/ARKpXrdQK2LF3evttEmjZfm7kmZqs9UsH1FDNqDjHsVOPwOBoTX2PtQ4fKARy7UNwb8Hzo0z4JdiveLZf9gwpReoFxoQossoha45XG2viP1LUQmB1UA7St+sBIM4Vieq1slmhqgTmUKVpyZn4AtrN4QnTjudxopsIGlPDCid1gSsGfubvEKpfAOZYRqqCmY9m5/DodFlmCxtJtv3cIvGNaLhJ5sLDrIU2loctQwi3Fy7ky7vQD89NMRvz5Wb+ZFGm/DWsDCX5XjkNTKL89OCEyvZOf2b/LhaCHmlv/7IpWPHBjzOYXGHDUb3/LPyHPvsOWLp9gTJYivcMaHuRCrwozka4dG9s6SK5Wpy1Z88kCYqAzioA8ZKciP23kjlsigd3SdU3WVJZybj2uwJr8ZpR3T090+avkimwUScLOg5TDHHoE3Zap+PR+3JSLwNSvP3/cjX0e36Cmv2YwPY8K2fD5A7SLi25k6xJC0pz3JiO7zA5foM65uJmLMBiEvICnzzZd0vTEH9caRrVf3I8F9uSsG46i6XxHsMoWEub3TFoUI8Ur/1oJWEM+jxN4cyaoF6h78pOUGsa3HQ4fjQ6fF6RClcItg== X-MS-TrafficTypeDiagnostic: AS8PR03MB7704:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tT4o9iaL+TZz23bDOFXo9g1K+IyorsAg+4IJEgDWdndl8ntawLMCS8eL148YYnQDrf4navfdfwKUA0IqDiaREPwDrvGBCUAWUoyiO5uSNS3WhtYytrnoZxddojcDxcX1pv3uX1bgbFGsuj9gtyPyK2XhuRAf3A67TZ/zkixHnURYF2Yy3uuQHBxzXEDsD9004F2ktSVOOJlzwxky09ZZMnNMduRRpVsXwkaFtkOgl0eRrKuTs0/ySZgR0mFTgG5FLBcwOIq23ENVen5djJfV75mV64hZIQVRANqCLhBI8Cd6dw4lHyrS1nK9depvBk+4r/zAT+6fsIL0q2Vl1QckEzLiUgR0m488AlI6P3LDNVGpWGJfWPDw7zI1SoLAu8QjLdNIeSHUrYpza05Ndkna7hT4pu8Nx3cgS+pli2BveoiJsJvX/SDjHAikJ+msN0zDLnlFNEaT91FUSjn/c2ehKW+QZGexDYx0WBUlT5dUPjItSv8N431lr7mb6EwGJ27PniLoZ7UUXCxYu1XzPhl8Y9hyf8tQGmYc/Z+awVqyrx937z+oRspdiA2i5HHCjNhICnMq+vXBvpByX7l4S5FHYA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QhRAYLOHUMRkh1+WldgbHt7JvuyCBMK11t0YIFDf4Vhq4YEQcoJYhlfeb8YPJRml8EMpqMxBELj6YtTWvyAjKLrUtrRJGIbA3dqx8wqxPJ75zPWpKdkxybnB+JJDNOEeJwv/Id7H7ghiNhIDxdsLOvJYYe8hGpm6nClU0Whj+vyR6zInUebdu6JydFW/m1bEmz9GfZASbXmdAVygFxeZ+xe88OyxhXAaaVzTyNndUrfFPnLSvsg81RLCRzNO6c3DhuOJljmfS3Ggtsgp3aNdy9kqNakPXr6BM2chuL3hH8ciJEpIO/LWbAeF9YQWmX7DhoJ8/Wh/GcuGFpguADUozmix3DoTGmbcDrJIsjnIm79e6SL5AKFI57J14qs8juiKMHf1nwgWcxvOYiZMfUm0N8da+EQQlXnH+yRrqn2fc+m1865/fZDwNvXP2W740FO4XeHG1aO8cldkLV7I+12ljeUOYeI0JnI7CoFm6zCOUFVphj5BDpGPrCgmzO+z9WUpLaPyNYekjCi4QCm+bJhFR5wwZGHE3BcTBmSMBSndzclXBGVWFqbhAPQ95xMvYY4ahXgeXJUFg7rELzGeguCxWslVomrNqbZJirhnIgyIkqtyIGfMOk2e0ndgcKI4zwCZjl73YsbFzqAzxavdSVy3q4YDoruf1NzPBrEunPKnvIwWaS/CAoApeA338T7w4aIkvQkbfX7t3uSF5f5KgEl3GAUy/XREH/08RYhnwGk4NzkbTjmCKo4itxbNFERRrcs+4rWvxz0g8mwEgNwvOxTzdn5WyZhySAPa4RzHm9ZqAsNJssEqjpqRwqzfLTgmcuqtoEk2Pfq4NkJTwx2+XobUyOFTKjcvMB609NAB3bbX4aNmnIlY9PsmwvxUVFzNYH5V3yD5mo9UnAoeGGzDgs52P/4FSEhI9OHBQRrHeHZJllYTnZA0DA5jASRYedsoSq/e/Q2/pXyNZdpIPNTRpK4KwA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0545d9fb-f6b8-4dc4-b3da-08d9d944a1f7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 23:05:05.0192 (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: AS8PR03MB7704 Subject: [FFmpeg-devel] [PATCH 12/25] avformat/matroskaenc: Speed up reformatting WavPack 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: awVVzST3zsZ9 WavPack's blocks use a length field, so that parsing them is fast. Therefore it makes sense to parse the block twice, once to get the length of the output packet and once to write the actual data instead of writing the data into a temporary buffer in a single pass. This speeds up muxing from 1597092 to 761850 Decicycles per write_packet call for a 2000kb/s stereo WavPack file muxed to /dev/null with writing CRC-32 disabled. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 59 ++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5b5e921eee..08d2d338a6 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2347,57 +2347,45 @@ static int mkv_blockgroup_size(int pkt_size, int track_num_size) } #if CONFIG_MATROSKA_MUXER -static int mkv_strip_wavpack(const uint8_t *src, uint8_t **pdst, int *size) +static int mkv_reformat_wavpack(MatroskaMuxContext *mkv, AVIOContext *pb, + const AVPacket *pkt, int *size) { - uint8_t *dst; - int srclen = *size; + const uint8_t *src = pkt->data; + int srclen = pkt->size; int offset = 0; int ret; - dst = av_malloc(srclen); - if (!dst) - return AVERROR(ENOMEM); - while (srclen >= WV_HEADER_SIZE) { WvHeader header; ret = ff_wv_parse_header(&header, src); if (ret < 0) - goto fail; + return ret; src += WV_HEADER_SIZE; srclen -= WV_HEADER_SIZE; - if (srclen < header.blocksize) { - ret = AVERROR_INVALIDDATA; - goto fail; - } + if (srclen < header.blocksize) + return AVERROR_INVALIDDATA; - if (header.initial) { - AV_WL32(dst + offset, header.samples); - offset += 4; - } - AV_WL32(dst + offset, header.flags); - AV_WL32(dst + offset + 4, header.crc); - offset += 8; + offset += 4 * !!header.initial + 8 + 4 * !(header.initial && header.final); + if (pb) { + if (header.initial) + avio_wl32(pb, header.samples); + avio_wl32(pb, header.flags); + avio_wl32(pb, header.crc); - if (!(header.initial && header.final)) { - AV_WL32(dst + offset, header.blocksize); - offset += 4; - } + if (!(header.initial && header.final)) + avio_wl32(pb, header.blocksize); - memcpy(dst + offset, src, header.blocksize); + avio_write(pb, src, header.blocksize); + } src += header.blocksize; srclen -= header.blocksize; offset += header.blocksize; } - - *pdst = dst; *size = offset; return 0; -fail: - av_freep(&dst); - return ret; } #endif @@ -2436,8 +2424,6 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) { /* extradata is Annex B, assume the bitstream is too and convert it */ err = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL); - } else if (par->codec_id == AV_CODEC_ID_WAVPACK) { - err = mkv_strip_wavpack(pkt->data, &data, &size); } else #endif if (par->codec_id == AV_CODEC_ID_AV1) { @@ -2495,7 +2481,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, avio_wb16(pb, ts - mkv->cluster_pts); avio_w8(pb, (blockid == MATROSKA_ID_SIMPLEBLOCK && keyframe) ? (1 << 7) : 0); if (track->reformat) { - track->reformat(mkv, pb, pkt, NULL); + track->reformat(mkv, pb, pkt, &size); } else { avio_write(pb, data + offset, size); if (data != pkt->data) @@ -3111,8 +3097,17 @@ static int mkv_init(struct AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; + const AVCodecParameters *const par = st->codecpar; mkv_track *track = &mkv->tracks[i]; + switch (par->codec_id) { +#if CONFIG_MATROSKA_MUXER + case AV_CODEC_ID_WAVPACK: + track->reformat = mkv_reformat_wavpack; + break; +#endif + } + if (s->flags & AVFMT_FLAG_BITEXACT) { track->uid = i + 1; } else {