mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #1583

Browse Source
pull/359/head
scrawl 7 years ago
parent 70661a4b1c 08e947319a
commit 7d62f05f81
No known key found for this signature in database
GPG Key ID: 2E6CC3676024C402
4 changed files with 148 additions and 124 deletions
Show Stats Download Patch File Download Diff File

166
apps/openmw/mwsound/ffmpeg_decoder.cpp
Unescape Escape View File

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <sstream> #include <iostream>
#include <algorithm> #include <algorithm>
#include <components/vfs/manager.hpp> #include <components/vfs/manager.hpp>
@ -11,11 +11,6 @@
namespace MWSound namespace MWSound
{ {
void FFmpeg_Decoder::fail(const std::string &msg)
{
throw std::runtime_error("FFmpeg exception: "+msg);
}
int FFmpeg_Decoder::readPacket(void *user_data, uint8_t *buf, int buf_size) int FFmpeg_Decoder::readPacket(void *user_data, uint8_t *buf, int buf_size)
{ {
try try
@ -33,7 +28,8 @@ int FFmpeg_Decoder::readPacket(void *user_data, uint8_t *buf, int buf_size)
int FFmpeg_Decoder::writePacket(void *, uint8_t *, int) int FFmpeg_Decoder::writePacket(void *, uint8_t *, int)
{ {
throw std::runtime_error("can't write to read-only stream"); std::cerr<< "can't write to read-only stream" <<std::endl;
return -1;
} }
int64_t FFmpeg_Decoder::seek(void *user_data, int64_t offset, int whence) int64_t FFmpeg_Decoder::seek(void *user_data, int64_t offset, int whence)
@ -186,34 +182,34 @@ void FFmpeg_Decoder::open(const std::string &fname)
mDataStream = mResourceMgr->get(fname); mDataStream = mResourceMgr->get(fname);
if((mFormatCtx=avformat_alloc_context()) == NULL) if((mFormatCtx=avformat_alloc_context()) == NULL)
fail("Failed to allocate context"); throw std::runtime_error("Failed to allocate context");
mFormatCtx->pb = avio_alloc_context(NULL, 0, 0, this, readPacket, writePacket, seek); try
if(!mFormatCtx->pb || avformat_open_input(&mFormatCtx, fname.c_str(), NULL, NULL) != 0)
{ {
// "Note that a user-supplied AVFormatContext will be freed on failure". mFormatCtx->pb = avio_alloc_context(NULL, 0, 0, this, readPacket, writePacket, seek);
if (mFormatCtx) if(!mFormatCtx->pb || avformat_open_input(&mFormatCtx, fname.c_str(), NULL, NULL) != 0)
{ {
if (mFormatCtx->pb != NULL) // "Note that a user-supplied AVFormatContext will be freed on failure".
if (mFormatCtx)
{ {
if (mFormatCtx->pb->buffer != NULL) if (mFormatCtx->pb != NULL)
{ {
av_free(mFormatCtx->pb->buffer); if (mFormatCtx->pb->buffer != NULL)
mFormatCtx->pb->buffer = NULL; {
av_free(mFormatCtx->pb->buffer);
mFormatCtx->pb->buffer = NULL;
}
av_free(mFormatCtx->pb);
mFormatCtx->pb = NULL;
} }
av_free(mFormatCtx->pb); avformat_free_context(mFormatCtx);
mFormatCtx->pb = NULL;
} }
avformat_free_context(mFormatCtx); mFormatCtx = NULL;
throw std::runtime_error("Failed to allocate input stream");
} }
mFormatCtx = NULL;
fail("Failed to allocate input stream");
}
try
{
if(avformat_find_stream_info(mFormatCtx, NULL) < 0) if(avformat_find_stream_info(mFormatCtx, NULL) < 0)
fail("Failed to find stream info in "+fname); throw std::runtime_error("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++)
{ {
@ -224,32 +220,46 @@ void FFmpeg_Decoder::open(const std::string &fname)
} }
} }
if(!mStream) if(!mStream)
fail("No audio streams in "+fname); throw std::runtime_error("No audio streams in "+fname);
(*mStream)->codec->request_sample_fmt = (*mStream)->codec->sample_fmt; (*mStream)->codec->request_sample_fmt = (*mStream)->codec->sample_fmt;
AVCodec *codec = avcodec_find_decoder((*mStream)->codec->codec_id); AVCodec *codec = avcodec_find_decoder((*mStream)->codec->codec_id);
if(!codec) if(!codec)
{ {
std::stringstream ss("No codec found for id "); std::string ss = "No codec found for id " +
ss << (*mStream)->codec->codec_id; std::to_string((*mStream)->codec->codec_id);
fail(ss.str()); throw std::runtime_error(ss);
} }
if(avcodec_open2((*mStream)->codec, codec, NULL) < 0) if(avcodec_open2((*mStream)->codec, codec, NULL) < 0)
fail("Failed to open audio codec " + std::string(codec->long_name)); throw std::runtime_error(std::string("Failed to open audio codec ") +
codec->long_name);
mFrame = av_frame_alloc(); mFrame = av_frame_alloc();
if((*mStream)->codec->sample_fmt == AV_SAMPLE_FMT_FLT ||
(*mStream)->codec->sample_fmt == AV_SAMPLE_FMT_FLTP)
mOutputSampleFormat = AV_SAMPLE_FMT_S16; // FIXME: Check for AL_EXT_FLOAT32 support
else if((*mStream)->codec->sample_fmt == AV_SAMPLE_FMT_U8P)
mOutputSampleFormat = AV_SAMPLE_FMT_U8;
else if((*mStream)->codec->sample_fmt == AV_SAMPLE_FMT_S16P)
mOutputSampleFormat = AV_SAMPLE_FMT_S16;
else
mOutputSampleFormat = AV_SAMPLE_FMT_S16;
mOutputChannelLayout = (*mStream)->codec->channel_layout;
if(mOutputChannelLayout == 0)
mOutputChannelLayout = av_get_default_channel_layout((*mStream)->codec->channels);
} }
catch(std::exception&) catch(...) {
{
if(mStream) if(mStream)
avcodec_close((*mStream)->codec); avcodec_close((*mStream)->codec);
mStream = NULL; mStream = NULL;
if (mFormatCtx->pb->buffer != NULL) if (mFormatCtx->pb->buffer != NULL)
{ {
av_free(mFormatCtx->pb->buffer); av_free(mFormatCtx->pb->buffer);
mFormatCtx->pb->buffer = NULL; mFormatCtx->pb->buffer = NULL;
} }
av_free(mFormatCtx->pb); av_free(mFormatCtx->pb);
mFormatCtx->pb = NULL; mFormatCtx->pb = NULL;
@ -274,18 +284,18 @@ void FFmpeg_Decoder::close()
{ {
if (mFormatCtx->pb != NULL) if (mFormatCtx->pb != NULL)
{ {
// mFormatCtx->pb->buffer must be freed by hand, // mFormatCtx->pb->buffer must be freed by hand,
// if not, valgrind will show memleak, see: // if not, valgrind will show memleak, see:
// //
// https://trac.ffmpeg.org/ticket/1357 // https://trac.ffmpeg.org/ticket/1357
// //
if (mFormatCtx->pb->buffer != NULL) if (mFormatCtx->pb->buffer != NULL)
{ {
av_free(mFormatCtx->pb->buffer); av_free(mFormatCtx->pb->buffer);
mFormatCtx->pb->buffer = NULL; mFormatCtx->pb->buffer = NULL;
} }
av_free(mFormatCtx->pb); av_free(mFormatCtx->pb);
mFormatCtx->pb = NULL; mFormatCtx->pb = NULL;
} }
avformat_close_input(&mFormatCtx); avformat_close_input(&mFormatCtx);
} }
@ -301,16 +311,7 @@ std::string FFmpeg_Decoder::getName()
void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type) void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)
{ {
if(!mStream) if(!mStream)
fail("No audio stream info"); throw std::runtime_error("No audio stream info");
if((*mStream)->codec->sample_fmt == AV_SAMPLE_FMT_FLT || (*mStream)->codec->sample_fmt == AV_SAMPLE_FMT_FLTP)
mOutputSampleFormat = AV_SAMPLE_FMT_S16; // FIXME: Check for AL_EXT_FLOAT32 support
else if((*mStream)->codec->sample_fmt == AV_SAMPLE_FMT_U8P)
mOutputSampleFormat = AV_SAMPLE_FMT_U8;
else if((*mStream)->codec->sample_fmt == AV_SAMPLE_FMT_S16P)
mOutputSampleFormat = AV_SAMPLE_FMT_S16;
else
mOutputSampleFormat = AV_SAMPLE_FMT_S16;
if(mOutputSampleFormat == AV_SAMPLE_FMT_U8) if(mOutputSampleFormat == AV_SAMPLE_FMT_U8)
*type = SampleType_UInt8; *type = SampleType_UInt8;
@ -318,19 +319,11 @@ void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *
*type = SampleType_Int16; *type = SampleType_Int16;
else if(mOutputSampleFormat == AV_SAMPLE_FMT_FLT) else if(mOutputSampleFormat == AV_SAMPLE_FMT_FLT)
*type = SampleType_Float32; *type = SampleType_Float32;
else
int64_t ch_layout = (*mStream)->codec->channel_layout; {
mOutputSampleFormat = AV_SAMPLE_FMT_S16;
if(ch_layout == 0) *type = SampleType_Int16;
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
|| ch_layout == AV_CH_LAYOUT_QUAD) // FIXME: check for AL_EXT_MCFORMATS support
mOutputChannelLayout = AV_CH_LAYOUT_STEREO;
else if (ch_layout != AV_CH_LAYOUT_MONO
&& ch_layout != AV_CH_LAYOUT_STEREO)
mOutputChannelLayout = AV_CH_LAYOUT_STEREO;
if(mOutputChannelLayout == AV_CH_LAYOUT_MONO) if(mOutputChannelLayout == AV_CH_LAYOUT_MONO)
*chans = ChannelConfig_Mono; *chans = ChannelConfig_Mono;
@ -347,13 +340,27 @@ void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *
char str[1024]; char str[1024];
av_get_channel_layout_string(str, sizeof(str), (*mStream)->codec->channels, av_get_channel_layout_string(str, sizeof(str), (*mStream)->codec->channels,
(*mStream)->codec->channel_layout); (*mStream)->codec->channel_layout);
fail(std::string("Unsupported channel layout: ")+str); std::cerr<< "Unsupported channel layout: "<<str <<std::endl;
if((*mStream)->codec->channels == 1)
{
mOutputChannelLayout = AV_CH_LAYOUT_MONO;
*chans = ChannelConfig_Mono;
}
else
{
mOutputChannelLayout = AV_CH_LAYOUT_STEREO;
*chans = ChannelConfig_Stereo;
}
} }
*samplerate = (*mStream)->codec->sample_rate; *samplerate = (*mStream)->codec->sample_rate;
int64_t ch_layout = (*mStream)->codec->channel_layout;
if(ch_layout == 0)
ch_layout = av_get_default_channel_layout((*mStream)->codec->channels);
if(mOutputSampleFormat != (*mStream)->codec->sample_fmt if(mOutputSampleFormat != (*mStream)->codec->sample_fmt ||
|| mOutputChannelLayout != ch_layout) mOutputChannelLayout != ch_layout)
{ {
mSwr = swr_alloc_set_opts(mSwr, // SwrContext mSwr = swr_alloc_set_opts(mSwr, // SwrContext
mOutputChannelLayout, // output ch layout mOutputChannelLayout, // output ch layout
@ -365,24 +372,29 @@ void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *
0, // logging level offset 0, // logging level offset
NULL); // log context NULL); // log context
if(!mSwr) if(!mSwr)
fail(std::string("Couldn't allocate SwrContext")); throw std::runtime_error("Couldn't allocate SwrContext");
if(swr_init(mSwr) < 0) if(swr_init(mSwr) < 0)
fail(std::string("Couldn't initialize SwrContext")); throw std::runtime_error("Couldn't initialize SwrContext");
} }
} }
size_t FFmpeg_Decoder::read(char *buffer, size_t bytes) size_t FFmpeg_Decoder::read(char *buffer, size_t bytes)
{ {
if(!mStream) if(!mStream)
fail("No audio stream"); {
std::cerr<< "No audio stream" <<std::endl;
return 0;
}
return readAVAudioData(buffer, bytes); return readAVAudioData(buffer, bytes);
} }
void FFmpeg_Decoder::readAll(std::vector<char> &output) void FFmpeg_Decoder::readAll(std::vector<char> &output)
{ {
if(!mStream) if(!mStream)
fail("No audio stream"); {
std::cerr<< "No audio stream" <<std::endl;
return;
}
while(getAVAudioData()) while(getAVAudioData())
{ {

18
apps/openmw/mwsound/ffmpeg_decoder.hpp
Unescape Escape View File

@ -35,7 +35,7 @@ extern "C"
namespace MWSound namespace MWSound
{ {
class FFmpeg_Decoder : public Sound_Decoder class FFmpeg_Decoder final : public Sound_Decoder
{ {
AVFormatContext *mFormatCtx; AVFormatContext *mFormatCtx;
AVStream **mStream; AVStream **mStream;
@ -66,17 +66,15 @@ namespace MWSound
bool getAVAudioData(); bool getAVAudioData();
size_t readAVAudioData(void *data, size_t length); size_t readAVAudioData(void *data, size_t length);
virtual void open(const std::string &fname); void open(const std::string &fname) override;
virtual void close(); void close() override;
virtual std::string getName(); std::string getName() override;
virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type); void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type) override;
virtual size_t read(char *buffer, size_t bytes); size_t read(char *buffer, size_t bytes) override;
virtual void readAll(std::vector<char> &output); void readAll(std::vector<char> &output) override;
virtual size_t getSampleOffset(); size_t getSampleOffset() override;
void fail(const std::string &msg);
FFmpeg_Decoder& operator=(const FFmpeg_Decoder &rhs); FFmpeg_Decoder& operator=(const FFmpeg_Decoder &rhs);
FFmpeg_Decoder(const FFmpeg_Decoder &rhs); FFmpeg_Decoder(const FFmpeg_Decoder &rhs);

27
apps/openmw/mwsound/movieaudiofactory.cpp
Unescape Escape View File

@ -1,5 +1,7 @@
#include "movieaudiofactory.hpp" #include "movieaudiofactory.hpp"
#include <iostream>
#include <extern/osg-ffmpeg-videoplayer/audiodecoder.hpp> #include <extern/osg-ffmpeg-videoplayer/audiodecoder.hpp>
#include <extern/osg-ffmpeg-videoplayer/videostate.hpp> #include <extern/osg-ffmpeg-videoplayer/videostate.hpp>
@ -13,7 +15,7 @@ namespace MWSound
{ {
class MovieAudioDecoder; class MovieAudioDecoder;
class MWSoundDecoderBridge : public Sound_Decoder class MWSoundDecoderBridge final : public Sound_Decoder
{ {
public: public:
MWSoundDecoderBridge(MWSound::MovieAudioDecoder* decoder) MWSoundDecoderBridge(MWSound::MovieAudioDecoder* decoder)
@ -25,12 +27,12 @@ namespace MWSound
private: private:
MWSound::MovieAudioDecoder* mDecoder; MWSound::MovieAudioDecoder* mDecoder;
virtual void open(const std::string &fname); void open(const std::string &fname) override;
virtual void close(); void close() override;
virtual std::string getName(); std::string getName() override;
virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type); void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type) override;
virtual size_t read(char *buffer, size_t bytes); size_t read(char *buffer, size_t bytes) override;
virtual size_t getSampleOffset(); size_t getSampleOffset() override;
}; };
class MovieAudioDecoder : public Video::MovieAudioDecoder class MovieAudioDecoder : public Video::MovieAudioDecoder
@ -98,7 +100,7 @@ namespace MWSound
void MWSoundDecoderBridge::open(const std::string &fname) void MWSoundDecoderBridge::open(const std::string &fname)
{ {
throw std::runtime_error("unimplemented"); throw std::runtime_error("Method not implemented");
} }
void MWSoundDecoderBridge::close() {} void MWSoundDecoderBridge::close() {}
@ -123,11 +125,8 @@ namespace MWSound
else if (outputChannelLayout == AV_CH_LAYOUT_QUAD) else if (outputChannelLayout == AV_CH_LAYOUT_QUAD)
*chans = ChannelConfig_Quad; *chans = ChannelConfig_Quad;
else else
{ throw std::runtime_error("Unsupported channel layout: "+
std::stringstream error; std::to_string(outputChannelLayout));
error << "Unsupported channel layout: " << outputChannelLayout;
throw std::runtime_error(error.str());
}
AVSampleFormat outputSampleFormat = mDecoder->getOutputSampleFormat(); AVSampleFormat outputSampleFormat = mDecoder->getOutputSampleFormat();
if (outputSampleFormat == AV_SAMPLE_FMT_U8) if (outputSampleFormat == AV_SAMPLE_FMT_U8)
@ -140,7 +139,7 @@ namespace MWSound
{ {
char str[1024]; char str[1024];
av_get_sample_fmt_string(str, sizeof(str), outputSampleFormat); av_get_sample_fmt_string(str, sizeof(str), outputSampleFormat);
throw std::runtime_error(std::string("Unsupported sample format: ") + str); throw std::runtime_error(std::string("Unsupported sample format: ")+str);
} }
} }

61
apps/openmw/mwsound/openal_output.cpp
Unescape Escape View File

@ -411,9 +411,14 @@ bool OpenAL_SoundStream::init(bool getLoudnessData)
ChannelConfig chans; ChannelConfig chans;
SampleType type; SampleType type;
mDecoder->getInfo(&mSampleRate, &chans, &type); try {
mFormat = getALFormat(chans, type); mDecoder->getInfo(&mSampleRate, &chans, &type);
if(!mFormat) return false; mFormat = getALFormat(chans, type);
}
catch(std::exception &e) {
std::cerr<< "Failed to get stream info: "<<e.what() <<std::endl;
return false;
}
switch(type) switch(type)
{ {
@ -945,31 +950,41 @@ std::pair<Sound_Handle,size_t> OpenAL_Output::loadSound(const std::string &fname
{ {
getALError(); getALError();
DecoderPtr decoder = mManager.getDecoder();
// Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
if(decoder->mResourceMgr->exists(fname))
decoder->open(fname);
else
{
std::string file = fname;
std::string::size_type pos = file.rfind('.');
if(pos != std::string::npos)
file = file.substr(0, pos)+".mp3";
decoder->open(file);
}
std::vector<char> data; std::vector<char> data;
ChannelConfig chans;
SampleType type;
ALenum format; ALenum format;
int srate; int srate;
decoder->getInfo(&srate, &chans, &type); try {
format = getALFormat(chans, type); DecoderPtr decoder = mManager.getDecoder();
if(!format) return std::make_pair(nullptr, 0); // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
if(decoder->mResourceMgr->exists(fname))
decoder->open(fname);
else
{
std::string file = fname;
std::string::size_type pos = file.rfind('.');
if(pos != std::string::npos)
file = file.substr(0, pos)+".mp3";
decoder->open(file);
}
ChannelConfig chans;
SampleType type;
decoder->getInfo(&srate, &chans, &type);
format = getALFormat(chans, type);
if(format) decoder->readAll(data);
}
catch(std::exception &e) {
std::cerr<< "Failed to load audio from "<<fname<<": "<<e.what() <<std::endl;
}
decoder->readAll(data); if(data.empty())
decoder->close(); {
// If we failed to get any usable audio, substitute with silence.
format = AL_FORMAT_MONO8;
srate = 8000;
data.assign(8000, -128);
}
ALint size; ALint size;
ALuint buf = 0; ALuint buf = 0;

Write Preview
Loading…
Cancel
Save