Replace copy member in vo_frame_t with proc_frame and proc_slice. Increase video_out API version to 18.

CVS patchset: 5574
CVS date: 2003/10/22 20:38:09

2 files changed, 47 insertions, 47 deletions

diff --git a/src/libmpeg2/slice.c b/src/libmpeg2/slice.c
index 0d2fed055..0fe4ee2d9 100644
--- a/src/libmpeg2/slice.c
+++ b/src/libmpeg2/slice.c
@@ -1438,27 +1438,27 @@ do {								\
 		  mpeg2_mc.avg : mpeg2_mc.put));		\
 } while (0)
 
-#define NEXT_MACROBLOCK							\
-do {									\
-    picture->offset += 16;						\
-    if (picture->offset == picture->coded_picture_width) {		\
-	do { /* just so we can use the break statement */		\
-	    if (picture->current_frame->copy) {				\
-		picture->current_frame->copy (picture->current_frame,	\
-					      picture->dest);		\
-	    }								\
-	    picture->dest[0] += 16 * picture->pitches[0];		\
-	    picture->dest[1] += 8 * picture->pitches[1];		\
-	    picture->dest[2] += 8 * picture->pitches[2];		\
-	} while (0);							\
-	picture->v_offset += 16;					\
-	if (picture->v_offset > picture->limit_y) {			\
-	    if (mpeg2_cpu_state_restore)				\
-		mpeg2_cpu_state_restore (&cpu_state);			\
-	    return;							\
-	}								\
-	picture->offset = 0;						\
-    }									\
+#define NEXT_MACROBLOCK							    \
+do {									    \
+    picture->offset += 16;						    \
+    if (picture->offset == picture->coded_picture_width) {		    \
+	do { /* just so we can use the break statement */		    \
+	    if (picture->current_frame->proc_slice) {			    \
+		picture->current_frame->proc_slice (picture->current_frame, \
+						    picture->dest);	    \
+	    }								    \
+	    picture->dest[0] += 16 * picture->pitches[0];		    \
+	    picture->dest[1] += 8 * picture->pitches[1];		    \
+	    picture->dest[2] += 8 * picture->pitches[2];		    \
+	} while (0);							    \
+	picture->v_offset += 16;					    \
+	if (picture->v_offset > picture->limit_y) {			    \
+	    if (mpeg2_cpu_state_restore)				    \
+		mpeg2_cpu_state_restore (&cpu_state);			    \
+	    return;							    \
+	}								    \
+	picture->offset = 0;						    \
+    }									    \
 } while (0)
 
 static inline int slice_init (picture_t * picture, int code)
@@ -1605,7 +1605,7 @@ static inline int slice_init (picture_t * picture, int code)
 
     while (picture->offset - picture->coded_picture_width >= 0) {
 	picture->offset -= picture->coded_picture_width;
-	if ((picture->current_frame->copy == NULL) ||
+	if ((picture->current_frame->proc_slice == NULL) ||
 	    (picture->picture_coding_type != B_TYPE)) {
 	    picture->dest[0] += 16 * picture->pitches[0];
 	    picture->dest[1] += 8 * picture->pitches[1];
diff --git a/src/libmpeg2/slice_xvmc.c b/src/libmpeg2/slice_xvmc.c
index 3e63bd77b..cddc517c8 100644
--- a/src/libmpeg2/slice_xvmc.c
+++ b/src/libmpeg2/slice_xvmc.c
@@ -1530,29 +1530,29 @@ do {								\
 		  mpeg2_mc.avg : mpeg2_mc.put));		\
 } while (0)
 
-#define NEXT_MACROBLOCK							\
-do {									\
-    picture->offset += 16;						\
-    if (picture->offset == picture->coded_picture_width) {		\
-	do { /* just so we can use the break statement */		\
-	    if (picture->current_frame->copy) {				\
-		picture->current_frame->copy (picture->current_frame,	\
-					      picture->dest);		\
-		if (picture->picture_coding_type == B_TYPE)		\
-		    break;						\
-	    }								\
-	    picture->dest[0] += 16 * picture->pitches[0];		\
-	    picture->dest[1] += 8 * picture->pitches[1];		\
-	    picture->dest[2] += 8 * picture->pitches[2];		\
-	} while (0);							\
-	picture->v_offset += 16;					\
-	if (picture->v_offset > picture->limit_y) {			\
-	    if (mpeg2_cpu_state_restore)				\
-		mpeg2_cpu_state_restore (&cpu_state);			\
-	    return;							\
-	}								\
-	picture->offset = 0;						\
-    }									\
+#define NEXT_MACROBLOCK							    \
+do {									    \
+    picture->offset += 16;						    \
+    if (picture->offset == picture->coded_picture_width) {		    \
+	do { /* just so we can use the break statement */		    \
+	    if (picture->current_frame->proc_slice) {			    \
+		picture->current_frame->proc_slice (picture->current_frame, \
+					      picture->dest);		    \
+		if (picture->picture_coding_type == B_TYPE)		    \
+		    break;						    \
+	    }								    \
+	    picture->dest[0] += 16 * picture->pitches[0];		    \
+	    picture->dest[1] += 8 * picture->pitches[1];		    \
+	    picture->dest[2] += 8 * picture->pitches[2];		    \
+	} while (0);							    \
+	picture->v_offset += 16;					    \
+	if (picture->v_offset > picture->limit_y) {			    \
+	    if (mpeg2_cpu_state_restore)				    \
+		mpeg2_cpu_state_restore (&cpu_state);			    \
+	    return;							    \
+	}								    \
+	picture->offset = 0;						    \
+    }									    \
 } while (0)
 
 static inline int slice_xvmc_init (picture_t * picture, int code)
@@ -1634,7 +1634,7 @@ static inline int slice_xvmc_init (picture_t * picture, int code)
 
     picture->v_offset = (code - 1) * 16;
     offset = (code - 1);
-    if (picture->current_frame->copy && picture->picture_coding_type == B_TYPE)
+    if (picture->current_frame->proc_slice && picture->picture_coding_type == B_TYPE)
 	offset = 0;
     else if (picture->picture_structure != FRAME_PICTURE)
 	offset = 2 * offset;
@@ -1710,7 +1710,7 @@ static inline int slice_xvmc_init (picture_t * picture, int code)
 
     while (picture->offset - picture->coded_picture_width >= 0) {
 	picture->offset -= picture->coded_picture_width;
-	if ((picture->current_frame->copy == NULL) ||
+	if ((picture->current_frame->proc_slice == NULL) ||
 	    (picture->picture_coding_type != B_TYPE)) {
 	    picture->dest[0] += 16 * picture->pitches[0];
 	    picture->dest[1] += 8 * picture->pitches[1];