[FFmpeg-cvslog] r25649 - in trunk/libavfilter: vf_blackframe.c vf_cropdetect.c vf_frei0r.c

[stefano]

Author: stefano
Date: Tue Nov  2 20:42:08 2010
New Revision: 25649

Log:
Fix timestamp handling in more filters after the change which set the
timebase in the filter link.

Modified:
   trunk/libavfilter/vf_blackframe.c
   trunk/libavfilter/vf_cropdetect.c
   trunk/libavfilter/vf_frei0r.c

Modified: trunk/libavfilter/vf_blackframe.c
==============================================================================
--- trunk/libavfilter/vf_blackframe.c	Tue Nov  2 20:42:05 2010	(r25648)
+++ trunk/libavfilter/vf_blackframe.c	Tue Nov  2 20:42:08 2010	(r25649)
@@ -99,7 +99,7 @@ static void end_frame(AVFilterLink *inli
     if (pblack >= blackframe->bamount)
         av_log(ctx, AV_LOG_INFO, "frame:%u pblack:%u pos:%"PRId64" pts:%"PRId64" t:%f\n",
                blackframe->frame, pblack, picref->pos, picref->pts,
-               picref->pts == AV_NOPTS_VALUE ? -1 : (double)picref->pts / AV_TIME_BASE);
+               picref->pts == AV_NOPTS_VALUE ? -1 : picref->pts * av_q2d(inlink->time_base));
 
     blackframe->frame++;
     blackframe->nblack = 0;

Modified: trunk/libavfilter/vf_cropdetect.c
==============================================================================
--- trunk/libavfilter/vf_cropdetect.c	Tue Nov  2 20:42:05 2010	(r25648)
+++ trunk/libavfilter/vf_cropdetect.c	Tue Nov  2 20:42:08 2010	(r25649)
@@ -184,7 +184,7 @@ static void end_frame(AVFilterLink *inli
         av_log(ctx, AV_LOG_INFO,
                "x1:%d x2:%d y1:%d y2:%d w:%d h:%d x:%d y:%d pos:%"PRId64" pts:%"PRId64" t:%f crop=%d:%d:%d:%d\n",
                cd->x1, cd->x2, cd->y1, cd->y2, w, h, x, y, picref->pos, picref->pts,
-               picref->pts == AV_NOPTS_VALUE ? -1 : (double)picref->pts / AV_TIME_BASE,
+               picref->pts == AV_NOPTS_VALUE ? -1 : picref->pts * av_q2d(inlink->time_base),
                w, h, x, y);
     }
 

Modified: trunk/libavfilter/vf_frei0r.c
==============================================================================
--- trunk/libavfilter/vf_frei0r.c	Tue Nov  2 20:42:05 2010	(r25648)
+++ trunk/libavfilter/vf_frei0r.c	Tue Nov  2 20:42:08 2010	(r25649)
@@ -330,7 +330,7 @@ static void end_frame(AVFilterLink *inli
     AVFilterBufferRef  *inpicref =  inlink->cur_buf;
     AVFilterBufferRef *outpicref = outlink->out_buf;
 
-    frei0r->update(frei0r->instance, (double)inpicref->pts / AV_TIME_BASE,
+    frei0r->update(frei0r->instance, inpicref->pts * av_q2d(inlink->time_base) * 1000,
                    (const uint32_t *)inpicref->data[0],
                    (uint32_t *)outpicref->data[0]);
     avfilter_unref_buffer(inpicref);