highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '9fcc632249be3080836a3afce25b3092939743ac' into release/2.2

Browse Source 
* commit '9fcc632249be3080836a3afce25b3092939743ac':
  pulse: Add a wallclock option to be compatible with other other captures

Conflicts:
	libavdevice/pulse_audio_dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-20 14:40:54 +02:00
commit e940d15a98
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavdevice/pulse_audio_dec.c
View File

@ -30,6 +30,7 @@
#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/time.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "pulse_audio_common.h" #include "pulse_audio_common.h"
@ -47,6 +48,7 @@ typedef struct PulseData {
pa_simple *s; pa_simple *s;
int64_t pts; int64_t pts;
int64_t frame_duration; int64_t frame_duration;
int wallclock;
} PulseData; } PulseData;
static av_cold int pulse_read_header(AVFormatContext *s) static av_cold int pulse_read_header(AVFormatContext *s)
@ -131,6 +133,8 @@ static int pulse_read_packet(AVFormatContext *s, AVPacket *pkt)
} }
pd->pts = -latency; pd->pts = -latency;
if (pd->wallclock)
pd->pts += av_gettime();
} }
pkt->pts = pd->pts; pkt->pts = pd->pts;
@ -158,6 +162,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 },
}; };