Originally committed as revision 19362 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -218,35 +218,10 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst · 217 unmodified lines | |||
| 218 | vcodec = vstream ? vstream->codec : NULL; | 218 | vcodec = vstream ? vstream->codec : NULL; |
| 219 | 219 | ||
| 220 | if(amf_type == AMF_DATA_TYPE_BOOL) { | 220 | if(amf_type == AMF_DATA_TYPE_BOOL) { |
| 221 | if(!strcmp(key, "stereo") && acodec) acodec->channels = num_val > 0 ? 2 : 1; | ||
| 222 | } else if(amf_type == AMF_DATA_TYPE_NUMBER) { | 221 | } else if(amf_type == AMF_DATA_TYPE_NUMBER) { |
| 223 | if(!strcmp(key, "duration")) s->duration = num_val * AV_TIME_BASE; | 222 | if(!strcmp(key, "duration")) s->duration = num_val * AV_TIME_BASE; |
| 224 | // else if(!strcmp(key, "width") && vcodec && num_val > 0) vcodec->width = num_val; | ||
| 225 | // else if(!strcmp(key, "height") && vcodec && num_val > 0) vcodec->height = num_val; | ||
| 226 | else if(!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0)) | 223 | else if(!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0)) |
| 227 | vcodec->bit_rate = num_val * 1024.0; | 224 | vcodec->bit_rate = num_val * 1024.0; |
| 228 | else if(!strcmp(key, "audiocodecid") && acodec && 0 <= (int)num_val) | ||
| 229 | flv_set_audio_codec(s, astream, (int)num_val << FLV_AUDIO_CODECID_OFFSET); | ||
| 230 | else if(!strcmp(key, "videocodecid") && vcodec && 0 <= (int)num_val) | ||
| 231 | flv_set_video_codec(s, vstream, (int)num_val); | ||
| 232 | else if(!strcmp(key, "audiosamplesize") && acodec && 0 < (int)num_val) { | ||
| 233 | acodec->bits_per_coded_sample = num_val; | ||
| 234 | //we may have to rewrite a previously read codecid because FLV only marks PCM endianness. | ||
| 235 | if(num_val == 8 && (acodec->codec_id == CODEC_ID_PCM_S16BE || acodec->codec_id == CODEC_ID_PCM_S16LE)) | ||
| 236 | acodec->codec_id = CODEC_ID_PCM_S8; | ||
| 237 | } | ||
| 238 | else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) { | ||
| 239 | //some tools, like FLVTool2, write consistently approximate metadata sample rates | ||
| 240 | if (!acodec->sample_rate) { | ||
| 241 | switch((int)num_val) { | ||
| 242 | case 44000: acodec->sample_rate = 44100 ; break; | ||
| 243 | case 22000: acodec->sample_rate = 22050 ; break; | ||
| 244 | case 11000: acodec->sample_rate = 11025 ; break; | ||
| 245 | case 5000 : acodec->sample_rate = 5512 ; break; | ||
| 246 | default : acodec->sample_rate = num_val; | ||
| 247 | } | ||
| 248 | } | ||
| 249 | } | ||
| 250 | } | 225 | } |
| 251 | } | 226 | } |
| 252 | 227 | ||