lavf/framecrcenc: do not hash side data

There are no guarantees that all side data types have the same
representation on all platforms.

Tests that change output due to this:

id3v2-priv-remux, cover-art-mp3-id3v2-remux, gapless-mp3: SKIP_SAMPLES,
which is tested by fate-gapless-mp3-side-data

matroska-vp8-alpha-remux: MATROSKA_BLOCKADDITIONAL, which is tested by
remux itself (side data is written into output)

matroska-mastering-display-metadata: MASTERING_DISPLAY_METADATA and
CONTENT_LIGHT_LEVEL, which are tested by ffprobe invocation in the same
test

matroska-spherical-mono-remux: STEREO3D and SPHERICAL, which are tested
by ffprobe invocation in the same test

segment-mp4-to-ts: MPEGTS_STREAM_ID, which is tested by ts remuxing
tests

webm-webvtt-remux: WEBVTT_IDENTIFIER/SETTINGS, which is tested by the
ffprobe invocation in the same test

mxf-d10-user-comments: CPB_PROPERTIES, which is tested by mxf-probe-d10

mov-cover-image: SKIP_SAMPLES, which is tested for mov by
mov-aac-2048-priming

copy-trac3074: AUDIO_SERVICE_TYPE, which is tested by fate-hls-fmp4_ac3

1 files changed, 0 insertions, 73 deletions

diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c
index eb58d251d2..68ca9d8a9e 100644
--- a/libavformat/framecrcenc.c
+++ b/libavformat/framecrcenc.c
@@ -21,10 +21,7 @@
 
 #include <inttypes.h>
 
-#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"
@@ -45,17 +42,6 @@ static int framecrc_write_header(struct AVFormatContext *s)
     return ff_framehash_write_header(s);
 }
 
-static av_unused 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));
-    }
-}
-
 static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 {
     uint32_t crc = av_adler32_update(0, pkt->data, pkt->size);
@@ -65,65 +51,6 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
              pkt->stream_index, pkt->dts, pkt->pts, pkt->duration, pkt->size, crc);
     if (pkt->flags != AV_PKT_FLAG_KEY)
         av_strlcatf(buf, sizeof(buf), ", F=0x%0X", pkt->flags);
-    if (pkt->side_data_elems) {
-        int i;
-        av_strlcatf(buf, sizeof(buf), ", S=%d", pkt->side_data_elems);
-
-        for (i=0; i<pkt->side_data_elems; i++) {
-            const AVPacketSideData *const sd = &pkt->side_data[i];
-            const uint8_t *data = sd->data;
-            uint32_t side_data_crc = 0;
-
-            switch (sd->type) {
-#if HAVE_BIGENDIAN
-                uint8_t bswap_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 (size_t 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);
-                }
-                break;
-            case AV_PKT_DATA_CPB_PROPERTIES:
-#define BSWAP(struct, field) bswap(bswap_buf, offsetof(struct, field), sizeof(((struct){0}).field))
-                if (sd->size == sizeof(AVCPBProperties)) {
-                    memcpy(bswap_buf, sd->data, sizeof(AVCPBProperties));
-                    data = bswap_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(bswap_buf, sd->data, sizeof(AVProducerReferenceTime));
-                    data = bswap_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), ", %8"SIZE_SPECIFIER", 0x%08"PRIx32,
-                        pkt->side_data[i].size, side_data_crc);
-        }
-    }
     av_strlcatf(buf, sizeof(buf), "\n");
     avio_write(s->pb, buf, strlen(buf));
     return 0;