Mercurial > libavformat.hg

comparison flvdec.c @ 4009:f492dad79579 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser 8khz
author bcoudurier
date Fri, 24 Oct 2008 23:06:03 +0000
parents cf359952a1fc
children ca3996178741
comparison
equal deleted inserted replaced
4008:8af7a177b17d 4009:f492dad79579
386 } 386 }
387 387
388 if(is_audio){ 388 if(is_audio){
389 if(!st->codec->sample_rate || !st->codec->bits_per_coded_sample || (!st->codec->codec_id && !st->codec->codec_tag)) { 389 if(!st->codec->sample_rate || !st->codec->bits_per_coded_sample || (!st->codec->codec_id && !st->codec->codec_tag)) {
390 st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1; 390 st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1;
391 if((flags & FLV_AUDIO_CODECID_MASK) == FLV_CODECID_NELLYMOSER_8KHZ_MONO) 391 st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3);
392 st->codec->sample_rate= 8000;
393 else
394 st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3);
395 st->codec->bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8; 392 st->codec->bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8;
396 flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK); 393 flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK);
397 } 394 }
398 }else{ 395 }else{
399 size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK); 396 size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK);