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

Simplify the use of swr_convert and add #ifdef guards around code that require libswresample.

Browse source
This commit is contained in:
cc9cii 2014-09-01 21:49:37 +10:00
parent 0b9d17a81d
commit f4dd281393
2 changed files with 53 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -139,10 +139,13 @@ set(OPENMW_LIBS ${OENGINE_ALL})
set(OPENMW_LIBS_HEADER) set(OPENMW_LIBS_HEADER)
# Sound setup # Sound setup
set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE SWRESAMPLE) set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE)
find_package(FFmpeg REQUIRED) find_package(FFmpeg REQUIRED)
set(SOUND_INPUT_INCLUDES ${FFMPEG_INCLUDE_DIRS}) set(SOUND_INPUT_INCLUDES ${FFMPEG_INCLUDE_DIRS})
set(SOUND_INPUT_LIBRARY ${FFMPEG_LIBRARIES} ${SWSCALE_LIBRARIES}) set(SOUND_INPUT_LIBRARY ${FFMPEG_LIBRARIES} ${SWSCALE_LIBRARIES})
if( SWRESAMPLE_FOUND )
add_definitions(-DHAVE_LIBSWRESAMPLE)
endif()
# TinyXML # TinyXML
option(USE_SYSTEM_TINYXML "Use system TinyXML library instead of internal." OFF) option(USE_SYSTEM_TINYXML "Use system TinyXML library instead of internal." OFF)

66
apps/openmw/mwrender/videoplayer.cpp
View file

