From patchwork Sun Dec 6 03:09:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24364 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id F0D5244B730 for ; Sun, 6 Dec 2020 05:11:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D243368A74E; Sun, 6 Dec 2020 05:11:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E500268A10A for ; Sun, 6 Dec 2020 05:11:26 +0200 (EET) Received: by mail-ej1-f68.google.com with SMTP id lt17so14493761ejb.3 for ; Sat, 05 Dec 2020 19:11:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EZz0CQEAuplnaG+MBkBBjoP98IqMgLRqEXW6iBSNrpg=; b=X+RxS4fIZNunqzvlt/l2RFDKLrPQeE+0INLdftf9QQFr/MsvJJeQB7SQAnNHkaSU+Y NRjrtpE0St+3OGh5AQW82tE7b+wgVuQJ6udLexmMfJljRueWumjQTh5J3shQgz6G9L5j wyYT7I7nHX/4ocEJUwb4+eQcQWCs4vRt2nFRl4jaG82oYJpRKn/b5pYFLm71HawGX19a uhi+Ghlc5oKmFsBTJDHiI02wEHHeZYX+n4QIK+Wjp0RnsykcIvA+eS/yRWcOIkQrPrGD MIN5fPPsnWx7YWXDfOnmS5Zns9pyPCpgxQ/+zj1IIUPLheTpSvyucfjk3x2KluheImTt 2N2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EZz0CQEAuplnaG+MBkBBjoP98IqMgLRqEXW6iBSNrpg=; b=e3PDhaeYIUr/t2J+iNaKku1icdLh5Ww3KwpbeQOiQ3KyeYCx5xB+Xcx37DDVpEwLiE ZMFykJ9wEqjjjzooRBDGJNgc3bztv/2NWzzOrZC1ykxzSxEWxz1iuwhuu19ot2suPT1s SYbe/z0xiqqofAfYGTFyFzWvSc2N9v4qt7wnicXkww32+700N9t6uNRqmDpZ4um6d8F5 DNT81qGduA9FqmpKS5e1QEhs8K2Jgr0p2nv6OEbn4q802dNrW49G3XAao0uRL7A8UD11 Fxhtn5C4UdRCl5UUQSRqjkdOkW5kRXZo54vqzBDKIUiOJyKtY2aDTeiXm1ZYJV2VfuAn Uapw== X-Gm-Message-State: AOAM531/RnO6gT7/KmjpMUNOTS0xnaaHAbDtbuf4eeA3qDl21mWKOYYF R48Kv9RW+Mf8UPGPOzQKPAZBfhjhBZ6s7w== X-Google-Smtp-Source: ABdhPJxd3Fd9JSXlnwN6PgaGhrcJGy10CJe1dsxs90164/eRsGOzBCg8BIrcIuXH9Ln9J2ujc6GETQ== X-Received: by 2002:a17:906:60c4:: with SMTP id f4mr13718151ejk.336.1607224286126; Sat, 05 Dec 2020 19:11:26 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id 3sm6804941ejn.7.2020.12.05.19.11.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Dec 2020 19:11:25 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Dec 2020 04:09:34 +0100 Message-Id: <20201206030934.395352-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201206030934.395352-1-andreas.rheinhardt@gmail.com> References: <20201206030934.395352-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/framecrcenc: Make side-data checksums endian-independent X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Do this by converting big-endian side data to little endian for checksumming. Fixes the ts-demux FATE test. Signed-off-by: Andreas Rheinhardt --- a) When commenting the #if HAVE_BIGENDIAN out, I get the same checksum for the test in [1] as Andriy got on a real BE system; I have not done more testing, lacking actual BE hardware. In particular, the claim about the ts-demux FATE test is untested. b) If side data doesn't have the expected size, then LE and BE might still produce different results (but then there must be a bigger problem elsewhere). c) This code here is designed to work even after the next major version bump when the size of some members of AVCPBProperties change. (Of course, some FATE checksums will need to be adapted then, but for both LE and BE in the same manner.) libavformat/framecrcenc.c | 61 +++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index f7c48779a0..390024dbe8 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -21,9 +21,11 @@ #include +#include "config.h" #include "libavutil/adler32.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" +#include "libavcodec/avcodec.h" #include "avformat.h" #include "internal.h" @@ -43,6 +45,19 @@ static int framecrc_write_header(struct AVFormatContext *s) return ff_framehash_write_header(s); } +#if HAVE_BIGENDIAN +static void inline bswap(char *buf, int offset, int size) +{ + if (size == 8) { + uint64_t val = AV_RN64(buf + offset); + AV_WN64(buf + offset, av_bswap64(val)); + } else if (size == 4) { + uint32_t val = AV_RN32(buf + offset); + AV_WN32(buf + offset, av_bswap32(val)); + } +} +#endif + static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) { uint32_t crc = av_adler32_update(0, pkt->data, pkt->size); @@ -58,17 +73,53 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) for (i=0; iside_data_elems; i++) { const AVPacketSideData *const sd = &pkt->side_data[i]; + const uint8_t *data = sd->data; uint32_t side_data_crc = 0; - if (HAVE_BIGENDIAN && AV_PKT_DATA_PALETTE == pkt->side_data[i].type) { + + switch (sd->type) { +#if HAVE_BIGENDIAN + uint8_t buf[FFMAX(sizeof(AVCPBProperties), + sizeof(AVProducerReferenceTime))]; + case AV_PKT_DATA_PALETTE: + case AV_PKT_DATA_REPLAYGAIN: + case AV_PKT_DATA_DISPLAYMATRIX: + case AV_PKT_DATA_STEREO3D: + case AV_PKT_DATA_AUDIO_SERVICE_TYPE: + case AV_PKT_DATA_FALLBACK_TRACK: + case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: + case AV_PKT_DATA_SPHERICAL: + case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: + case AV_PKT_DATA_S12M_TIMECODE: for (int j = 0; j < sd->size / 4; j++) { uint8_t buf[4]; AV_WL32(buf, AV_RB32(sd->data + 4 * j)); side_data_crc = av_adler32_update(side_data_crc, buf, 4); } - } else { - side_data_crc = av_adler32_update(0, - pkt->side_data[i].data, - pkt->side_data[i].size); + break; + case AV_PKT_DATA_CPB_PROPERTIES: +#define BSWAP(struct, field) bswap(buf, offsetof(struct, field), sizeof(((struct){0}).field)) + if (sd->size == sizeof(AVCPBProperties)) { + memcpy(buf, sd->data, sizeof(AVCPBProperties)); + data = buf; + BSWAP(AVCPBProperties, max_bitrate); + BSWAP(AVCPBProperties, min_bitrate); + BSWAP(AVCPBProperties, avg_bitrate); + BSWAP(AVCPBProperties, buffer_size); + BSWAP(AVCPBProperties, vbv_delay); + } + goto pod; + case AV_PKT_DATA_PRFT: + if (sd->size == sizeof(AVProducerReferenceTime)) { + memcpy(buf, sd->data, sizeof(AVProducerReferenceTime)); + data = buf; + BSWAP(AVProducerReferenceTime, wallclock); + BSWAP(AVProducerReferenceTime, flags); + } + goto pod; + pod: +#endif + default: + side_data_crc = av_adler32_update(0, data, sd->size); } av_strlcatf(buf, sizeof(buf), ", %8d, 0x%08"PRIx32, pkt->side_data[i].size, side_data_crc); }