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

Remove incomplete implementation to support planar formats. Make libswresample a prerequisite.

Browse source
This commit is contained in:
cc9cii 2014-09-08 15:24:39 +10:00
parent f616000afb
commit 785d2c7cc9
2 changed files with 6 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -140,16 +140,9 @@ 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 SWRESAMPLE)
find_package(FFmpeg) find_package(FFmpeg REQUIRED)
if ( NOT AVCODEC_FOUND OR NOT AVFORMAT_FOUND OR NOT AVUTIL_FOUND OR NOT SWSCALE_FOUND )
message(FATAL_ERROR "FFmpeg component required, but not found!")
endif()
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} ${SWRESAMPLE_LIBRARIES})
if( SWRESAMPLE_FOUND )
add_definitions(-DHAVE_LIBSWRESAMPLE)
set(SOUND_INPUT_LIBRARY ${FFMPEG_LIBRARIES} ${SWRESAMPLE_LIBRARIES})
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)

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

@ -52,47 +52,13 @@ extern "C"
#include <libavutil/channel_layout.h> #include <libavutil/channel_layout.h>
#endif #endif
// From version 54.56 binkaudio encoding format changed from S16 to FLTP. See:
// https://gitorious.org/ffmpeg/ffmpeg/commit/7bfd1766d1c18f07b0a2dd042418a874d49ea60d
// http://ffmpeg.zeranoe.com/forum/viewtopic.php?f=15&t=872
// WARNING: avcodec versions up to 54.54.100 potentially crashes on Windows 64bit. // WARNING: avcodec versions up to 54.54.100 potentially crashes on Windows 64bit.
#include <libswresample/swresample.h>
} }
// From version 54.56 binkaudio encoding format changed from S16 to FLTP. See:
// https://gitorious.org/ffmpeg/ffmpeg/commit/7bfd1766d1c18f07b0a2dd042418a874d49ea60d
// http://ffmpeg.zeranoe.com/forum/viewtopic.php?f=15&t=872
#ifdef HAVE_LIBSWRESAMPLE
extern "C" {
#include <libswresample/swresample.h>
}
#else
/* nasty hack to support FLTP, but no other formats, on systems without libswresample */
int swr_init(int *n) { return 1; }
int swr_convert(int *s, uint8_t** output, int outs, const uint8_t** input, int ins) {
uint8_t *stream = *output;
float *outputStream = (float *)&stream[0];
float* inputChannel0 = (float *)input[0];
float* inputChannel1 = (float *)input[1];
float sample0, sample1 = 0;
for (int i = 0 ; i < ins ; ++i) {
sample0 = *inputChannel0++;
sample1 = *inputChannel1++;
outputStream[i*2] = sample0;
outputStream[i*2+1] = sample1;
}
return ins;
}
int * swr_alloc_set_opts(int *s, int64_t outc, AVSampleFormat outf, int outr,
int64_t inc, AVSampleFormat inf, int inr, int o, void* l) {
if(inf == AV_SAMPLE_FMT_FLTP) {
s = new int(1);
} else {
throw std::runtime_error(
std::string("Unsupported sample format: ")+ av_get_sample_fmt_name(inf));
}
return s;
}
void swr_free(int **s) { delete *s; *s = NULL; }
#define SwrContext int
#endif
#define MAX_AUDIOQ_SIZE (5 * 16 * 1024) #define MAX_AUDIOQ_SIZE (5 * 16 * 1024)
#define MAX_VIDEOQ_SIZE (5 * 256 * 1024) #define MAX_VIDEOQ_SIZE (5 * 256 * 1024)
#define AV_SYNC_THRESHOLD 0.01 #define AV_SYNC_THRESHOLD 0.01