From cbadbf19fc8d4db35788a2de8af51de9f9d57578 Mon Sep 17 00:00:00 2001 From: Philip Gladstone Date: Mon, 17 Jun 2002 03:10:37 +0000 Subject: [PATCH] Change ticker_tick to use ticker_abs as we want the absolute number of ticks. In particular we want an INT64 return. Originally committed as revision 693 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 4 ++-- libav/asf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 3e7348303..7375b623d 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1055,7 +1055,7 @@ static int av_encode(AVFormatContext **output_files, switch(ist->st->codec.codec_type) { case CODEC_TYPE_AUDIO: //ist->pts = (INT64)1000000 * ist->sample_index / ist->st->codec.sample_rate; - ist->pts = ticker_tick(&ist->pts_ticker, ist->sample_index); + ist->pts = ticker_abs(&ist->pts_ticker, ist->sample_index); ist->sample_index += data_size / (2 * ist->st->codec.channels); ist->pts_increment = (INT64) (data_size / (2 * ist->st->codec.channels)) * 1000000 / ist->st->codec.sample_rate; break; @@ -1063,7 +1063,7 @@ static int av_encode(AVFormatContext **output_files, ist->frame_number++; //ist->pts = ((INT64)ist->frame_number * 1000000 * FRAME_RATE_BASE) / // ist->st->codec.frame_rate; - ist->pts = ticker_tick(&ist->pts_ticker, ist->frame_number); + ist->pts = ticker_abs(&ist->pts_ticker, ist->frame_number); ist->pts_increment = ((INT64) 1000000 * FRAME_RATE_BASE) / ist->st->codec.frame_rate; break; diff --git a/libav/asf.c b/libav/asf.c index a53654994..8dac626eb 100644 --- a/libav/asf.c +++ b/libav/asf.c @@ -578,11 +578,11 @@ static int asf_write_packet(AVFormatContext *s, int stream_index, stream = &asf->streams[stream_index]; if (codec->codec_type == CODEC_TYPE_AUDIO) { - timestamp = (int)ticker_tick(&stream->pts_ticker, codec->frame_number); + timestamp = (int)ticker_abs(&stream->pts_ticker, codec->frame_number); duration = (codec->frame_number * codec->frame_size * INT64_C(10000000)) / codec->sample_rate; } else { - timestamp = (int)ticker_tick(&stream->pts_ticker, codec->frame_number); + timestamp = (int)ticker_abs(&stream->pts_ticker, codec->frame_number); duration = codec->frame_number * ((INT64_C(10000000) * FRAME_RATE_BASE) / codec->frame_rate); } -- 2.11.0