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

Support "VLB " audio in NSV files.

Browse Source 
See samples/nsv/vlb_audio.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2011-12-11 17:37:40 +01:00
parent 16b771b1f4
commit 36be045ed7
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/aac.h
View File

@ -300,6 +300,7 @@ typedef struct {
DECLARE_ALIGNED(32, float, temp)[128]; DECLARE_ALIGNED(32, float, temp)[128];
enum OCStatus output_configured; enum OCStatus output_configured;
int warned_num_aac_frames;
} AACContext; } AACContext;
#endif /* AVCODEC_AAC_H */ #endif /* AVCODEC_AAC_H */

11
libavcodec/aacdec.c
View File

@ -2125,13 +2125,14 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
} }
if (!ac->avctx->sample_rate) if (!ac->avctx->sample_rate)
ac->avctx->sample_rate = hdr_info.sample_rate; ac->avctx->sample_rate = hdr_info.sample_rate;
if (hdr_info.num_aac_frames == 1) { if (!ac->warned_num_aac_frames && hdr_info.num_aac_frames != 1) {
if (!hdr_info.crc_absent) // This is 2 for "VLB " audio in NSV files.
skip_bits(gb, 16); // See samples/nsv/vlb_audio.
} else {
av_log_missing_feature(ac->avctx, "More than one AAC RDB per ADTS frame is", 0); av_log_missing_feature(ac->avctx, "More than one AAC RDB per ADTS frame is", 0);
return -1; ac->warned_num_aac_frames = 1;
} }
if (!hdr_info.crc_absent)
skip_bits(gb, 16);
} }
return size; return size;
} }

1
libavformat/nsvdec.c
View File

@ -206,6 +206,7 @@ static const AVCodecTag nsv_codec_audio_tags[] = {
{ CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, { CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') },
{ CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') }, { CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') },
{ CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') }, { CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') },
{ CODEC_ID_AAC, MKTAG('V', 'L', 'B', ' ') },
{ CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', ' ') }, { CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', ' ') },
{ CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') }, { CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') },
{ CODEC_ID_NONE, 0 }, { CODEC_ID_NONE, 0 },