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

tta: replace datalen with nb_samples 

This is less confusing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-06-07 09:49:04 +00:00
parent dc5c029f02
commit 5bafe0ce44
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/tta.c
View File

@ -57,7 +57,7 @@ static int tta_read_header(AVFormatContext *s)
AVStream *st; AVStream *st;
int i, channels, bps, samplerate; int i, channels, bps, samplerate;
uint64_t framepos, start_offset; uint64_t framepos, start_offset;
uint32_t datalen, crc; uint32_t nb_samples, crc;
if (s->pb->seekable) { if (s->pb->seekable) {
ff_ape_parse_tag(s); ff_ape_parse_tag(s);
@ -80,9 +80,9 @@ static int tta_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
datalen = avio_rl32(s->pb); nb_samples = avio_rl32(s->pb);
if (!datalen) { if (!nb_samples) {
av_log(s, AV_LOG_ERROR, "invalid datalen\n"); av_log(s, AV_LOG_ERROR, "invalid number of samples\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -93,10 +93,10 @@ static int tta_read_header(AVFormatContext *s)
} }
c->frame_size = samplerate * 256 / 245; c->frame_size = samplerate * 256 / 245;
c->last_frame_size = datalen % c->frame_size; c->last_frame_size = nb_samples % c->frame_size;
if (!c->last_frame_size) if (!c->last_frame_size)
c->last_frame_size = c->frame_size; c->last_frame_size = c->frame_size;
c->totalframes = datalen / c->frame_size + (c->last_frame_size < c->frame_size); c->totalframes = nb_samples / c->frame_size + (c->last_frame_size < c->frame_size);
c->currentframe = 0; c->currentframe = 0;
if(c->totalframes >= UINT_MAX/sizeof(uint32_t) || c->totalframes <= 0){ if(c->totalframes >= UINT_MAX/sizeof(uint32_t) || c->totalframes <= 0){
@ -110,7 +110,7 @@ static int tta_read_header(AVFormatContext *s)
avpriv_set_pts_info(st, 64, 1, samplerate); avpriv_set_pts_info(st, 64, 1, samplerate);
st->start_time = 0; st->start_time = 0;
st->duration = datalen; st->duration = nb_samples;
framepos = avio_tell(s->pb) + 4*c->totalframes + 4; framepos = avio_tell(s->pb) + 4*c->totalframes + 4;