mirror of https://git.ffmpeg.org/ffmpeg.git
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>
This commit is contained in:
parent
1ab9f322ee
commit
60136345e6
|
@ -30,8 +30,10 @@ OBJS-$(CONFIG_LAVFI_INDEV) += lavfi.o
|
||||||
OBJS-$(CONFIG_OPENAL_INDEV) += openal-dec.o
|
OBJS-$(CONFIG_OPENAL_INDEV) += openal-dec.o
|
||||||
OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o
|
OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o
|
||||||
OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o
|
OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o
|
||||||
OBJS-$(CONFIG_PULSE_INDEV) += pulse_audio_dec.o
|
OBJS-$(CONFIG_PULSE_INDEV) += pulse_audio_dec.o \
|
||||||
OBJS-$(CONFIG_PULSE_OUTDEV) += pulse_audio_enc.o
|
pulse_audio_common.o
|
||||||
|
OBJS-$(CONFIG_PULSE_OUTDEV) += pulse_audio_enc.o \
|
||||||
|
pulse_audio_common.o
|
||||||
OBJS-$(CONFIG_SDL_OUTDEV) += sdl.o
|
OBJS-$(CONFIG_SDL_OUTDEV) += sdl.o
|
||||||
OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o
|
OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o
|
||||||
OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o
|
OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
/*
|
||||||
|
* Pulseaudio input
|
||||||
|
* Copyright (c) 2011 Luca Barbato <lu_zero@gentoo.org>
|
||||||
|
*
|
||||||
|
* This file is part of FFmpeg.
|
||||||
|
*
|
||||||
|
* FFmpeg is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* FFmpeg is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with FFmpeg; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "libavutil/attributes.h"
|
||||||
|
#include "libavcodec/avcodec.h"
|
||||||
|
#include "pulse_audio_common.h"
|
||||||
|
|
||||||
|
pa_sample_format_t av_cold 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;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,29 @@
|
||||||
|
/*
|
||||||
|
* Pulseaudio input
|
||||||
|
* Copyright (c) 2011 Luca Barbato <lu_zero@gentoo.org>
|
||||||
|
*
|
||||||
|
* This file is part of FFmpeg.
|
||||||
|
*
|
||||||
|
* FFmpeg is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* FFmpeg is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with FFmpeg; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef AVDEVICE_PULSE_AUDIO_COMMON_H
|
||||||
|
#define AVDEVICE_PULSE_AUDIO_COMMON_H
|
||||||
|
|
||||||
|
#include <pulse/simple.h>
|
||||||
|
|
||||||
|
pa_sample_format_t codec_id_to_pulse_format(int codec_id);
|
||||||
|
|
||||||
|
#endif /* AVDEVICE_PULSE_AUDIO_COMMON_H */
|
|
@ -28,10 +28,10 @@
|
||||||
#include <pulse/simple.h>
|
#include <pulse/simple.h>
|
||||||
#include <pulse/rtclock.h>
|
#include <pulse/rtclock.h>
|
||||||
#include <pulse/error.h>
|
#include <pulse/error.h>
|
||||||
|
|
||||||
#include "libavformat/avformat.h"
|
#include "libavformat/avformat.h"
|
||||||
#include "libavformat/internal.h"
|
#include "libavformat/internal.h"
|
||||||
#include "libavutil/opt.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)
|
#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;
|
int64_t frame_duration;
|
||||||
} PulseData;
|
} 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)
|
static av_cold int pulse_read_header(AVFormatContext *s)
|
||||||
{
|
{
|
||||||
PulseData *pd = s->priv_data;
|
PulseData *pd = s->priv_data;
|
||||||
|
|
|
@ -20,11 +20,12 @@
|
||||||
|
|
||||||
#include <pulse/simple.h>
|
#include <pulse/simple.h>
|
||||||
#include <pulse/error.h>
|
#include <pulse/error.h>
|
||||||
|
#include "libavformat/avformat.h"
|
||||||
|
#include "libavformat/internal.h"
|
||||||
#include "libavutil/opt.h"
|
#include "libavutil/opt.h"
|
||||||
#include "libavutil/time.h"
|
#include "libavutil/time.h"
|
||||||
#include "libavutil/log.h"
|
#include "libavutil/log.h"
|
||||||
#include "libavformat/avformat.h"
|
#include "pulse_audio_common.h"
|
||||||
#include "libavformat/internal.h"
|
|
||||||
|
|
||||||
typedef struct PulseData {
|
typedef struct PulseData {
|
||||||
AVClass *class;
|
AVClass *class;
|
||||||
|
@ -36,24 +37,6 @@ typedef struct PulseData {
|
||||||
unsigned int stream_index;
|
unsigned int stream_index;
|
||||||
} PulseData;
|
} PulseData;
|
||||||
|
|
||||||
static pa_sample_format_t codec_id_to_pulse_format(enum AVCodecID 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_write_header(AVFormatContext *h)
|
static av_cold int pulse_write_header(AVFormatContext *h)
|
||||||
{
|
{
|
||||||
PulseData *s = h->priv_data;
|
PulseData *s = h->priv_data;
|
||||||
|
|
Loading…
Reference in New Issue