Commit 51139803 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '424b929b'

* commit '424b929b':
  pulse: Add a wallclock option to be compatible with other other captures

Conflicts:
	libavdevice/pulse_audio_dec.c

wallclock mode was supported and default in FFmpeg already before this commit.
its thus left the default
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c2c4cee8 424b929b
...@@ -48,6 +48,7 @@ typedef struct PulseData { ...@@ -48,6 +48,7 @@ typedef struct PulseData {
TimeFilter *timefilter; TimeFilter *timefilter;
int last_period; int last_period;
int wallclock;
} PulseData; } PulseData;
...@@ -311,7 +312,8 @@ static int pulse_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -311,7 +312,8 @@ static int pulse_read_packet(AVFormatContext *s, AVPacket *pkt)
dts += latency; dts += latency;
} else } else
dts -= latency; dts -= latency;
pkt->pts = ff_timefilter_update(pd->timefilter, dts, pd->last_period); if (pd->wallclock)
pkt->pts = ff_timefilter_update(pd->timefilter, dts, pd->last_period);
pd->last_period = frame_duration; pd->last_period = frame_duration;
} else { } else {
...@@ -346,6 +348,7 @@ static const AVOption options[] = { ...@@ -346,6 +348,7 @@ static const AVOption options[] = {
{ "channels", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = 2}, 1, INT_MAX, D }, { "channels", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = 2}, 1, INT_MAX, D },
{ "frame_size", "set number of bytes per frame", OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = 1024}, 1, INT_MAX, D }, { "frame_size", "set number of bytes per frame", OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = 1024}, 1, INT_MAX, D },
{ "fragment_size", "set buffering size, affects latency and cpu usage", OFFSET(fragment_size), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D }, { "fragment_size", "set buffering size, affects latency and cpu usage", OFFSET(fragment_size), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D },
{ "wallclock", "set the initial pts using the current time", OFFSET(wallclock), AV_OPT_TYPE_INT, {.i64 = 1}, -1, 1, D },
{ NULL }, { NULL },
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment