generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavd/pulse_audio_enc: cosmetics

Browse Source
This commit is contained in:
Lukasz Marek 2014-04-18 01:10:20 +02:00
parent 176046d2b5
commit 10627e7e10
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavdevice/pulse_audio_enc.c
View File

@ -35,8 +35,8 @@ typedef struct PulseData {
const char *device; const char *device;
pa_simple *pa; pa_simple *pa;
int64_t timestamp; int64_t timestamp;
int buffer_size; int buffer_size; /**< Buffer size in bytes */
int buffer_duration; int buffer_duration; /**< Buffer size in ms, recalculated to buffer_size */
} PulseData; } PulseData;
static av_cold int pulse_write_header(AVFormatContext *h) static av_cold int pulse_write_header(AVFormatContext *h)
@ -44,8 +44,8 @@ static av_cold int pulse_write_header(AVFormatContext *h)
PulseData *s = h->priv_data; PulseData *s = h->priv_data;
AVStream *st = NULL; AVStream *st = NULL;
int ret; int ret;
pa_sample_spec ss; pa_sample_spec sample_spec;
pa_buffer_attr attr = { -1, -1, -1, -1, -1 }; pa_buffer_attr buffer_attributes = { -1, -1, -1, -1, -1 };
const char *stream_name = s->stream_name; const char *stream_name = s->stream_name;
if (h->nb_streams != 1 || h->streams[0]->codec->codec_type != AVMEDIA_TYPE_AUDIO) { if (h->nb_streams != 1 || h->streams[0]->codec->codec_type != AVMEDIA_TYPE_AUDIO) {
@ -66,26 +66,30 @@ static av_cold int pulse_write_header(AVFormatContext *h)
bytes *= st->codec->channels * st->codec->sample_rate * bytes *= st->codec->channels * st->codec->sample_rate *
av_get_bytes_per_sample(st->codec->sample_fmt); av_get_bytes_per_sample(st->codec->sample_fmt);
bytes /= 1000; bytes /= 1000;
attr.tlength = FFMAX(s->buffer_size, av_clip64(bytes, 0, UINT32_MAX - 1)); buffer_attributes.tlength = FFMAX(s->buffer_size, av_clip64(bytes, 0, UINT32_MAX - 1));
av_log(s, AV_LOG_DEBUG, av_log(s, AV_LOG_DEBUG,
"Buffer duration: %ums recalculated into %"PRId64" bytes buffer.\n", "Buffer duration: %ums recalculated into %"PRId64" bytes buffer.\n",
s->buffer_duration, bytes); s->buffer_duration, bytes);
av_log(s, AV_LOG_DEBUG, "Real buffer length is %u bytes\n", attr.tlength); av_log(s, AV_LOG_DEBUG, "Real buffer length is %u bytes\n", buffer_attributes.tlength);
} else if (s->buffer_size) } else if (s->buffer_size)
attr.tlength = s->buffer_size; buffer_attributes.tlength = s->buffer_size;
ss.format = ff_codec_id_to_pulse_format(st->codec->codec_id); sample_spec.format = ff_codec_id_to_pulse_format(st->codec->codec_id);
ss.rate = st->codec->sample_rate; sample_spec.rate = st->codec->sample_rate;
ss.channels = st->codec->channels; sample_spec.channels = st->codec->channels;
if (!pa_sample_spec_valid(&sample_spec)) {
av_log(s, AV_LOG_ERROR, "Invalid sample spec.\n");
return AVERROR(EINVAL);
}
s->pa = pa_simple_new(s->server, // Server s->pa = pa_simple_new(s->server, // Server
s->name, // Application name s->name, // Application name
PA_STREAM_PLAYBACK, PA_STREAM_PLAYBACK,
s->device, // Device s->device, // Device
stream_name, // Description of a stream stream_name, // Description of a stream
&ss, // Sample format &sample_spec, // Sample format
NULL, // Use default channel map NULL, // Use default channel map
&attr, // Buffering attributes &buffer_attributes, // Buffering attributes
&ret); // Result &ret); // Result
if (!s->pa) { if (!s->pa) {
@ -175,7 +179,6 @@ static int pulse_get_device_list(AVFormatContext *h, AVDeviceInfoList *device_li
#define OFFSET(a) offsetof(PulseData, a) #define OFFSET(a) offsetof(PulseData, a)
#define E AV_OPT_FLAG_ENCODING_PARAM #define E AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{ "server", "set PulseAudio server", OFFSET(server), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, { "server", "set PulseAudio server", OFFSET(server), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E },
{ "name", "set application name", OFFSET(name), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, E }, { "name", "set application name", OFFSET(name), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, E },
@ -187,7 +190,7 @@ static const AVOption options[] = {
}; };
static const AVClass pulse_muxer_class = { static const AVClass pulse_muxer_class = {
.class_name = "Pulse muxer", .class_name = "PulseAudio muxer",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,