oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/ffmpeg: check AVCodecContext.sample_fmt value

Browse Source 
.. instead of av_get_bits_per_sample_format().  The SampleFormat enum
value is authoritative.
This commit is contained in:
Max Kellermann 2010-11-04 20:04:15 +01:00
parent 9dee419b7c
commit 3f89f77429
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/decoder/ffmpeg_decoder_plugin.c
View File

@ -231,16 +231,18 @@ static enum sample_format
ffmpeg_sample_format(G_GNUC_UNUSED const AVCodecContext *codec_context) ffmpeg_sample_format(G_GNUC_UNUSED const AVCodecContext *codec_context)
{ {
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(41<<8)+0) #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(41<<8)+0)
int bits = (uint8_t) av_get_bits_per_sample_format(codec_context->sample_fmt); switch (codec_context->sample_fmt) {
case SAMPLE_FMT_S16:
/* XXX implement & test other sample formats */
switch (bits) {
case 16:
return SAMPLE_FORMAT_S16; return SAMPLE_FORMAT_S16;
}
return SAMPLE_FORMAT_UNDEFINED; case SAMPLE_FMT_S32:
return SAMPLE_FORMAT_S32;
default:
g_warning("Unsupported libavcodec SampleFormat value: %d",
codec_context->sample_fmt);
return SAMPLE_FORMAT_UNDEFINED;
}
#else #else
/* XXX fixme 16-bit for older ffmpeg (13 Aug 2007) */ /* XXX fixme 16-bit for older ffmpeg (13 Aug 2007) */
return SAMPLE_FORMAT_S16; return SAMPLE_FORMAT_S16;