mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Use av_get_default_channel_layout for unknown channel layouts

Browse Source
This commit is contained in:
scrawl 2014-11-01 19:37:54 +01:00
parent efa4d09c48
commit 17cb181f88
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/openmw/mwsound/ffmpeg_decoder.cpp
View File

@ -307,19 +307,7 @@ void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *
int64_t ch_layout = (*mStream)->codec->channel_layout;
if(ch_layout == 0)
{
/* 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());
}
}
ch_layout = av_get_default_channel_layout((*mStream)->codec->channels);
mOutputChannelLayout = ch_layout;
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;
if (inputChannelLayout == 0)
{
/* 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());
}
}
inputChannelLayout = av_get_default_channel_layout(mAVStream->codec->channels);
int inputSampleRate = mAVStream->codec->sample_rate;