mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 18:29:55 +00:00
Code Issues Releases Wiki Activity

Support for ubuntu/debian. Can easily be reverted if not required.

Browse source
This commit is contained in:
cc9cii 2014-09-04 07:58:46 +10:00
parent 093c7f8882
commit 801b9446b7
1 changed files with 38 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,16 +63,36 @@ extern "C" {
#include <libswresample/swresample.h> #include <libswresample/swresample.h>
} }
#else #else
/* some dummy definitions to make the code more legible */ /* nasty hack to support FLTP, but no other formats, on systems without libswresample */
int swr_init(int *n) { n = 0; return 1; } int swr_init(int *n) { return 1; }
int swr_convert(int *s, uint8_t** output, int outs, const uint8_t** input, int ins) int swr_convert(int *s, uint8_t** output, int outs, const uint8_t** input, int ins) {
{ return 1; } uint8_t *stream = *output;
float *outputStream = (float *)&stream[0];
float* inputChannel0 = (float *)input[0];
float* inputChannel1 = (float *)input[1];
float sample0, sample1 = 0;
for (unsigned int i = 0 ; i < (unsigned int)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, 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) { *s = 1; return s; } int64_t inc, AVSampleFormat inf, int inr, int o, void* l) {
void swr_free(int **n) { } if(inf == AV_SAMPLE_FMT_FLTP) {
s = new int;
*s = 1;
}
return s;
}
void swr_free(int **s) { delete *s; }
#define SwrContext int #define SwrContext int
#undef AV_SAMPLE_FMT_FLTP #undef AV_SAMPLE_FMT_U8P
#define AV_SAMPLE_FMT_FLTP 3 #define AV_SAMPLE_FMT_U8P 0
#undef AV_SAMPLE_FMT_S16P
#define AV_SAMPLE_FMT_S16P 1
#endif #endif
#define MAX_AUDIOQ_SIZE (5 * 16 * 1024) #define MAX_AUDIOQ_SIZE (5 * 16 * 1024)
@ -324,7 +344,7 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
SwrContext *mSwr; SwrContext *mSwr;
enum AVSampleFormat mOutputSampleFormat; enum AVSampleFormat mOutputSampleFormat;
uint8_t *mDataBuf; uint8_t *mDataBuf;
uint8_t **mData; uint8_t **mFrameData;
int mDataBufLen; int mDataBufLen;
AutoAVPacket mPacket; AutoAVPacket mPacket;
@ -410,10 +430,10 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
{ {
break; break;
} }
mData = &mDataBuf; mFrameData = &mDataBuf;
} }
else else
mData = &frame->data[0]; mFrameData = &frame->data[0];
mAudioClock += (double)frame->nb_samples / mAudioClock += (double)frame->nb_samples /
(double)mAVStream->codec->sample_rate; (double)mAVStream->codec->sample_rate;
@ -464,7 +484,7 @@ public:
, mSwr(0) , mSwr(0)
, mOutputSampleFormat(AV_SAMPLE_FMT_NONE) , mOutputSampleFormat(AV_SAMPLE_FMT_NONE)
, mDataBuf(NULL) , mDataBuf(NULL)
, mData(NULL) , mFrameData(NULL)
, mDataBufLen(0) , mDataBufLen(0)
{ } { }
virtual ~MovieAudioDecoder() virtual ~MovieAudioDecoder()
@ -578,7 +598,7 @@ public:
if(mFramePos >= 0) if(mFramePos >= 0)
{ {
len1 = std::min<size_t>(len1, mFrameSize-mFramePos); len1 = std::min<size_t>(len1, mFrameSize-mFramePos);
memcpy(stream, mData[0]+mFramePos, len1); memcpy(stream, mFrameData[0]+mFramePos, len1);
} }
else else
{ {
@ -589,29 +609,29 @@ public:
/* add samples by copying the first sample*/ /* add samples by copying the first sample*/
if(n == 1) if(n == 1)
memset(stream, *mData[0], len1); memset(stream, *mFrameData[0], len1);
else if(n == 2) else if(n == 2)
{ {
const int16_t val = *((int16_t*)mData[0]); const int16_t val = *((int16_t*)mFrameData[0]);
for(size_t nb = 0;nb < len1;nb += n) for(size_t nb = 0;nb < len1;nb += n)
*((int16_t*)(stream+nb)) = val; *((int16_t*)(stream+nb)) = val;
} }
else if(n == 4) else if(n == 4)
{ {
const int32_t val = *((int32_t*)mData[0]); const int32_t val = *((int32_t*)mFrameData[0]);
for(size_t nb = 0;nb < len1;nb += n) for(size_t nb = 0;nb < len1;nb += n)
*((int32_t*)(stream+nb)) = val; *((int32_t*)(stream+nb)) = val;
} }
else if(n == 8) else if(n == 8)
{ {
const int64_t val = *((int64_t*)mData[0]); const int64_t val = *((int64_t*)mFrameData[0]);
for(size_t nb = 0;nb < len1;nb += n) for(size_t nb = 0;nb < len1;nb += n)
*((int64_t*)(stream+nb)) = val; *((int64_t*)(stream+nb)) = val;
} }
else else
{ {
for(size_t nb = 0;nb < len1;nb += n) for(size_t nb = 0;nb < len1;nb += n)
memcpy(stream+nb, mData[0], n); memcpy(stream+nb, mFrameData[0], n);
} }
} }