virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/wavdec: add support for demuxing Broadcast Wave 64Bit

Browse Source
This commit is contained in:
Paul B Mahol
2020-08-28 00:34:06 +02:00
parent 901251d59b
commit 93aa0bec84
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/wavdec.c
View File

@@ -6,6 +6,8 @@
* RF64 demuxer * RF64 demuxer
* Copyright (c) 2009 Daniel Verkamp * Copyright (c) 2009 Daniel Verkamp
* *
* BW64 demuxer
*
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
* FFmpeg is free software; you can redistribute it and/or * FFmpeg is free software; you can redistribute it and/or
@@ -140,7 +142,8 @@ static int wav_probe(const AVProbeData *p)
* its own, the returned score is decreased to avoid a probe * its own, the returned score is decreased to avoid a probe
* conflict between ACT and WAV. */ * conflict between ACT and WAV. */
return AVPROBE_SCORE_MAX - 1; return AVPROBE_SCORE_MAX - 1;
else if (!memcmp(p->buf, "RF64", 4) && else if ((!memcmp(p->buf, "RF64", 4) ||
!memcmp(p->buf, "BW64", 4)) &&
!memcmp(p->buf + 12, "ds64", 4)) !memcmp(p->buf + 12, "ds64", 4))
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
@@ -330,7 +333,7 @@ static int wav_read_header(AVFormatContext *s)
{ {
int64_t size, av_uninit(data_size); int64_t size, av_uninit(data_size);
int64_t sample_count = 0; int64_t sample_count = 0;
int rf64 = 0; int rf64 = 0, bw64 = 0;
uint32_t tag; uint32_t tag;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st = NULL; AVStream *st = NULL;
@@ -353,6 +356,9 @@ static int wav_read_header(AVFormatContext *s)
case MKTAG('R', 'F', '6', '4'): case MKTAG('R', 'F', '6', '4'):
rf64 = 1; rf64 = 1;
break; break;
case MKTAG('B', 'W', '6', '4'):
bw64 = 1;
break;
default: default:
av_log(s, AV_LOG_ERROR, "invalid start code %s in RIFF header\n", av_log(s, AV_LOG_ERROR, "invalid start code %s in RIFF header\n",
av_fourcc2str(tag)); av_fourcc2str(tag));
@@ -368,7 +374,7 @@ static int wav_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (rf64) { if (rf64 || bw64) {
if (avio_rl32(pb) != MKTAG('d', 's', '6', '4')) if (avio_rl32(pb) != MKTAG('d', 's', '6', '4'))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
size = avio_rl32(pb); size = avio_rl32(pb);
@@ -423,7 +429,7 @@ static int wav_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (rf64) { if (rf64 || bw64) {
next_tag_ofs = wav->data_end = avio_tell(pb) + data_size; next_tag_ofs = wav->data_end = avio_tell(pb) + data_size;
} else if (size != 0xFFFFFFFF) { } else if (size != 0xFFFFFFFF) {
data_size = size; data_size = size;
@@ -440,7 +446,7 @@ static int wav_read_header(AVFormatContext *s)
/* don't look for footer metadata if we can't seek or if we don't /* don't look for footer metadata if we can't seek or if we don't
* know where the data tag ends * know where the data tag ends
*/ */
if (!(pb->seekable & AVIO_SEEKABLE_NORMAL) || (!rf64 && !size)) if (!(pb->seekable & AVIO_SEEKABLE_NORMAL) || (!(rf64 && !bw64) && !size))
goto break_loop; goto break_loop;
break; break;
case MKTAG('f', 'a', 'c', 't'): case MKTAG('f', 'a', 'c', 't'):