- sync with mpeg2dec 0.2.1

- small changes to frame freeing logic

CVS patchset: 1655
CVS date: 2002/04/01 13:18:21

1 files changed, 36 insertions, 35 deletions

diff --git a/src/libmpeg2/motion_comp_mlib.c b/src/libmpeg2/motion_comp_mlib.c
index 91c0fb5a8..eaf27d9f2 100644
--- a/src/libmpeg2/motion_comp_mlib.c
+++ b/src/libmpeg2/motion_comp_mlib.c
@@ -1,8 +1,9 @@
 /*
  * motion_comp_mlib.c
- * Copyright (C) 2000-2001 Håkan Hjort <d95hjort@dtek.chalmers.se>
+ * Copyright (C) 2000-2002 Håkan Hjort <d95hjort@dtek.chalmers.se>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
+ * See http://libmpeg2.sourceforge.net/ for updates.
  *
  * mpeg2dec is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,16 +24,16 @@
 
 #ifdef LIBMPEG2_MLIB
 
-#include <inttypes.h>
 #include <mlib_types.h>
 #include <mlib_status.h>
 #include <mlib_sys.h>
 #include <mlib_video.h>
+#include <inttypes.h>
 
 #include "mpeg2_internal.h"
 
-static void MC_put_16_mlib (uint8_t * dest, uint8_t * ref,
-			    int stride, int height)
+static void MC_put_o_16_mlib (uint8_t * dest, uint8_t * ref,
+			      int stride, int height)
 {
     if (height == 16) 
 	mlib_VideoCopyRef_U8_U8_16x16 (dest, ref, stride);
@@ -40,8 +41,8 @@ static void MC_put_16_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoCopyRef_U8_U8_16x8 (dest, ref, stride);
 }
 
-static void MC_put_x16_mlib (uint8_t * dest, uint8_t * ref,
-			     int stride, int height)
+static void MC_put_x_16_mlib (uint8_t * dest, uint8_t * ref,
+			      int stride, int height)
 {
     if (height == 16)
 	mlib_VideoInterpX_U8_U8_16x16 (dest, ref, stride, stride);
@@ -49,8 +50,8 @@ static void MC_put_x16_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpX_U8_U8_16x8 (dest, ref, stride, stride);
 }
 
-static void MC_put_y16_mlib (uint8_t * dest, uint8_t * ref,
-			     int stride, int height)
+static void MC_put_y_16_mlib (uint8_t * dest, uint8_t * ref,
+			      int stride, int height)
 {
     if (height == 16)
 	mlib_VideoInterpY_U8_U8_16x16 (dest, ref, stride, stride);
@@ -58,8 +59,8 @@ static void MC_put_y16_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpY_U8_U8_16x8 (dest, ref, stride, stride);
 }
 
-static void MC_put_xy16_mlib (uint8_t * dest, uint8_t * ref,
-			      int stride, int height)
+static void MC_put_xy_16_mlib (uint8_t * dest, uint8_t * ref,
+			       int stride, int height)
 {
     if (height == 16)
 	mlib_VideoInterpXY_U8_U8_16x16 (dest, ref, stride, stride);
@@ -67,8 +68,8 @@ static void MC_put_xy16_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpXY_U8_U8_16x8 (dest, ref, stride, stride);
 }
 
-static void MC_put_8_mlib (uint8_t * dest, uint8_t * ref,
-			   int stride, int height)
+static void MC_put_o_8_mlib (uint8_t * dest, uint8_t * ref,
+			     int stride, int height)
 {
     if (height == 8)
 	mlib_VideoCopyRef_U8_U8_8x8 (dest, ref, stride);
@@ -76,8 +77,8 @@ static void MC_put_8_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoCopyRef_U8_U8_8x4 (dest, ref, stride);
 }
 
-static void MC_put_x8_mlib (uint8_t * dest, uint8_t * ref,
-			    int stride, int height)
+static void MC_put_x_8_mlib (uint8_t * dest, uint8_t * ref,
+			     int stride, int height)
 {
     if (height == 8)
 	mlib_VideoInterpX_U8_U8_8x8 (dest, ref, stride, stride);
@@ -85,8 +86,8 @@ static void MC_put_x8_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpX_U8_U8_8x4 (dest, ref, stride, stride);
 }
 
-static void MC_put_y8_mlib (uint8_t * dest, uint8_t * ref,
-			    int stride, int height)
+static void MC_put_y_8_mlib (uint8_t * dest, uint8_t * ref,
+			     int stride, int height)
 {
     if (height == 8)
 	mlib_VideoInterpY_U8_U8_8x8 (dest, ref, stride, stride);
@@ -94,8 +95,8 @@ static void MC_put_y8_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpY_U8_U8_8x4 (dest, ref, stride, stride);
 }
 
-static void MC_put_xy8_mlib (uint8_t * dest, uint8_t * ref,
-			     int stride, int height)
+static void MC_put_xy_8_mlib (uint8_t * dest, uint8_t * ref,
+			      int stride, int height)
 {
     if (height == 8) 
 	mlib_VideoInterpXY_U8_U8_8x8 (dest, ref, stride, stride);
@@ -103,8 +104,8 @@ static void MC_put_xy8_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpXY_U8_U8_8x4 (dest, ref, stride, stride);
 }
 
-static void MC_avg_16_mlib (uint8_t * dest, uint8_t * ref,
-			    int stride, int height)
+static void MC_avg_o_16_mlib (uint8_t * dest, uint8_t * ref,
+			      int stride, int height)
 {
     if (height == 16)
 	mlib_VideoCopyRefAve_U8_U8_16x16 (dest, ref, stride);
@@ -112,8 +113,8 @@ static void MC_avg_16_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoCopyRefAve_U8_U8_16x8 (dest, ref, stride);
 }
 
-static void MC_avg_x16_mlib (uint8_t * dest, uint8_t * ref,
-			     int stride, int height)
+static void MC_avg_x_16_mlib (uint8_t * dest, uint8_t * ref,
+			      int stride, int height)
 {
     if (height == 16)
 	mlib_VideoInterpAveX_U8_U8_16x16 (dest, ref, stride, stride);
@@ -121,8 +122,8 @@ static void MC_avg_x16_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpAveX_U8_U8_16x8 (dest, ref, stride, stride);
 }
 
-static void MC_avg_y16_mlib (uint8_t * dest, uint8_t * ref,
-			     int stride, int height)
+static void MC_avg_y_16_mlib (uint8_t * dest, uint8_t * ref,
+			      int stride, int height)
 {
     if (height == 16)
 	mlib_VideoInterpAveY_U8_U8_16x16 (dest, ref, stride, stride);
@@ -130,8 +131,8 @@ static void MC_avg_y16_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpAveY_U8_U8_16x8 (dest, ref, stride, stride);
 }
 
-static void MC_avg_xy16_mlib (uint8_t * dest, uint8_t * ref,
-			      int stride, int height)
+static void MC_avg_xy_16_mlib (uint8_t * dest, uint8_t * ref,
+			       int stride, int height)
 {
     if (height == 16)
 	mlib_VideoInterpAveXY_U8_U8_16x16 (dest, ref, stride, stride);
@@ -139,8 +140,8 @@ static void MC_avg_xy16_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpAveXY_U8_U8_16x8 (dest, ref, stride, stride);
 }
 
-static void MC_avg_8_mlib (uint8_t * dest, uint8_t * ref,
-			   int stride, int height)
+static void MC_avg_o_8_mlib (uint8_t * dest, uint8_t * ref,
+			     int stride, int height)
 {
     if (height == 8)
 	mlib_VideoCopyRefAve_U8_U8_8x8 (dest, ref, stride);
@@ -148,8 +149,8 @@ static void MC_avg_8_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoCopyRefAve_U8_U8_8x4 (dest, ref, stride);
 }
 
-static void MC_avg_x8_mlib (uint8_t * dest, uint8_t * ref,
-			    int stride, int height)
+static void MC_avg_x_8_mlib (uint8_t * dest, uint8_t * ref,
+			     int stride, int height)
 {
     if (height == 8)
 	mlib_VideoInterpAveX_U8_U8_8x8 (dest, ref, stride, stride);
@@ -157,8 +158,8 @@ static void MC_avg_x8_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpAveX_U8_U8_8x4 (dest, ref, stride, stride);
 }
 
-static void MC_avg_y8_mlib (uint8_t * dest, uint8_t * ref,
-			    int stride, int height)
+static void MC_avg_y_8_mlib (uint8_t * dest, uint8_t * ref,
+			     int stride, int height)
 {
     if (height == 8)
 	mlib_VideoInterpAveY_U8_U8_8x8 (dest, ref, stride, stride);
@@ -166,8 +167,8 @@ static void MC_avg_y8_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpAveY_U8_U8_8x4 (dest, ref, stride, stride);
 }
 
-static void MC_avg_xy8_mlib (uint8_t * dest, uint8_t * ref,
-			     int stride, int height)
+static void MC_avg_xy_8_mlib (uint8_t * dest, uint8_t * ref,
+			      int stride, int height)
 {
     if (height == 8)
 	mlib_VideoInterpAveXY_U8_U8_8x8 (dest, ref, stride, stride);
@@ -175,6 +176,6 @@ static void MC_avg_xy8_mlib (uint8_t * dest, uint8_t * ref,
 	mlib_VideoInterpAveXY_U8_U8_8x4 (dest, ref, stride, stride);
 }
 
-MOTION_COMP_EXTERN (mlib)
+MPEG2_MC_EXTERN (mlib)
 
 #endif