diff options
| author | Nicolas George <george@nsup.org> | 2015-09-24 09:30:05 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2015-12-22 15:55:00 +0100 |
| commit | d03eab34dd8a0da63591b1fbc56149595d3907f7 (patch) | |
| tree | f60838fc0f84308c30a59262b7f2af6b893b5b43 /libavfilter | |
| parent | 63f7bee75221a205c97e0c3948bc24906653e1b7 (diff) | |
| download | ffmpeg-d03eab34dd8a0da63591b1fbc56149595d3907f7.tar.gz | |
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.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.c | 4 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 5d7bc09b86..fc6d49d909 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -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); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index dca02945f6..dec6a9198a 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -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. diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index d749250444..ec2245f15b 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -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; |