virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

lavd/pulse_audio_enc: fix timestamp calculation

Browse Source 
Current implementation didn't include duration of
last processed packet.
Also remove access to st->cur_dts and replace with pkt->pts.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
This commit is contained in:
Lukasz Marek 2013-10-24 15:11:19 +02:00
parent 75b2bbe21d
commit e5b3b75669
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavdevice/pulse_audio_enc.c
View File

@ -35,6 +35,7 @@ typedef struct PulseData {
const char *device;
pa_simple *pa;
unsigned int stream_index;
int64_t timestamp;
} PulseData;
static av_cold int pulse_write_header(AVFormatContext *h)
@ -116,6 +117,19 @@ static int pulse_write_packet(AVFormatContext *h, AVPacket *pkt)
if (s->stream_index != pkt->stream_index)
return 0;
if (pkt->dts != AV_NOPTS_VALUE)
s->timestamp = pkt->dts;
if (pkt->duration) {
s->timestamp += pkt->duration;;
} else {
AVStream *st = h->streams[s->stream_index];
AVCodecContext *codec_ctx = st->codec;
AVRational r = { 1, codec_ctx->sample_rate };
int64_t samples = pkt->size / (av_get_bytes_per_sample(codec_ctx->sample_fmt) * codec_ctx->channels);
s->timestamp += av_rescale_q(samples, r, st->time_base);
}
if (pa_simple_write(s->pa, pkt->data, pkt->size, &error) < 0) {
av_log(s, AV_LOG_ERROR, "pa_simple_write failed: %s\n", pa_strerror(error));
return AVERROR(EIO);
@ -129,7 +143,7 @@ static void pulse_get_output_timestamp(AVFormatContext *h, int stream, int64_t *
PulseData *s = h->priv_data;
pa_usec_t latency = pa_simple_get_latency(s->pa, NULL);
*wall = av_gettime();
*dts = h->streams[s->stream_index]->cur_dts - latency;
*dts = s->timestamp - latency;
}
#define OFFSET(a) offsetof(PulseData, a)