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

started over

Browse Source
actorid
scrawl 12 years ago
parent 5f676f9c6b
commit c49966dd29
5 changed files with 1022 additions and 467 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape Escape View File

@ -163,6 +163,10 @@ if (USE_MPG123)
set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_MPG123) set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_MPG123)
endif (USE_MPG123) endif (USE_MPG123)
find_package (SDL REQUIRED)
set(SOUND_INPUT_INCLUDES ${SOUND_INPUT_INCLUDES} ${SDL_INCLUDE_DIR})
set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${SDL_LIBRARY})
# Platform specific # Platform specific
if (WIN32) if (WIN32)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)

2
apps/openmw/mwrender/renderingmanager.cpp
Unescape Escape View File

@ -928,7 +928,7 @@ void RenderingManager::setupExternalRendering (MWRender::ExternalRendering& rend
void RenderingManager::playVideo(const std::string& name) void RenderingManager::playVideo(const std::string& name)
{ {
mVideoPlayer->play ("video/" + name); mVideoPlayer->playVideo ("video/" + name);
} }
} // namespace } // namespace

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

File diff suppressed because it is too large Load Diff

219
apps/openmw/mwrender/videoplayer.hpp
Unescape Escape View File

@ -1,137 +1,162 @@
#ifndef MWRENDER_VIDEOPLAYER_H #ifndef VIDEOPLAYER_H
#define MWRENDER_VIDEOPLAYER_H #define VIDEOPLAYER_H
//#ifdef OPENMW_USE_FFMPEG #include <OgreRoot.h>
#include <OgreHardwarePixelBuffer.h>
#include <boost/thread.hpp>
#include <string> #define __STDC_CONSTANT_MACROS
#include <stdint.h>
#include <OgreDataStream.h> extern "C"
#include <OgreTexture.h>
#include <OgreTimer.h>
namespace Ogre
{ {
class Rectangle2D; #include <libavcodec/avcodec.h>
class SceneManager; #include <libavformat/avformat.h>
class TextureUnitState; #include <libswscale/swscale.h>
} }
struct AVFormatContext; #include <SDL/SDL.h>
struct AVCodecContext; #include <SDL/SDL_thread.h>
struct AVCodec;
struct AVStream;
struct AVFrame;
struct SwsContext;
struct AVPacket;
struct AVPacketList;
namespace MWRender #include <cstdio>
{ #include <cmath>
/// A simple queue used to queue raw audio and video data. #define SDL_AUDIO_BUFFER_SIZE 1024
class AVPacketQueue #define MAX_AUDIOQ_SIZE (5 * 16 * 1024)
{ #define MAX_VIDEOQ_SIZE (5 * 256 * 1024)
public: #define AV_SYNC_THRESHOLD 0.01
AVPacketQueue(); #define AV_NOSYNC_THRESHOLD 10.0
int put(AVPacket* pkt); #define SAMPLE_CORRECTION_PERCENT_MAX 10
int get(AVPacket* pkt, int block); #define AUDIO_DIFF_AVG_NB 20
#define VIDEO_PICTURE_QUEUE_SIZE 1
#define DEFAULT_AV_SYNC_TYPE AV_SYNC_VIDEO_MASTER
bool isEmpty() const { return mNumPackets == 0; }
int getNumPackets() const { return mNumPackets; }
int getSize() const { return mSize; }
private:
AVPacketList* mFirstPacket;
AVPacketList* mLastPacket;
int mNumPackets;
int mSize;
};
class VideoPlayer namespace MWRender
{ {
public:
VideoPlayer(Ogre::SceneManager* sceneMgr);
~VideoPlayer();
void play (const std::string& resourceName);
void update(); struct PacketQueue {
PacketQueue () :
first_pkt(NULL), last_pkt(NULL), nb_packets(0), size(0)
{}
AVPacketList *first_pkt, *last_pkt;
int nb_packets;
int size;
private: boost::mutex mutex;
Ogre::Rectangle2D* mRectangle; boost::condition_variable cond;
Ogre::TextureUnitState* mTextureUnit; };
struct VideoPicture {
VideoPicture () :
data(NULL), pts(0)
{}
uint8_t* data;
Ogre::DataStreamPtr mStream; double pts;
};
Ogre::TexturePtr mVideoTexture; static void packet_queue_flush(PacketQueue *q);
struct VideoState {
VideoState () :
videoStream(-1), audioStream(-1), av_sync_type(0), external_clock(0),
external_clock_time(0), audio_clock(0), audio_st(NULL), audio_buf_size(0),
audio_pkt_data(NULL), audio_pkt_size(0), audio_hw_buf_size(0), audio_diff_cum(0), audio_diff_avg_coef(0),
audio_diff_threshold(0), audio_diff_avg_count(0), frame_timer(0), frame_last_pts(0), frame_last_delay(0),
video_clock(0), video_current_pts(0), video_current_pts_time(0), video_st(NULL), rgbaFrame(NULL), pictq_size(0),
pictq_rindex(0), pictq_windex(0), quit(false), refresh(0), sws_context(NULL)
{}
private:
AVFormatContext* mAvContext; ~VideoState()
{
packet_queue_flush (&audioq);
packet_queue_flush (&videoq);
Ogre::Timer mTimer; if (pictq_size >= 1)
free (pictq[0].data);
}
AVCodec* mVideoCodec; int videoStream, audioStream;
AVCodec* mAudioCodec;
int av_sync_type;
double external_clock; /* external clock base */
int64_t external_clock_time;
double audio_clock;
AVStream *audio_st;
PacketQueue audioq;
DECLARE_ALIGNED(16, uint8_t, audio_buf[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2]);
unsigned int audio_buf_size;
unsigned int audio_buf_index;
AVPacket audio_pkt;
uint8_t *audio_pkt_data;
int audio_pkt_size;
int audio_hw_buf_size;
double audio_diff_cum; /* used for AV difference average computation */
double audio_diff_avg_coef;
double audio_diff_threshold;
int audio_diff_avg_count;
double frame_timer;
double frame_last_pts;
double frame_last_delay;
double video_clock; ///<pts of last decoded frame / predicted pts of next decoded frame
double video_current_pts; ///<current displayed pts (different from video_clock if frame fifos are used)
int64_t video_current_pts_time; ///<time (av_gettime) at which we updated video_current_pts - used to have running video pts
AVStream *video_st;
PacketQueue videoq;
SwsContext* sws_context;
VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
AVFrame* rgbaFrame; // used as buffer for the frame converted from its native format to RGBA
int pictq_size, pictq_rindex, pictq_windex;
boost::mutex pictq_mutex;
boost::condition_variable pictq_cond;
boost::thread parse_thread;
boost::thread video_thread;
std::string resourceName;
int quit;
int refresh;
};
enum {
AV_SYNC_AUDIO_MASTER,
AV_SYNC_VIDEO_MASTER,
AV_SYNC_EXTERNAL_MASTER
};
AVStream* mVideoStream;
AVStream* mAudioStream;
int mVideoStreamId; ///< ID of the first video stream
int mAudioStreamId; ///< ID of the first audio stream
AVFrame* mRawFrame; class VideoPlayer
AVFrame* mRGBAFrame; {
SwsContext* mSwsContext;
double mClock; public:
double mVideoClock; VideoPlayer(Ogre::SceneManager* sceneMgr);
double mAudioClock; ~VideoPlayer();
AVPacketQueue mVideoPacketQueue; void playVideo (const std::string& resourceName);
AVPacketQueue mAudioPacketQueue;
void update();
void close(); void close();
void deleteContext();
void throwError(int error);
bool addToBuffer(); ///< try to add the next audio or video packet into the queue.
void decodeNextVideoFrame(); ///< decode the next video frame in the queue and display it.
};
}
//#else bool isPlaying();
/*
// If FFMPEG not available, dummy implentation that does nothing private:
VideoState* mState;
namespace MWRender
{
class VideoPlayer Ogre::SceneManager* mSceneMgr;
{ Ogre::Rectangle2D* mRectangle;
public: Ogre::MaterialPtr mVideoMaterial;
VideoPlayer(Ogre::SceneManager* sceneMgr){}
void play (const std::string& resourceName) {}
void update() {}
}; };
} }
*/
//#endif
#endif #endif

177
cmake/FindSDL.cmake
Unescape Escape View File

@ -0,0 +1,177 @@
# Locate SDL library
# This module defines
# SDL_LIBRARY, the name of the library to link against
# SDL_FOUND, if false, do not try to link to SDL
# SDL_INCLUDE_DIR, where to find SDL.h
#
# This module responds to the the flag:
# SDL_BUILDING_LIBRARY
# If this is defined, then no SDL_main will be linked in because
# only applications need main().
# Otherwise, it is assumed you are building an application and this
# module will attempt to locate and set the the proper link flags
# as part of the returned SDL_LIBRARY variable.
#
# Don't forget to include SDLmain.h and SDLmain.m your project for the
# OS X framework based version. (Other versions link to -lSDLmain which
# this module will try to find on your behalf.) Also for OS X, this
# module will automatically add the -framework Cocoa on your behalf.
#
#
# Additional Note: If you see an empty SDL_LIBRARY_TEMP in your configuration
# and no SDL_LIBRARY, it means CMake did not find your SDL library
# (SDL.dll, libsdl.so, SDL.framework, etc).
# Set SDL_LIBRARY_TEMP to point to your SDL library, and configure again.
# Similarly, if you see an empty SDLMAIN_LIBRARY, you should set this value
# as appropriate. These values are used to generate the final SDL_LIBRARY
# variable, but when these values are unset, SDL_LIBRARY does not get created.
#
#
# $SDLDIR is an environment variable that would
# correspond to the ./configure --prefix=$SDLDIR
# used in building SDL.
# l.e.galup 9-20-02
#
# Modified by Eric Wing.
# Added code to assist with automated building by using environmental variables
# and providing a more controlled/consistent search behavior.
# Added new modifications to recognize OS X frameworks and
# additional Unix paths (FreeBSD, etc).
# Also corrected the header search path to follow "proper" SDL guidelines.
# Added a search for SDLmain which is needed by some platforms.
# Added a search for threads which is needed by some platforms.
# Added needed compile switches for MinGW.
#
# On OSX, this will prefer the Framework version (if found) over others.
# People will have to manually change the cache values of
# SDL_LIBRARY to override this selection or set the CMake environment
# CMAKE_INCLUDE_PATH to modify the search paths.
#
# Note that the header path has changed from SDL/SDL.h to just SDL.h
# This needed to change because "proper" SDL convention
# is #include "SDL.h", not <SDL/SDL.h>. This is done for portability
# reasons because not all systems place things in SDL/ (see FreeBSD).
#=============================================================================
# Copyright 2003-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
FIND_PATH(SDL_INCLUDE_DIR SDL.h
HINTS
$ENV{SDLDIR}
PATH_SUFFIXES include/SDL include
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
)
#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
# SDL-1.1 is the name used by FreeBSD ports...
# don't confuse it for the version number.
FIND_LIBRARY(SDL_LIBRARY_TEMP
NAMES SDL SDL-1.1
HINTS
$ENV{SDLDIR}
PATH_SUFFIXES lib64 lib
PATHS
/sw
/opt/local
/opt/csw
/opt
)
#MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}")
IF(NOT SDL_BUILDING_LIBRARY)
IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
# Non-OS X framework versions expect you to also dynamically link to
# SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
# seem to provide SDLmain for compatibility even though they don't
# necessarily need it.
FIND_LIBRARY(SDLMAIN_LIBRARY
NAMES SDLmain SDLmain-1.1
HINTS
$ENV{SDLDIR}
PATH_SUFFIXES lib64 lib
PATHS
/sw
/opt/local
/opt/csw
/opt
)
ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
ENDIF(NOT SDL_BUILDING_LIBRARY)
# SDL may require threads on your system.
# The Apple build may not need an explicit flag because one of the
# frameworks may already provide it.
# But for non-OSX systems, I will use the CMake Threads package.
IF(NOT APPLE)
FIND_PACKAGE(Threads)
ENDIF(NOT APPLE)
# MinGW needs an additional library, mwindows
# It's total link flags should look like -lmingw32 -lSDLmain -lSDL -lmwindows
# (Actually on second look, I think it only needs one of the m* libraries.)
IF(MINGW)
SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
ENDIF(MINGW)
SET(SDL_FOUND "NO")
IF(SDL_LIBRARY_TEMP)
# For SDLmain
IF(NOT SDL_BUILDING_LIBRARY)
IF(SDLMAIN_LIBRARY)
SET(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
ENDIF(SDLMAIN_LIBRARY)
ENDIF(NOT SDL_BUILDING_LIBRARY)
# For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
# CMake doesn't display the -framework Cocoa string in the UI even
# though it actually is there if I modify a pre-used variable.
# I think it has something to do with the CACHE STRING.
# So I use a temporary variable until the end so I can set the
# "real" variable in one-shot.
IF(APPLE)
SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "-framework Cocoa")
ENDIF(APPLE)
# For threads, as mentioned Apple doesn't need this.
# In fact, there seems to be a problem if I used the Threads package
# and try using this line, so I'm just skipping it entirely for OS X.
IF(NOT APPLE)
SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
ENDIF(NOT APPLE)
# For MinGW library
IF(MINGW)
SET(SDL_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL_LIBRARY_TEMP})
ENDIF(MINGW)
# Set the final string here so the GUI reflects the final state.
SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
SET(SDL_LIBRARY_TEMP "${SDL_LIBRARY_TEMP}" CACHE INTERNAL "")
SET(SDL_FOUND "YES")
ENDIF(SDL_LIBRARY_TEMP)
#MESSAGE("SDL_LIBRARY is ${SDL_LIBRARY}")
Write Preview
Loading…
Cancel
Save