diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-04-23 15:30:50 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2015-02-20 09:18:29 +0100 |
commit | 0bbe5ac82ef2845efafbf190044f16712db113b2 (patch) | |
tree | ac8745fba01c8a3e902e886f46f90ad56576559f /src/output/winmm_output_plugin.c | |
parent | c69c8ffa9ec55c94dee7ce69af26b4edbd61647e (diff) |
Switch to Libav sample formats everywhere.
Drop 24bit format for now. It should be restored later by properly
distinguishing between internal and packed formats.
Diffstat (limited to 'src/output/winmm_output_plugin.c')
-rw-r--r-- | src/output/winmm_output_plugin.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/output/winmm_output_plugin.c b/src/output/winmm_output_plugin.c index 4d95834b..f2c9cb6a 100644 --- a/src/output/winmm_output_plugin.c +++ b/src/output/winmm_output_plugin.c @@ -28,6 +28,8 @@ #include <string.h> #include <windows.h> +#include <libavutil/samplefmt.h> + #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "winmm_output" @@ -157,15 +159,12 @@ winmm_output_open(struct audio_output *ao, struct audio_format *audio_format, } switch (audio_format->format) { - case SAMPLE_FORMAT_S8: - case SAMPLE_FORMAT_S16: + case AV_SAMPLE_FMT_U8: + case AV_SAMPLE_FMT_S16: break; - - case SAMPLE_FORMAT_S24_P32: - case SAMPLE_FORMAT_S32: - case SAMPLE_FORMAT_UNDEFINED: + default: /* we havn't tested formats other than S16 */ - audio_format->format = SAMPLE_FORMAT_S16; + audio_format->format = AV_SAMPLE_FMT_S16; break; } @@ -179,7 +178,7 @@ winmm_output_open(struct audio_output *ao, struct audio_format *audio_format, format.nSamplesPerSec = audio_format->sample_rate; format.nBlockAlign = audio_format_frame_size(audio_format); format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; - format.wBitsPerSample = audio_format_sample_size(audio_format) * 8; + format.wBitsPerSample = av_get_bytes_per_sample(audio_format->format) * 8; format.cbSize = 0; MMRESULT result = waveOutOpen(&wo->handle, wo->device_id, &format, |