highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/dvaudiodec: support cases when codec_tag is not set but block_align is

Browse Source 
Support packets larger than block size, return single block size.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2016-01-27 13:58:25 +01:00
parent 74e8f4f674
commit 75a7565bcb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/dvaudiodec.c
View File

@@ -41,14 +41,16 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (avctx->codec_tag == 0x0215) { if (avctx->codec_tag == 0x0215) {
s->block_size = 7200; s->block_size = 7200;
s->is_pal = 0;
} else if (avctx->codec_tag == 0x0216) { } else if (avctx->codec_tag == 0x0216) {
s->block_size = 8640; s->block_size = 8640;
s->is_pal = 1; } else if (avctx->block_align == 7200 ||
avctx->block_align == 8640) {
s->block_size = avctx->block_align;
} else { } else {
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
s->is_pal = s->block_size == 8640;
s->is_12bit = avctx->bits_per_raw_sample == 12; s->is_12bit = avctx->bits_per_raw_sample == 12;
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_S16;
avctx->channel_layout = AV_CH_LAYOUT_STEREO; avctx->channel_layout = AV_CH_LAYOUT_STEREO;
@@ -108,7 +110,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int16_t *dst; int16_t *dst;
int ret, i; int ret, i;
if (pkt->size != s->block_size) if (pkt->size < s->block_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
frame->nb_samples = dv_get_audio_sample_count(pkt->data + 244, s->is_pal); frame->nb_samples = dv_get_audio_sample_count(pkt->data + 244, s->is_pal);
@@ -130,7 +132,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
*got_frame_ptr = 1; *got_frame_ptr = 1;
return pkt->size; return s->block_size;
} }
AVCodec ff_dvaudio_decoder = { AVCodec ff_dvaudio_decoder = {