mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 06:35:30 +00:00
Code Issues Projects Releases Wiki Activity

Move some definitions into the source file they're used in

Browse Source
This commit is contained in:
Chris Robinson 2012-12-14 04:12:34 -08:00
parent a6e627001a
commit 2f37d31108
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,9 +8,25 @@
#include "../mwsound/sound.hpp" #include "../mwsound/sound.hpp"
#define MAX_AUDIOQ_SIZE (5 * 16 * 1024)
#define MAX_VIDEOQ_SIZE (5 * 256 * 1024)
#define AV_SYNC_THRESHOLD 0.01
#define AV_NOSYNC_THRESHOLD 10.0
#define SAMPLE_CORRECTION_PERCENT_MAX 10
#define AUDIO_DIFF_AVG_NB 20
namespace MWRender namespace MWRender
{ {
enum {
AV_SYNC_AUDIO_MASTER,
AV_SYNC_VIDEO_MASTER,
AV_SYNC_EXTERNAL_MASTER,
AV_SYNC_DEFAULT = AV_SYNC_EXTERNAL_MASTER
};
void PacketQueue::put(AVPacket *pkt) void PacketQueue::put(AVPacket *pkt)
{ {
AVPacketList *pkt1; AVPacketList *pkt1;
@ -773,7 +789,7 @@ void VideoState::init(const std::string& resourceName)
int audio_index = -1; int audio_index = -1;
unsigned int i; unsigned int i;
this->av_sync_type = DEFAULT_AV_SYNC_TYPE; this->av_sync_type = AV_SYNC_DEFAULT;
this->videoStream = -1; this->videoStream = -1;
this->audioStream = -1; this->audioStream = -1;
this->refresh = false; this->refresh = false;

13
apps/openmw/mwrender/videoplayer.hpp
View File

@ -21,15 +21,7 @@ extern "C"
#include "../mwbase/soundmanager.hpp" #include "../mwbase/soundmanager.hpp"
#define MAX_AUDIOQ_SIZE (5 * 16 * 1024)
#define MAX_VIDEOQ_SIZE (5 * 256 * 1024)
#define AV_SYNC_THRESHOLD 0.01
#define AV_NOSYNC_THRESHOLD 10.0
#define SAMPLE_CORRECTION_PERCENT_MAX 10
#define AUDIO_DIFF_AVG_NB 20
#define VIDEO_PICTURE_QUEUE_SIZE 1 #define VIDEO_PICTURE_QUEUE_SIZE 1
#define DEFAULT_AV_SYNC_TYPE AV_SYNC_EXTERNAL_MASTER
namespace MWRender namespace MWRender
{ {
@ -147,11 +139,6 @@ namespace MWRender
int display_ready; int display_ready;
}; };
enum {
AV_SYNC_AUDIO_MASTER,
AV_SYNC_VIDEO_MASTER,
AV_SYNC_EXTERNAL_MASTER
};
class VideoPlayer class VideoPlayer