aboutsummaryrefslogtreecommitdiffstats
path: root/mediaplugin/src/mediaplugins/ffmpeg
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_convert.h2
-rw-r--r--mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp2
-rw-r--r--mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp10
3 files changed, 7 insertions, 7 deletions
diff --git a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_convert.h b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_convert.h
index ee4c5a81..fbb5bedc 100644
--- a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_convert.h
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_convert.h
@@ -47,7 +47,7 @@ protected:
bool init() {
// Note: FFmpeg does not support resampling for more than 2 input channels
- if (_srcFormatInfo.getFormat() != asfS16) {
+ if (_srcFormatInfo.getFormat() != AUDIO_SAMPLE_FORMAT_S16) {
logger.error("Unsupported format", "TAudioConverter_FFmpeg.Init");
return false;
}
diff --git a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp
index da49891c..ce15f7a7 100644
--- a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_audio_decode.cpp
@@ -179,7 +179,7 @@ bool FFmpegAudioDecodeStream::_open(const IPath &filename) {
audioSampleFormat_t sampleFormat;
if (!ffmpegCore->convertFFmpegToAudioFormat(_codecCtx->sample_fmt, &sampleFormat)) {
// try standard format
- sampleFormat = asfS16;
+ sampleFormat = AUDIO_SAMPLE_FORMAT_S16;
}
if (_codecCtx->channels > 255) {
logger.status("Error: _codecCtx->channels > 255", "TFFmpegDecodeStream.Open");
diff --git a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp
index 79f353e1..506387ba 100644
--- a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp
@@ -165,20 +165,20 @@ int MediaCore_FFmpeg::findAudioStreamIndex(AVFormatContext *formatCtx) const {
bool MediaCore_FFmpeg::convertFFmpegToAudioFormat(SampleFormat ffmpegFormat, audioSampleFormat_t *format) const {
switch (ffmpegFormat) {
case SAMPLE_FMT_U8:
- *format = asfU8;
+ *format = AUDIO_SAMPLE_FORMAT_U8;
break;
case SAMPLE_FMT_S16:
- *format = asfS16;
+ *format = AUDIO_SAMPLE_FORMAT_S16;
break;
case SAMPLE_FMT_S32:
- *format = asfS32;
+ *format = AUDIO_SAMPLE_FORMAT_S32;
break;
case SAMPLE_FMT_FLT:
- *format = asfFloat;
+ *format = AUDIO_SAMPLE_FORMAT_FLOAT;
break;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(51,65,0)
case SAMPLE_FMT_DBL:
- *format = asfDouble;
+ *format = AUDIO_SAMPLE_FORMAT_DOUBLE;
break;
#endif
default: