[FFmpeg-cvslog] pulse: cosmetics
Luca Barbato
git at videolan.org
Sat Oct 22 02:20:54 CEST 2011
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Wed Oct 19 16:16:21 2011 -0700| [796cd225dabd3b53340b7c6defc5e5e654de23d7] | committer: Luca Barbato
pulse: cosmetics
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=796cd225dabd3b53340b7c6defc5e5e654de23d7
---
Changelog | 2 +-
libavdevice/pulse.c | 27 +++++++++++++--------------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/Changelog b/Changelog
index f61d3e2..6377f36 100644
--- a/Changelog
+++ b/Changelog
@@ -53,7 +53,7 @@ easier to use. The changes are:
- lut, lutrgb, and lutyuv filters
- boxblur filter
- Ut Video decoder
-
+- Pulseaudio input device
version 0.7:
diff --git a/libavdevice/pulse.c b/libavdevice/pulse.c
index f0d0571..32d3948 100644
--- a/libavdevice/pulse.c
+++ b/libavdevice/pulse.c
@@ -26,7 +26,6 @@
*
* This avdevice decoder allows to capture audio from a Pulseaudio device using
* the simple api.
- *
*/
#include <pulse/simple.h>
@@ -52,19 +51,19 @@ typedef struct PulseData {
} PulseData;
static pa_sample_format_t codec_id_to_pulse_format(int codec_id) {
- switch(codec_id) {
- case CODEC_ID_PCM_U8: return PA_SAMPLE_U8;
- case CODEC_ID_PCM_ALAW: return PA_SAMPLE_ALAW;
- case CODEC_ID_PCM_MULAW: return PA_SAMPLE_ULAW;
- case CODEC_ID_PCM_S16LE: return PA_SAMPLE_S16LE;
- case CODEC_ID_PCM_S16BE: return PA_SAMPLE_S16BE;
- case CODEC_ID_PCM_F32LE: return PA_SAMPLE_FLOAT32LE;
- case CODEC_ID_PCM_F32BE: return PA_SAMPLE_FLOAT32BE;
- case CODEC_ID_PCM_S32LE: return PA_SAMPLE_S32LE;
- case CODEC_ID_PCM_S32BE: return PA_SAMPLE_S32BE;
- case CODEC_ID_PCM_S24LE: return PA_SAMPLE_S24LE;
- case CODEC_ID_PCM_S24BE: return PA_SAMPLE_S24BE;
- default: return PA_SAMPLE_INVALID;
+ switch (codec_id) {
+ case CODEC_ID_PCM_U8: return PA_SAMPLE_U8;
+ case CODEC_ID_PCM_ALAW: return PA_SAMPLE_ALAW;
+ case CODEC_ID_PCM_MULAW: return PA_SAMPLE_ULAW;
+ case CODEC_ID_PCM_S16LE: return PA_SAMPLE_S16LE;
+ case CODEC_ID_PCM_S16BE: return PA_SAMPLE_S16BE;
+ case CODEC_ID_PCM_F32LE: return PA_SAMPLE_FLOAT32LE;
+ case CODEC_ID_PCM_F32BE: return PA_SAMPLE_FLOAT32BE;
+ case CODEC_ID_PCM_S32LE: return PA_SAMPLE_S32LE;
+ case CODEC_ID_PCM_S32BE: return PA_SAMPLE_S32BE;
+ case CODEC_ID_PCM_S24LE: return PA_SAMPLE_S24LE;
+ case CODEC_ID_PCM_S24BE: return PA_SAMPLE_S24BE;
+ default: return PA_SAMPLE_INVALID;
}
}
More information about the ffmpeg-cvslog
mailing list