[FFmpeg-devel] [misc-filters PATCH] Rename AVFilterPicRef fields:

Stefano Sabatini stefano.sabatini-lala
Sun Jul 18 01:06:22 CEST 2010


The new names are more consistent.
---
 libavfilter/avfilter.c |   20 ++++++++++----------
 libavfilter/avfilter.h |    4 ++--
 libavfilter/defaults.c |   12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index f442cdc..b8e56af 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -262,8 +262,8 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
         */
 
         link->cur_pic = avfilter_default_get_video_buffer(link, dst->min_perms, link->w, link->h);
-        link->srcpic = picref;
-        avfilter_copy_picref_props(link->cur_pic, link->srcpic);
+        link->src_pic = picref;
+        avfilter_copy_picref_props(link->cur_pic, link->src_pic);
     }
     else
         link->cur_pic = picref;
@@ -282,9 +282,9 @@ void avfilter_end_frame(AVFilterLink *link)
 
     /* unreference the source picture if we're feeding the destination filter
      * a copied version dues to permission issues */
-    if(link->srcpic) {
-        avfilter_unref_pic(link->srcpic);
-        link->srcpic = NULL;
+    if(link->src_pic) {
+        avfilter_unref_pic(link->src_pic);
+        link->src_pic = NULL;
     }
 
 }
@@ -298,13 +298,13 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
     DPRINTF_START(NULL, draw_slice); dprintf_link(NULL, link, 0); dprintf(NULL, " y:%d h:%d dir:%d\n", y, h, slice_dir);
 
     /* copy the slice if needed for permission reasons */
-    if(link->srcpic) {
+    if(link->src_pic) {
         vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
 
         for(i = 0; i < 4; i ++) {
-            if(link->srcpic->data[i]) {
-                src[i] = link->srcpic-> data[i] +
-                    (y >> (i==0 ? 0 : vsub)) * link->srcpic-> linesize[i];
+            if(link->src_pic->data[i]) {
+                src[i] = link->src_pic-> data[i] +
+                    (y >> (i==0 ? 0 : vsub)) * link->src_pic-> linesize[i];
                 dst[i] = link->cur_pic->data[i] +
                     (y >> (i==0 ? 0 : vsub)) * link->cur_pic->linesize[i];
             } else
@@ -319,7 +319,7 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
 
             for(j = 0; j < h >> (i==0 ? 0 : vsub); j ++) {
                 memcpy(dst[i], src[i], planew);
-                src[i] += link->srcpic ->linesize[i];
+                src[i] += link->src_pic ->linesize[i];
                 dst[i] += link->cur_pic->linesize[i];
             }
         }
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 3737d46..8259fa6 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -526,10 +526,10 @@ struct AVFilterLink
      * for the destination. This should not be accessed directly by the
      * filters.
      */
-    AVFilterPicRef *srcpic;
+    AVFilterPicRef *src_pic;
 
     AVFilterPicRef *cur_pic;
-    AVFilterPicRef *outpic;
+    AVFilterPicRef *dst_pic;
 };
 
 /**
diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
index ed1db94..167f2b2 100644
--- a/libavfilter/defaults.c
+++ b/libavfilter/defaults.c
@@ -73,9 +73,9 @@ void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
         out = link->dst->outputs[0];
 
     if(out) {
-        out->outpic      = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
-        avfilter_copy_picref_props(out->outpic, picref);
-        avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0));
+        out->dst_pic      = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
+        avfilter_copy_picref_props(out->dst_pic, picref);
+        avfilter_start_frame(out, avfilter_ref_pic(out->dst_pic, ~0));
     }
 }
 
@@ -101,9 +101,9 @@ void avfilter_default_end_frame(AVFilterLink *link)
     link->cur_pic = NULL;
 
     if(out) {
-        if(out->outpic) {
-            avfilter_unref_pic(out->outpic);
-            out->outpic = NULL;
+        if(out->dst_pic) {
+            avfilter_unref_pic(out->dst_pic);
+            out->dst_pic = NULL;
         }
         avfilter_end_frame(out);
     }
-- 
1.6.0.4




More information about the ffmpeg-devel mailing list