mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 10:23:53 +00:00
Code Issues Releases Wiki Activity

Improve ffmpeg failure messages

Browse source
This commit is contained in:
Chris Robinson 2012-03-20 18:49:52 -07:00
parent 26a441f29a
commit 2989a1e06e
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/openmw/mwsound/ffmpeg_decoder.cpp
View file

@ -247,10 +247,10 @@ void FFmpeg_Decoder::open(const std::string &fname)
{ {
mFormatCtx->pb = avio_alloc_context(NULL, 0, 0, this, readPacket, writePacket, seek); mFormatCtx->pb = avio_alloc_context(NULL, 0, 0, this, readPacket, writePacket, seek);
if(!mFormatCtx->pb || avformat_open_input(&mFormatCtx, fname.c_str(), NULL, NULL) != 0) if(!mFormatCtx->pb || avformat_open_input(&mFormatCtx, fname.c_str(), NULL, NULL) != 0)
fail("Failed to open input"); fail("Failed to open input stream for "+fname);
if(avformat_find_stream_info(mFormatCtx, NULL) < 0) if(avformat_find_stream_info(mFormatCtx, NULL) < 0)
fail("Failed to find stream info"); fail("Failed to find stream info in "+fname);
for(size_t j = 0;j < mFormatCtx->nb_streams;j++) for(size_t j = 0;j < mFormatCtx->nb_streams;j++)
{ {
@ -261,10 +261,15 @@ void FFmpeg_Decoder::open(const std::string &fname)
stream->mStreamIdx = j; stream->mStreamIdx = j;
stream->mPackets = NULL; stream->mPackets = NULL;
AVCodec *codec; AVCodec *codec = avcodec_find_decoder(stream->mCodecCtx->codec_id);
codec = avcodec_find_decoder(stream->mCodecCtx->codec_id); if(!codec)
if(!codec || avcodec_open(stream->mCodecCtx, codec) < 0) {
fail("Could not open audio codec"); std::stringstream ss("No codec found for id ");
ss << stream->mCodecCtx->codec_id;
fail(ss.str());
}
if(avcodec_open(stream->mCodecCtx, codec) < 0)
fail("Failed to open audio codec " + std::string(codec->long_name));
stream->mDecodedData = (char*)av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE); stream->mDecodedData = (char*)av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
stream->mDecodedDataSize = 0; stream->mDecodedDataSize = 0;
@ -275,7 +280,7 @@ void FFmpeg_Decoder::open(const std::string &fname)
} }
} }
if(mStreams.empty()) if(mStreams.empty())
fail("No audio streams"); fail("No audio streams in "+fname);
} }
catch(std::exception &e) catch(std::exception &e)
{ {
@ -313,7 +318,7 @@ void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *
else if(stream->mCodecCtx->sample_fmt == AV_SAMPLE_FMT_S16) else if(stream->mCodecCtx->sample_fmt == AV_SAMPLE_FMT_S16)
*type = SampleType_Int16; *type = SampleType_Int16;
else else
fail(std::string("Unsupported sample format:")+ fail(std::string("Unsupported sample format: ")+
av_get_sample_fmt_name(stream->mCodecCtx->sample_fmt)); av_get_sample_fmt_name(stream->mCodecCtx->sample_fmt));
if(stream->mCodecCtx->channel_layout == AV_CH_LAYOUT_MONO) if(stream->mCodecCtx->channel_layout == AV_CH_LAYOUT_MONO)