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

smacker: Separate audio flags from sample rates in smacker demuxer.

Browse Source 
Makes the code easier to understand.
This commit is contained in:
Justin Ruggles 2011-09-21 11:34:26 -04:00
parent be1242a3f2
commit a7984a6a6d
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavformat/smacker.c
View File

@ -31,11 +31,11 @@
#define SMACKER_FLAG_RING_FRAME 0x01 #define SMACKER_FLAG_RING_FRAME 0x01
enum SAudFlags { enum SAudFlags {
SMK_AUD_PACKED = 0x80000000, SMK_AUD_PACKED = 0x80,
SMK_AUD_16BITS = 0x20000000, SMK_AUD_16BITS = 0x20,
SMK_AUD_STEREO = 0x10000000, SMK_AUD_STEREO = 0x10,
SMK_AUD_BINKAUD = 0x08000000, SMK_AUD_BINKAUD = 0x08,
SMK_AUD_USEDCT = 0x04000000 SMK_AUD_USEDCT = 0x04
}; };
typedef struct SmackerContext { typedef struct SmackerContext {
@ -48,6 +48,7 @@ typedef struct SmackerContext {
uint32_t audio[7]; uint32_t audio[7];
uint32_t treesize; uint32_t treesize;
uint32_t mmap_size, mclr_size, full_size, type_size; uint32_t mmap_size, mclr_size, full_size, type_size;
uint8_t aflags[7];
uint32_t rates[7]; uint32_t rates[7];
uint32_t pad; uint32_t pad;
/* frame info */ /* frame info */
@ -129,8 +130,10 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap)
smk->mclr_size = avio_rl32(pb); smk->mclr_size = avio_rl32(pb);
smk->full_size = avio_rl32(pb); smk->full_size = avio_rl32(pb);
smk->type_size = avio_rl32(pb); smk->type_size = avio_rl32(pb);
for(i = 0; i < 7; i++) for(i = 0; i < 7; i++) {
smk->rates[i] = avio_rl32(pb); smk->rates[i] = avio_rl24(pb);
smk->aflags[i] = avio_r8(pb);
}
smk->pad = avio_rl32(pb); smk->pad = avio_rl32(pb);
/* setup data */ /* setup data */
if(smk->frames > 0xFFFFFF) { if(smk->frames > 0xFFFFFF) {
@ -173,23 +176,23 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* handle possible audio streams */ /* handle possible audio streams */
for(i = 0; i < 7; i++) { for(i = 0; i < 7; i++) {
smk->indexes[i] = -1; smk->indexes[i] = -1;
if(smk->rates[i] & 0xFFFFFF){ if (smk->rates[i]) {
ast[i] = av_new_stream(s, 0); ast[i] = av_new_stream(s, 0);
smk->indexes[i] = ast[i]->index; smk->indexes[i] = ast[i]->index;
ast[i]->codec->codec_type = AVMEDIA_TYPE_AUDIO; ast[i]->codec->codec_type = AVMEDIA_TYPE_AUDIO;
if (smk->rates[i] & SMK_AUD_BINKAUD) { if (smk->aflags[i] & SMK_AUD_BINKAUD) {
ast[i]->codec->codec_id = CODEC_ID_BINKAUDIO_RDFT; ast[i]->codec->codec_id = CODEC_ID_BINKAUDIO_RDFT;
} else if (smk->rates[i] & SMK_AUD_USEDCT) { } else if (smk->aflags[i] & SMK_AUD_USEDCT) {
ast[i]->codec->codec_id = CODEC_ID_BINKAUDIO_DCT; ast[i]->codec->codec_id = CODEC_ID_BINKAUDIO_DCT;
} else if (smk->rates[i] & SMK_AUD_PACKED){ } else if (smk->aflags[i] & SMK_AUD_PACKED){
ast[i]->codec->codec_id = CODEC_ID_SMACKAUDIO; ast[i]->codec->codec_id = CODEC_ID_SMACKAUDIO;
ast[i]->codec->codec_tag = MKTAG('S', 'M', 'K', 'A'); ast[i]->codec->codec_tag = MKTAG('S', 'M', 'K', 'A');
} else { } else {
ast[i]->codec->codec_id = CODEC_ID_PCM_U8; ast[i]->codec->codec_id = CODEC_ID_PCM_U8;
} }
ast[i]->codec->channels = (smk->rates[i] & SMK_AUD_STEREO) ? 2 : 1; ast[i]->codec->channels = (smk->aflags[i] & SMK_AUD_STEREO) ? 2 : 1;
ast[i]->codec->sample_rate = smk->rates[i] & 0xFFFFFF; ast[i]->codec->sample_rate = smk->rates[i];
ast[i]->codec->bits_per_coded_sample = (smk->rates[i] & SMK_AUD_16BITS) ? 16 : 8; ast[i]->codec->bits_per_coded_sample = (smk->aflags[i] & SMK_AUD_16BITS) ? 16 : 8;
if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == CODEC_ID_PCM_U8) if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == CODEC_ID_PCM_U8)
ast[i]->codec->codec_id = CODEC_ID_PCM_S16LE; ast[i]->codec->codec_id = CODEC_ID_PCM_S16LE;
av_set_pts_info(ast[i], 64, 1, ast[i]->codec->sample_rate av_set_pts_info(ast[i], 64, 1, ast[i]->codec->sample_rate