mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 20:39:57 +00:00
Code Issues Releases Wiki Activity

Cleanup comments.

Browse source
This commit is contained in:
cc9cii 2014-08-31 23:39:17 +10:00
parent a7371eda4d
commit 68cbb8989e
1 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -315,13 +315,13 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
VideoState *mVideoState; VideoState *mVideoState;
AVStream *mAVStream; AVStream *mAVStream;
SwrContext *mSwr; /* non-zero indicates FLTP format */ SwrContext *mSwr;
int mSamplesAllChannels; int mSamplesAllChannels;
float mOutputSampleRatio; float mOutputSampleRatio;
enum AVSampleFormat mOutputSampleFormat; enum AVSampleFormat mOutputSampleFormat;
AutoAVPacket mPacket; AutoAVPacket mPacket;
AVFrame *mFrame; /* AVFrame is now defined in libavutil/frame.h (used to be libavcodec/avcodec.h) */ AVFrame *mFrame;
ssize_t mFramePos; ssize_t mFramePos;
ssize_t mFrameSize; ssize_t mFrameSize;
@ -523,32 +523,6 @@ public:
} }
} }
/*
* stream is a ptr to vector<char> on the stack, see OpenAL_SoundStream::process in
* mwsound/openal_output.cpp (around line 481)
*
* len is the size of the output buffer (i.e. stream) based on the number of
* channels, rate and sample type (as reported by getInfo).
*
* sample_skip is the number of bytes to skip (from all channels) or repeat (i.e. negative)
*
* mFrameSize is the number of bytes decoded audio frame (from all channels), or -1 if finished
*
*
* +---------------------------------------------------------------------------------+
* | |
* |<------------------------------------------ len -------------------------------->|
* | |
* |<------ mFrameSize ------>| |
* | |
* +---------------------------------------------------------------------------------+
* ^
* |
* mFramePos >= 0
*
* |<----- len1 -------->|
*
*/
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();
@ -604,7 +578,7 @@ public:
memcpy(stream, mFrame->data[0]+mFramePos, len1); memcpy(stream, mFrame->data[0]+mFramePos, len1);
} }
} }
else // repeat some samples FIXME: support ftlp else // FIXME: support ftlp
{ {
len1 = std::min<size_t>(len1, -mFramePos); len1 = std::min<size_t>(len1, -mFramePos);