diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-22 13:31:47 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-22 13:31:47 +0000 |
| commit | 011198e5b6182245f05a15a8e85b7fde4c402e13 (patch) | |
| tree | 976302fadf0d30a661d56bb80e4339911656afac /src/media/UAudioConverter.pas | |
| parent | f3bc2f539e2de5e485762a3f953a6a60c748db63 (diff) | |
| download | usdx-011198e5b6182245f05a15a8e85b7fde4c402e13.tar.gz usdx-011198e5b6182245f05a15a8e85b7fde4c402e13.tar.xz usdx-011198e5b6182245f05a15a8e85b7fde4c402e13.zip | |
updates and extension for ffmpeg-0.8
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2867 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/media/UAudioConverter.pas')
| -rw-r--r-- | src/media/UAudioConverter.pas | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/media/UAudioConverter.pas b/src/media/UAudioConverter.pas index 657b80dd..696a01f6 100644 --- a/src/media/UAudioConverter.pas +++ b/src/media/UAudioConverter.pas @@ -42,6 +42,7 @@ uses {$ENDIF} {$IFDEF UseFFmpegResample} avcodec, + avutil, {$ENDIF} UMediaCore_SDL, sdl, @@ -124,6 +125,9 @@ type implementation +uses + UConfig; + function TAudioConverter_SDL.Init(srcFormatInfo: TAudioFormatInfo; dstFormatInfo: TAudioFormatInfo): boolean; var srcFormat: UInt16; @@ -219,9 +223,17 @@ begin Exit; end; + {$IF LIBAVCODEC_VERSION < 52122000} // 52.122.0 ResampleContext := audio_resample_init( dstFormatInfo.Channels, srcFormatInfo.Channels, Round(dstFormatInfo.SampleRate), Round(srcFormatInfo.SampleRate)); + {$ELSE} + ResampleContext := av_audio_resample_init( + dstFormatInfo.Channels, srcFormatInfo.Channels, + Round(dstFormatInfo.SampleRate), Round(srcFormatInfo.SampleRate), + AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, + 16, 10, 0, 0.8); + {$IFEND} if (ResampleContext = nil) then begin Log.LogError('audio_resample_init() failed', 'TAudioConverter_FFmpeg.Init'); |