mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-23 11:39:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

avformat/wavenc: skip writing incorrect peak-of-peaks position value

Browse Source 
According to EBU tech 3285 supplement 3 the dwPosPeakOfPeaks field
should contain the absolute position to the maximum audio sample value,
but the current implementation writes the relative peak frame index
instead.

Fix the issue by writing the "unknown" value (-1) for now until the
feature is implemented correctly.

Previous version reviewed-by: Peter Bubestinger <p.bubestinger@av-rd.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
This commit is contained in:
Tobias Rapp 2017-09-29 16:32:20 +02:00
parent ae100046ca
commit a07ac93023
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/version.h
View File

@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR 0
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \

11
libavformat/wavenc.c
View File

@ -74,8 +74,6 @@ typedef struct WAVMuxContext {
uint32_t peak_num_frames;
uint32_t peak_outbuf_size;
uint32_t peak_outbuf_bytes;
uint32_t peak_pos_pop;
uint16_t peak_pop;
uint8_t *peak_output;
int last_duration;
int write_bext;
@ -195,7 +193,6 @@ static void peak_write_frame(AVFormatContext *s)
{
WAVMuxContext *wav = s->priv_data;
AVCodecParameters *par = s->streams[0]->codecpar;
int peak_of_peaks;
int c;
if (!wav->peak_output)
@ -213,12 +210,6 @@ static void peak_write_frame(AVFormatContext *s)
wav->peak_maxpos[c] =
FFMAX(wav->peak_maxpos[c], wav->peak_maxneg[c]);
peak_of_peaks = FFMAX3(wav->peak_maxpos[c], wav->peak_maxneg[c],
wav->peak_pop);
if (peak_of_peaks > wav->peak_pop)
wav->peak_pos_pop = wav->peak_num_frames;
wav->peak_pop = peak_of_peaks;
if (wav->peak_outbuf_size - wav->peak_outbuf_bytes <
wav->peak_format * wav->peak_ppv) {
wav->peak_outbuf_size += PEAK_BUFFER_SIZE;
@ -287,7 +278,7 @@ static int peak_write_chunk(AVFormatContext *s)
avio_wl32(pb, wav->peak_block_size); /* frames per value */
avio_wl32(pb, par->channels); /* number of channels */
avio_wl32(pb, wav->peak_num_frames); /* number of peak frames */
avio_wl32(pb, wav->peak_pos_pop); /* audio sample frame index */
avio_wl32(pb, -1); /* audio sample frame position (not implemented) */
avio_wl32(pb, 128); /* equal to size of header */
avio_write(pb, timestamp, 28); /* ASCII time stamp */
ffio_fill(pb, 0, 60);

2
tests/ref/lavf/wav_peak
View File

@ -1,3 +1,3 @@
35148d1f6e66b0080893851d917ecbf4 *./tests/data/lavf/lavf.peak.wav
105805963fb767d00da056f42f32d9f3 *./tests/data/lavf/lavf.peak.wav
89094 ./tests/data/lavf/lavf.peak.wav
./tests/data/lavf/lavf.peak.wav CRC=0x3a1da17e

2
tests/ref/lavf/wav_peak_only
View File

@ -1,2 +1,2 @@
b609a363e6d490710ed52231a8d09d3c *./tests/data/lavf/lavf.peak_only.wav
f1a8aeeae8069f3992c4d780436c3d23 *./tests/data/lavf/lavf.peak_only.wav
832 ./tests/data/lavf/lavf.peak_only.wav