RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/framecrcenc: Make side-data checksums endian-independent 

Do this by converting big-endian side data to little endian for
checksumming.

Reviewed-by: Andriy Gelman <andriy.gelman@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-12-06 03:48:22 +01:00
parent b8fe417c19
commit 0dac317ba3
1 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libavformat/framecrcenc.c
View File

@ -21,9 +21,11 @@
#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"
@ -43,6 +45,17 @@ 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);
@ -58,17 +71,53 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
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;
if (HAVE_BIGENDIAN && AV_PKT_DATA_PALETTE == pkt->side_data[i].type) {
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 (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(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), ", %8d, 0x%08"PRIx32, pkt->side_data[i].size, side_data_crc);
}