krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-11-02 10:38:42 +01:00
commit 29c9b6bd01
2 changed files with 7 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -107,6 +107,9 @@ bool FFmpeg_Decoder::getAVAudioData()
av_shrink_packet(&mPacket, remaining); av_shrink_packet(&mPacket, remaining);
} }
if (!got_frame || mFrame->nb_samples == 0)
continue;
if(mSwr) if(mSwr)
{ {
if(!mDataBuf || mDataBufLen < mFrame->nb_samples) if(!mDataBuf || mDataBufLen < mFrame->nb_samples)
@ -114,7 +117,7 @@ bool FFmpeg_Decoder::getAVAudioData()
av_freep(&mDataBuf); av_freep(&mDataBuf);
if(av_samples_alloc(&mDataBuf, NULL, av_get_channel_layout_nb_channels(mOutputChannelLayout), if(av_samples_alloc(&mDataBuf, NULL, av_get_channel_layout_nb_channels(mOutputChannelLayout),
mFrame->nb_samples, mOutputSampleFormat, 0) < 0) mFrame->nb_samples, mOutputSampleFormat, 0) < 0)
break; return false;
else else
mDataBufLen = mFrame->nb_samples; mDataBufLen = mFrame->nb_samples;
} }
@ -122,7 +125,7 @@ bool FFmpeg_Decoder::getAVAudioData()
if(swr_convert(mSwr, (uint8_t**)&mDataBuf, mFrame->nb_samples, if(swr_convert(mSwr, (uint8_t**)&mDataBuf, mFrame->nb_samples,
(const uint8_t**)mFrame->extended_data, mFrame->nb_samples) < 0) (const uint8_t**)mFrame->extended_data, mFrame->nb_samples) < 0)
{ {
break; return false;
} }
mFrameData = &mDataBuf; mFrameData = &mDataBuf;
} }
@ -304,19 +307,7 @@ void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *
int64_t ch_layout = (*mStream)->codec->channel_layout; int64_t ch_layout = (*mStream)->codec->channel_layout;
if(ch_layout == 0) if(ch_layout == 0)
{ ch_layout = av_get_default_channel_layout((*mStream)->codec->channels);
/* Unknown channel layout. Try to guess. */
if((*mStream)->codec->channels == 1)
ch_layout = AV_CH_LAYOUT_MONO;
else if((*mStream)->codec->channels == 2)
ch_layout = AV_CH_LAYOUT_STEREO;
else
{
std::stringstream sstr("Unsupported raw channel count: ");
sstr << (*mStream)->codec->channels;
fail(sstr.str());
}
}
mOutputChannelLayout = ch_layout; mOutputChannelLayout = ch_layout;
if (ch_layout == AV_CH_LAYOUT_5POINT1 || ch_layout == AV_CH_LAYOUT_7POINT1 if (ch_layout == AV_CH_LAYOUT_5POINT1 || ch_layout == AV_CH_LAYOUT_7POINT1

14
extern/ogre-ffmpeg-videoplayer/audiodecoder.cpp vendored
View file

@ -94,19 +94,7 @@ void MovieAudioDecoder::setupFormat()
uint64_t inputChannelLayout = mAVStream->codec->channel_layout; uint64_t inputChannelLayout = mAVStream->codec->channel_layout;
if (inputChannelLayout == 0) if (inputChannelLayout == 0)
{ inputChannelLayout = av_get_default_channel_layout(mAVStream->codec->channels);
/* Unknown channel layout. Try to guess. */
if(mAVStream->codec->channels == 1)
inputChannelLayout = AV_CH_LAYOUT_MONO;
else if(mAVStream->codec->channels == 2)
inputChannelLayout = AV_CH_LAYOUT_STEREO;
else
{
std::stringstream sstr("Unsupported raw channel count: ");
sstr << mAVStream->codec->channels;
fail(sstr.str());
}
}
int inputSampleRate = mAVStream->codec->sample_rate; int inputSampleRate = mAVStream->codec->sample_rate;