virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

vqf/twinvq: pass vqf COMM chunk info in extradata

Browse Source 
This is needed because the twinvq decoder cannot rely on bit_rate to be set.
The API documentation says that bit_rate is set by libavcodec, not by the
user.
This commit is contained in:
Justin Ruggles 2011-10-30 00:46:16 -04:00
parent ca482ce420
commit 7b966566da
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/twinvq.c
View File

@ -1104,17 +1104,31 @@ static av_cold int twin_decode_init(AVCodecContext *avctx)
{ {
int ret; int ret;
TwinContext *tctx = avctx->priv_data; TwinContext *tctx = avctx->priv_data;
int isampf = avctx->sample_rate/1000; int isampf, ibps;
int ibps = avctx->bit_rate/(1000 * avctx->channels);
tctx->avctx = avctx; tctx->avctx = avctx;
avctx->sample_fmt = AV_SAMPLE_FMT_FLT; avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
if (!avctx->extradata || avctx->extradata_size < 12) {
av_log(avctx, AV_LOG_ERROR, "Missing or incomplete extradata\n");
return AVERROR_INVALIDDATA;
}
avctx->channels = AV_RB32(avctx->extradata ) + 1;
avctx->bit_rate = AV_RB32(avctx->extradata + 4) * 1000;
isampf = AV_RB32(avctx->extradata + 8);
switch (isampf) {
case 44: avctx->sample_rate = 44100; break;
case 22: avctx->sample_rate = 22050; break;
case 11: avctx->sample_rate = 11025; break;
default: avctx->sample_rate = isampf * 1000; break;
}
if (avctx->channels > CHANNELS_MAX) { if (avctx->channels > CHANNELS_MAX) {
av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %i\n", av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %i\n",
avctx->channels); avctx->channels);
return -1; return -1;
} }
ibps = avctx->bit_rate / (1000 * avctx->channels);
switch ((isampf << 8) + ibps) { switch ((isampf << 8) + ibps) {
case (8 <<8) + 8: tctx->mtab = &mode_08_08; break; case (8 <<8) + 8: tctx->mtab = &mode_08_08; break;

14
libavformat/vqf.c
View File

@ -70,6 +70,7 @@ static int vqf_read_header(AVFormatContext *s, AVFormatParameters *ap)
int header_size; int header_size;
int read_bitrate = 0; int read_bitrate = 0;
int size; int size;
uint8_t comm_chunk[12];
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -100,9 +101,10 @@ static int vqf_read_header(AVFormatContext *s, AVFormatParameters *ap)
switch(chunk_tag){ switch(chunk_tag){
case MKTAG('C','O','M','M'): case MKTAG('C','O','M','M'):
st->codec->channels = avio_rb32(s->pb) + 1; avio_read(s->pb, comm_chunk, 12);
read_bitrate = avio_rb32(s->pb); st->codec->channels = AV_RB32(comm_chunk ) + 1;
rate_flag = avio_rb32(s->pb); read_bitrate = AV_RB32(comm_chunk + 4);
rate_flag = AV_RB32(comm_chunk + 8);
avio_skip(s->pb, len-12); avio_skip(s->pb, len-12);
st->codec->bit_rate = read_bitrate*1000; st->codec->bit_rate = read_bitrate*1000;
@ -192,6 +194,12 @@ static int vqf_read_header(AVFormatContext *s, AVFormatParameters *ap)
c->frame_bit_len = st->codec->bit_rate*size/st->codec->sample_rate; c->frame_bit_len = st->codec->bit_rate*size/st->codec->sample_rate;
av_set_pts_info(st, 64, 1, st->codec->sample_rate); av_set_pts_info(st, 64, 1, st->codec->sample_rate);
/* put first 12 bytes of COMM chunk in extradata */
if (!(st->codec->extradata = av_malloc(12 + FF_INPUT_BUFFER_PADDING_SIZE)))
return AVERROR(ENOMEM);
st->codec->extradata_size = 12;
memcpy(st->codec->extradata, comm_chunk, 12);
return 0; return 0;
} }