@ -53,9 +53,10 @@ extern "C"
// http://ffmpeg.zeranoe.com/forum/viewtopic.php?f=15&t=872 // http://ffmpeg.zeranoe.com/forum/viewtopic.php?f=15&t=872
#if AV_VERSION_INT(54, 56, 0) <= AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #if AV_VERSION_INT(54, 56, 0) <= AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO) LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO)
#include <libswresample/swresample.h> /* swr_init, swr_alloc, swr_convert, swr_free */ #ifdef HAVE_LIBSWRESAMPLE
#include <libavutil/opt.h> /* av_opt_set_int, av_opt_set_sample_fmt */ #include <libswresample/swresample.h>
#define FFMPEG_PLAY_BINKAUDIO #define FFMPEG_PLAY_BINKAUDIO
#endif
#elif defined(_WIN32) && defined(_WIN64) #elif defined(_WIN32) && defined(_WIN64)
// Versions up to 54.54.100 potentially crashes on Windows 64bit. // Versions up to 54.54.100 potentially crashes on Windows 64bit.
#if ((LIBAVCODEC_VERSION_MAJOR == 54) && (LIBAVCODEC_VERSION_MINOR >= 55)) #if ((LIBAVCODEC_VERSION_MAJOR == 54) && (LIBAVCODEC_VERSION_MINOR >= 55))
@ -315,7 +316,11 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
VideoState *mVideoState; VideoState *mVideoState;
AVStream *mAVStream; AVStream *mAVStream;
#ifdef HAVE_LIBSWRESAMPLE
SwrContext *mSwr; SwrContext *mSwr;
#else
bool mSwr;
#endif
int mSamplesAllChannels; int mSamplesAllChannels;
enum AVSampleFormat mOutputSampleFormat; enum AVSampleFormat mOutputSampleFormat;
@ -442,21 +447,27 @@ public:
virtual ~MovieAudioDecoder() virtual ~MovieAudioDecoder()
{ {
av_freep(&mFrame); av_freep(&mFrame);
if(mSwr) #ifdef HAVE_LIBSWRESAMPLE
swr_free(&mSwr); swr_free(&mSwr);
#endif
} }
void getInfo(int *samplerate, MWSound::ChannelConfig *chans, MWSound::SampleType * type) void getInfo(int *samplerate, MWSound::ChannelConfig *chans, MWSound::SampleType * type)
{ {
if((mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_U8) || if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_U8)
(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_U8P))
*type = MWSound::SampleType_UInt8; *type = MWSound::SampleType_UInt8;
else if((mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_S16) || else if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_S16)
(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_S16P))
*type = MWSound::SampleType_Int16; *type = MWSound::SampleType_Int16;
else if((mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_FLT) || else if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_FLT)
(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_FLTP))
*type = MWSound::SampleType_Float32; *type = MWSound::SampleType_Float32;
#ifdef HAVE_LIBSWRESAMPLE
else if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_U8P)
*type = MWSound::SampleType_UInt8;
else if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_S16P)
*type = MWSound::SampleType_Int16;
else if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_FLTP)
*type = MWSound::SampleType_Float32;
#endif
else else
fail(std::string("Unsupported sample format: ")+ fail(std::string("Unsupported sample format: ")+
av_get_sample_fmt_name(mAVStream->codec->sample_fmt)); av_get_sample_fmt_name(mAVStream->codec->sample_fmt));
@ -495,6 +506,7 @@ public:
*samplerate = mAVStream->codec->sample_rate; *samplerate = mAVStream->codec->sample_rate;
#ifdef HAVE_LIBSWRESAMPLE
if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_U8P) if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_U8P)
mOutputSampleFormat = AV_SAMPLE_FMT_U8; mOutputSampleFormat = AV_SAMPLE_FMT_U8;
else if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_S16P) else if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_S16P)
@ -523,12 +535,16 @@ public:
mSamplesAllChannels = av_get_bytes_per_sample(mOutputSampleFormat) mSamplesAllChannels = av_get_bytes_per_sample(mOutputSampleFormat)
* mAVStream->codec->channels; * mAVStream->codec->channels;
} }
#endif
} }
size_t read(char *stream, size_t len) size_t read(char *stream, size_t len)
{ {
int sample_skip = synchronize_audio(); int sample_skip = synchronize_audio();
size_t total = 0; size_t total = 0;
uint8_t *output = NULL;
if(mSwr) av_samples_alloc(&output, NULL, mAVStream->codec->channels,
len/mSamplesAllChannels, mOutputSampleFormat, 0);
while(total < len) while(total < len)
{ {
@ -546,7 +562,17 @@ public:
sample_skip -= mFramePos; sample_skip -= mFramePos;
continue; continue;
} }
#ifdef HAVE_LIBSWRESAMPLE
if(mSwr)
{
int n = swr_convert(mSwr, (uint8_t**)&output, mFrame->nb_samples,
(const uint8_t**)mFrame->extended_data, mFrame->nb_samples);
if(n < 0)
break;
else if(n < mFrame->nb_samples)
std::cerr<<"swr_convert error: "+std::to_string(mFrame->nb_samples-n)<<std::endl;
}
#endif
size_t len1 = len - total; size_t len1 = len - total;
if(mFramePos >= 0) if(mFramePos >= 0)
{ {
@ -554,24 +580,7 @@ public:
if(mSwr) if(mSwr)
{ {
int convertedSamples = 0; memcpy(stream, &output[0]+mFramePos, len1);
if(mFramePos > 0 && mFramePos < mFrameSize)
{
if(swr_drop_output(mSwr, mFramePos/mSamplesAllChannels) < 0)
break;
convertedSamples = swr_convert(mSwr, (uint8_t**)&stream, len1/mSamplesAllChannels,
(const uint8_t**)mFrame->extended_data, (len1+mFramePos)/mSamplesAllChannels);
}
else
{
convertedSamples = swr_convert(mSwr, (uint8_t**)&stream, len1/mSamplesAllChannels,
(const uint8_t**)mFrame->extended_data, len1/mSamplesAllChannels);
}
if(convertedSamples > 0)
len1 = convertedSamples * mSamplesAllChannels;
else
break;
} }
else else
{ {
@ -617,6 +626,7 @@ public:
stream += len1; stream += len1;
mFramePos += len1; mFramePos += len1;
} }
if(mSwr) av_freep(&output);
return total; return total;
} }