RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi: rename link.current_pts to current_pts_us. 

This field is used for fast comparison between link ages,
it is in AV_TIME_BASE units, in other words microseconds,
µs =~ us.
Renaming it allows a second field in link time base units.
This commit is contained in:
Nicolas George 2015-09-24 09:30:05 +02:00
parent 63f7bee752
commit d03eab34dd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/avfilter.c
View File

@ -238,7 +238,7 @@ int avfilter_config_links(AVFilterContext *filter)
}
inlink = link->src->nb_inputs ? link->src->inputs[0] : NULL;
link->current_pts = AV_NOPTS_VALUE;
link->current_pts_us = AV_NOPTS_VALUE;
switch (link->init_state) {
case AVLINK_INIT:
@ -443,7 +443,7 @@ void ff_update_link_current_pts(AVFilterLink *link, int64_t pts)
{
if (pts == AV_NOPTS_VALUE)
return;
link->current_pts = av_rescale_q(pts, link->time_base, AV_TIME_BASE_Q);
link->current_pts_us = av_rescale_q(pts, link->time_base, AV_TIME_BASE_Q);
/* TODO use duration */
if (link->graph && link->age_index >= 0)
ff_avfilter_graph_update_heap(link->graph, link);

2
libavfilter/avfilter.h
View File

@ -437,7 +437,7 @@ struct AVFilterLink {
* Current timestamp of the link, as defined by the most recent
* frame(s), in AV_TIME_BASE units.
*/
int64_t current_pts;
int64_t current_pts_us;
/**
* Index in the age array.

6
libavfilter/avfiltergraph.c
View File

@ -1324,7 +1324,7 @@ static void heap_bubble_up(AVFilterGraph *graph,
while (index) {
int parent = (index - 1) >> 1;
if (links[parent]->current_pts >= link->current_pts)
if (links[parent]->current_pts_us >= link->current_pts_us)
break;
links[index] = links[parent];
links[index]->age_index = index;
@ -1346,9 +1346,9 @@ static void heap_bubble_down(AVFilterGraph *graph,
if (child >= graph->sink_links_count)
break;
if (child + 1 < graph->sink_links_count &&
links[child + 1]->current_pts < links[child]->current_pts)
links[child + 1]->current_pts_us < links[child]->current_pts_us)
child++;
if (link->current_pts < links[child]->current_pts)
if (link->current_pts_us < links[child]->current_pts_us)
break;
links[index] = links[child];
links[index]->age_index = index;