mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-12 13:13:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/OpenMW/openmw

Browse Source 
Conflicts:
	apps/openmw/mwscript/cellextensions.cpp
This commit is contained in:
scrawl 2014-05-25 14:58:47 +02:00
commit f3ba31de2d
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/mwiniimporter/main.cpp
View File

@ -1,6 +1,7 @@
#include "importer.hpp" #include "importer.hpp"
#include <string> #include <string>
#include <iostream>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>

29
apps/openmw/mwrender/videoplayer.cpp
View File

@ -50,6 +50,29 @@ extern "C"
#endif #endif
} }
#ifdef _WIN32
// Decide whether to play binkaudio.
#include <libavcodec/version.h>
// libavcodec versions 54.10.100 (or maybe earlier) to 54.54.100 potentially crashes Windows 64bit.
// From version 54.56 or higher, there's no sound due to the encoding format changing from S16 to FLTP
// (see https://gitorious.org/ffmpeg/ffmpeg/commit/7bfd1766d1c18f07b0a2dd042418a874d49ea60d and
// http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=3049d5b9b32845c86aa5588bb3352bdeb2edfdb2;hp=43c6b45a53a186a187f7266e4d6bd3c2620519f1),
// but does not crash (or at least no known crash).
#if (LIBAVCODEC_VERSION_MAJOR > 54)
#define FFMPEG_PLAY_BINKAUDIO
#else
#ifdef _WIN64
#if ((LIBAVCODEC_VERSION_MAJOR == 54) && (LIBAVCODEC_VERSION_MINOR >= 55))
#define FFMPEG_PLAY_BINKAUDIO
#endif
#else
#if ((LIBAVCODEC_VERSION_MAJOR == 54) && (LIBAVCODEC_VERSION_MINOR >= 10))
#define FFMPEG_PLAY_BINKAUDIO
#endif
#endif
#endif
#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
@ -970,8 +993,14 @@ void VideoState::init(const std::string& resourceName)
MWBase::Environment::get().getSoundManager()->pauseSounds(); MWBase::Environment::get().getSoundManager()->pauseSounds();
this->external_clock_base = av_gettime(); this->external_clock_base = av_gettime();
#if !defined(_WIN32) || defined(FFMPEG_PLAY_BINKAUDIO)
if(audio_index >= 0) if(audio_index >= 0)
this->stream_open(audio_index, this->format_ctx); this->stream_open(audio_index, this->format_ctx);
#else
std::cout<<"FFmpeg sound disabled for \""+resourceName+"\""<<std::endl;
#endif
if(video_index >= 0) if(video_index >= 0)
{ {
this->stream_open(video_index, this->format_ctx); this->stream_open(video_index, this->format_ctx);

1
apps/openmw/mwscript/cellextensions.cpp
View File

@ -93,6 +93,7 @@ namespace MWScript
runtime.push (0); runtime.push (0);
return; return;
} }
bool interior = bool interior =
!MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell()->isExterior(); !MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell()->isExterior();