mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-24 05:09:44 +00:00
Code Issues Releases Wiki Activity

More cleanup.

Browse source
This commit is contained in:
cc9cii 2014-09-01 08:04:28 +10:00
parent fdee660ffb
commit 0b9d17a81d
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -317,7 +317,6 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
SwrContext *mSwr; SwrContext *mSwr;
int mSamplesAllChannels; int mSamplesAllChannels;
float mOutputSampleRatio;
enum AVSampleFormat mOutputSampleFormat; enum AVSampleFormat mOutputSampleFormat;
AutoAVPacket mPacket; AutoAVPacket mPacket;
@ -438,7 +437,6 @@ public:
, mAudioDiffAvgCount(0) , mAudioDiffAvgCount(0)
, mSwr(0) , mSwr(0)
, mSamplesAllChannels(0) , mSamplesAllChannels(0)
, mOutputSampleRatio(1)
, mOutputSampleFormat(AV_SAMPLE_FMT_NONE) , mOutputSampleFormat(AV_SAMPLE_FMT_NONE)
{ } { }
virtual ~MovieAudioDecoder() virtual ~MovieAudioDecoder()
@ -524,16 +522,12 @@ public:
mSamplesAllChannels = av_get_bytes_per_sample(mOutputSampleFormat) mSamplesAllChannels = av_get_bytes_per_sample(mOutputSampleFormat)
* mAVStream->codec->channels; * mAVStream->codec->channels;
/* only required if output sample format size is different to input */
//mOutputSampleRatio = av_get_bytes_per_sample(mAVStream->codec->sample_fmt)
/// av_get_bytes_per_sample(mOutputSampleFormat);
} }
} }
size_t read(char *stream, size_t len) size_t read(char *stream, size_t len)
{ {
int sample_skip = synchronize_audio(); int sample_skip = synchronize_audio();
//if(mSwr) sample_skip /= mOutputSampleRatio;
size_t total = 0; size_t total = 0;
while(total < len) while(total < len)
@ -547,7 +541,6 @@ public:
/* If error, we're done */ /* If error, we're done */
break; break;
} }
//if(mSwr) mFrameSize /= mOutputSampleRatio;
mFramePos = std::min<ssize_t>(mFrameSize, sample_skip); mFramePos = std::min<ssize_t>(mFrameSize, sample_skip);
sample_skip -= mFramePos; sample_skip -= mFramePos;