diff options
Diffstat (limited to 'mediaplugin/src/mediaplugins/ffmpeg')
4 files changed, 9 insertions, 9 deletions
diff --git a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp index ce15f7a7..01dfdf1c 100644 --- a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp +++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp @@ -80,7 +80,7 @@ FFmpegAudioDecodeStream::FFmpegAudioDecodeStream() : memset(&_audioPaketTemp, 0, sizeof(_audioPaketTemp)); } -FFmpegAudioDecodeStream* FFmpegAudioDecodeStream::open(const IPath &filename) { +FFmpegAudioDecodeStream* FFmpegAudioDecodeStream::open(const Path &filename) { FFmpegAudioDecodeStream *stream = new FFmpegAudioDecodeStream(); if (!stream->_open(filename)) { delete stream; @@ -89,7 +89,7 @@ FFmpegAudioDecodeStream* FFmpegAudioDecodeStream::open(const IPath &filename) { return stream; } -bool FFmpegAudioDecodeStream::_open(const IPath &filename) { +bool FFmpegAudioDecodeStream::_open(const Path &filename) { _filename = filename; if (!filename.isFile()) { logger.error("Audio-file does not exist: '" + filename.toNative() + "'", "UAudio_FFmpeg"); diff --git a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.h b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.h index c0d1b288..93711dc5 100644 --- a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.h +++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.h @@ -87,7 +87,7 @@ private: int _audioBufferSize; DECLARE_ALIGNED(16, uint8_t, _audioBuffer[AUDIO_BUFFER_SIZE]); - IPath _filename; + Path _filename; private: FFmpegAudioDecodeStream(); @@ -119,7 +119,7 @@ private: int decodeFrame(uint8_t *buffer, int bufferSize); void flushCodecBuffers(); - bool _open(const IPath &filename); + bool _open(const Path &filename); void close(); public: @@ -127,7 +127,7 @@ public: close(); } - static FFmpegAudioDecodeStream* open(const IPath &filename); + static FFmpegAudioDecodeStream* open(const Path &filename); virtual double getLength(); diff --git a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp index ad34c7f3..4dbe6558 100644 --- a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp +++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp @@ -79,7 +79,7 @@ FFmpegVideoDecodeStream::FFmpegVideoDecodeStream() : _frameTime(0), _loopTime(0) {} -FFmpegVideoDecodeStream* FFmpegVideoDecodeStream::open(const IPath &filename, +FFmpegVideoDecodeStream* FFmpegVideoDecodeStream::open(const Path &filename, videoFrameFormat_t format) { FFmpegVideoDecodeStream *stream = new FFmpegVideoDecodeStream(); @@ -90,7 +90,7 @@ FFmpegVideoDecodeStream* FFmpegVideoDecodeStream::open(const IPath &filename, return stream; } -bool FFmpegVideoDecodeStream::_open(const IPath &filename, videoFrameFormat_t format) { +bool FFmpegVideoDecodeStream::_open(const Path &filename, videoFrameFormat_t format) { std::stringstream ss; // use custom 'ufile' protocol for UTF-8 support diff --git a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.h b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.h index addf2a82..59a46267 100644 --- a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.h +++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.h @@ -71,7 +71,7 @@ private: bool decodeFrame(); void synchronizeTime(AVFrame *frame, double &pts); - bool _open(const IPath &filename, videoFrameFormat_t format); + bool _open(const Path &filename, videoFrameFormat_t format); void close(); public: @@ -79,7 +79,7 @@ public: close(); } - static FFmpegVideoDecodeStream* open(const IPath &filename, videoFrameFormat_t format); + static FFmpegVideoDecodeStream* open(const Path &filename, videoFrameFormat_t format); virtual void setLoop(bool enable); virtual bool getLoop(); |