summaryrefslogtreecommitdiff
path: root/libavdevice/pulse_audio_dec.c
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki@gmail.com>2013-10-04 14:21:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-08 23:02:47 +0200
commit60136345e68066a8d75dcf5f3b2bcf2c91fc000e (patch)
tree99f9164efd529afd620a959d34c95890b6f5032f /libavdevice/pulse_audio_dec.c
parent1ab9f322ee53f2c094b3a4b4b1a78b9a3d96b369 (diff)
lavd/pulse: move common code to separate file
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/pulse_audio_dec.c')
-rw-r--r--libavdevice/pulse_audio_dec.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c
index b27329a1bd..21b3caa1c8 100644
--- a/libavdevice/pulse_audio_dec.c
+++ b/libavdevice/pulse_audio_dec.c
@@ -28,10 +28,10 @@
#include <pulse/simple.h>
#include <pulse/rtclock.h>
#include <pulse/error.h>
-
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
#include "libavutil/opt.h"
+#include "pulse_audio_common.h"
#define DEFAULT_CODEC_ID AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE)
@@ -49,23 +49,6 @@ typedef struct PulseData {
int64_t frame_duration;
} PulseData;
-static pa_sample_format_t codec_id_to_pulse_format(int codec_id) {
- switch (codec_id) {
- case AV_CODEC_ID_PCM_U8: return PA_SAMPLE_U8;
- case AV_CODEC_ID_PCM_ALAW: return PA_SAMPLE_ALAW;
- case AV_CODEC_ID_PCM_MULAW: return PA_SAMPLE_ULAW;
- case AV_CODEC_ID_PCM_S16LE: return PA_SAMPLE_S16LE;
- case AV_CODEC_ID_PCM_S16BE: return PA_SAMPLE_S16BE;
- case AV_CODEC_ID_PCM_F32LE: return PA_SAMPLE_FLOAT32LE;
- case AV_CODEC_ID_PCM_F32BE: return PA_SAMPLE_FLOAT32BE;
- case AV_CODEC_ID_PCM_S32LE: return PA_SAMPLE_S32LE;
- case AV_CODEC_ID_PCM_S32BE: return PA_SAMPLE_S32BE;
- case AV_CODEC_ID_PCM_S24LE: return PA_SAMPLE_S24LE;
- case AV_CODEC_ID_PCM_S24BE: return PA_SAMPLE_S24BE;
- default: return PA_SAMPLE_INVALID;
- }
-}
-
static av_cold int pulse_read_header(AVFormatContext *s)
{
PulseData *pd = s->priv_data;