[FFmpeg-devel] [PATCH 4/7] Rename ff_dprintf_picref() to ff_dprintf_buffer_ref().

Stefano Sabatini stefano.sabatini-lala
Thu Aug 19 18:38:25 CEST 2010


The function is going to be used to represent also audio data.
---
 libavfilter/avfilter.c |   24 ++++++++++++------------
 libavfilter/internal.h |    2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 5bdd7a6..ec1650f 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -191,20 +191,20 @@ int avfilter_config_links(AVFilterContext *filter)
     return 0;
 }
 
-void ff_dprintf_picref(void *ctx, AVFilterBufferRef *picref, int end)
+void ff_dprintf_buffer_ref(void *ctx, AVFilterBufferRef *bufref, int end)
 {
     dprintf(ctx,
-            "picref[%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64,
-            picref,
-            picref->data[0],
-            picref->linesize[0], picref->linesize[1], picref->linesize[2], picref->linesize[3],
-            picref->pts, picref->pos);
+            "bufref[%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64,
+            bufref,
+            bufref->data[0],
+            bufref->linesize[0], bufref->linesize[1], bufref->linesize[2], bufref->linesize[3],
+            bufref->pts, bufref->pos);
 
-    if (picref->video) {
+    if (bufref->video) {
         dprintf(ctx, " a:%d/%d s:%dx%d i:%d tff:%d",
-                picref->video->pixel_aspect.num, picref->video->pixel_aspect.den,
-                picref->video->w, picref->video->h,
-                picref->video->interlaced, picref->video->top_field_first);
+                bufref->video->pixel_aspect.num, bufref->video->pixel_aspect.den,
+                bufref->video->w, bufref->video->h,
+                bufref->video->interlaced, bufref->video->top_field_first);
     }
     dprintf(ctx, "]%s", end ? "\n" : "");
 }
@@ -235,7 +235,7 @@ AVFilterBufferRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int
     if (ret)
         ret->type = AVMEDIA_TYPE_VIDEO;
 
-    FF_DPRINTF_START(NULL, get_video_buffer); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " returning "); ff_dprintf_picref(NULL, ret, 1);
+    FF_DPRINTF_START(NULL, get_video_buffer); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " returning "); ff_dprintf_buffer_ref(NULL, ret, 1);
 
     return ret;
 }
@@ -294,7 +294,7 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
     void (*start_frame)(AVFilterLink *, AVFilterBufferRef *);
     AVFilterPad *dst = &link_dpad(link);
 
-    FF_DPRINTF_START(NULL, start_frame); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " "); ff_dprintf_picref(NULL, picref, 1);
+    FF_DPRINTF_START(NULL, start_frame); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " "); ff_dprintf_buffer_ref(NULL, picref, 1);
 
     if (!(start_frame = dst->start_frame))
         start_frame = avfilter_default_start_frame;
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 3687726..089b7f3 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -26,7 +26,7 @@
 
 #include "avfilter.h"
 
-void ff_dprintf_picref(void *ctx, AVFilterBufferRef *picref, int end);
+void ff_dprintf_buffer_ref(void *ctx, AVFilterBufferRef *bufref, int end);
 
 void ff_dprintf_link(void *ctx, AVFilterLink *link, int end);
 
-- 
1.7.0.4




More information about the ffmpeg-devel mailing list