Re: [FFmpeg-devel] [PATCH 1/5] lavfi: rename link.current_pts to current_pts_us.

[Michael Niedermayer]

On Sun, Nov 29, 2015 at 05:21:48PM +0100, Nicolas George wrote:
> 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.
> 
> Signed-off-by: Nicolas George 
> ---
>  libavfilter/avfilter.c  | 4 ++--
>  libavfilter/avfilter.h  | 2 +-
>  libavfilter/avfiltergraph.c | 6 +++---
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> 
> FATE passes after each patch in this series.
> 
> 
> Note: this patch and the next could have been merged, but having two
> separate patches allows to test the intermediate state and check that no use
> of current_pts was forgotten.

LGTM

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many that live deserve death. And some that die deserve life. Can you give
it to them? Then do not be too eager to deal out death in judgement. For
even the very wise cannot see all ends. -- Gandalf


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 1/5] lavfi: rename link.current_pts to current_pts_us.

[Nicolas George]

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.

Signed-off-by: Nicolas George 
---
 libavfilter/avfilter.c  | 4 ++--
 libavfilter/avfilter.h  | 2 +-
 libavfilter/avfiltergraph.c | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)


FATE passes after each patch in this series.


Note: this patch and the next could have been merged, but having two
separate patches allows to test the intermediate state and check that no use
of current_pts was forgotten.


diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index c5c3044..e583ec0 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -237,7 +237,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:
@@ -442,7 +442,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 7aac3cf..b756f56 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 d749250..ec2245f 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;
-- 
2.6.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel