generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set duration for wav files from sample size and data size or the wf64 sample value.

Browse Source 
This should improve duration accuracy slightly and avoids a warning about its
inaccuracy when accurate values are available. Idea by Frank Barchard

Originally committed as revision 26366 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2011-01-15 16:26:42 +00:00
parent 13184036a6
commit 462b26202b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/wav.c
View File

@ -183,6 +183,7 @@ static int wav_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
int64_t size, av_uninit(data_size);
int64_t sample_count=0;
int rf64;
unsigned int tag;
ByteIOContext *pb = s->pb;
@ -208,6 +209,7 @@ static int wav_read_header(AVFormatContext *s,
return -1;
get_le64(pb); /* RIFF size */
data_size = get_le64(pb);
sample_count = get_le64(pb);
url_fskip(pb, size - 16); /* skip rest of ds64 chunk */
}
@ -233,6 +235,11 @@ static int wav_read_header(AVFormatContext *s,
wav->data_end = INT64_MAX;
} else
wav->data_end= url_ftell(pb) + size;
if (!sample_count && st->codec->channels && av_get_bits_per_sample(st->codec->codec_id))
sample_count = (size<<3) / (st->codec->channels * (uint64_t)av_get_bits_per_sample(st->codec->codec_id));
if (sample_count)
st->duration = sample_count;
return 0;
}