changeset 321:2b00e171b1d4 libavcodec

- ME method compatibility with legacy apps. - Please use AVCodecContext's me_method now.

--- a/avcodec.h	Sun Apr 14 18:57:51 2002 +0000
+++ b/avcodec.h	Sun Apr 14 22:17:40 2002 +0000
@@ -58,7 +58,7 @@
 
 /* motion estimation type, EPZS by default */
 enum Motion_Est_ID {
-    ME_ZERO = -4,
+    ME_ZERO = 1,
     ME_FULL,
     ME_LOG,
     ME_PHODS,
@@ -66,6 +66,9 @@
     ME_X1
 };
 
+/* only for ME compatiblity with old apps */
+extern int motion_estimation_method;
+
 /* ME algos sorted by quality */
 static const int Motion_Est_QTab[] = { -4, -1, -2, 1, 0, -3 };
 

--- a/mpegvideo.c	Sun Apr 14 18:57:51 2002 +0000
+++ b/mpegvideo.c	Sun Apr 14 22:17:40 2002 +0000
@@ -50,6 +50,7 @@
 
 //#define DEBUG
 
+
 /* for jpeg fast DCT */
 #define CONST_BITS 14
 
@@ -72,10 +73,10 @@
 static UINT16 default_mv_penalty[MAX_FCODE+1][MAX_MV*2+1];
 static UINT8 default_fcode_tab[MAX_MV*2+1];
 
+extern UINT8 zigzag_end[64];
+
 /* default motion estimation */
-int motion_estimation_method = ME_LOG;
-
-extern UINT8 zigzag_end[64];
+int motion_estimation_method = ME_EPZS;
 
 static void convert_matrix(int *qmat, UINT16 *qmat16, const UINT16 *quant_matrix, int qscale)
 {
@@ -315,7 +316,12 @@
     }
     
     /* ME algorithm */
-    s->me_method = avctx->me_method;
+    if (avctx->me_method == 0)
+        /* For compatibility */
+        s->me_method = motion_estimation_method;
+    else
+        s->me_method = avctx->me_method;
+        
     /* Fixed QSCALE */
     s->fixed_qscale = (avctx->flags & CODEC_FLAG_QSCALE);
     
@@ -415,7 +421,7 @@
         mpeg1_encode_init(s);
 
     /* dont use mv_penalty table for crap MV as it would be confused */
-    if (s->me_method < 0) s->mv_penalty = default_mv_penalty;
+    if (s->me_method < 5) s->mv_penalty = default_mv_penalty;
 
     s->encoding = 1;
 
@@ -1346,7 +1352,7 @@
     }
 
     /* find best f_code for ME which do unlimited searches */
-    if(s->pict_type == P_TYPE && s->me_method >= 0){
+    if(s->pict_type == P_TYPE && s->me_method >= 5){
         int mv_num[8];
         int i;
         int loose=0;