Extract common mcdeint code from decomb/deint

Extracts duplicated code from decomb.c and deinterlace.c and puts
it in a shared module. Fixes a bug that existed in the decomb
version of mcdeint_filter.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4257 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 9 insertions, 189 deletions

diff --git a/libhb/deinterlace.c b/libhb/deinterlace.c
index 3080caead..bd51e9a77 100644
--- a/libhb/deinterlace.c
+++ b/libhb/deinterlace.c
@@ -19,8 +19,7 @@
 #include "hb.h"
 #include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
-
-#define SUPPRESS_AV_LOG
+#include "mcdeint.h"
 
 #define YADIF_MODE_DEFAULT     -1
 #define YADIF_PARITY_DEFAULT   -1
@@ -60,13 +59,7 @@ struct hb_filter_private_s
     yadif_arguments_t *yadif_arguments;     // Arguments to thread for work
 
     int              mcdeint_mode;
-    int              mcdeint_qp;
-
-    int              mcdeint_outbuf_size;
-    uint8_t        * mcdeint_outbuf;
-    AVCodecContext * mcdeint_avctx_enc;
-    AVFrame        * mcdeint_frame;
-    AVFrame        * mcdeint_frame_dec;
+    mcdeint_private_t mcdeint;
 
     AVPicture        pic_in;
     AVPicture        pic_out;
@@ -399,119 +392,6 @@ static void yadif_filter( uint8_t ** dst,
      */
 }
 
-static void mcdeint_filter( uint8_t ** dst,
-                            uint8_t ** src,
-                            int parity,
-                            hb_filter_private_t * pv )
-{
-    int x, y, i;
-    int out_size;
-
-#ifdef SUPPRESS_AV_LOG
-    /* TODO: temporarily change log level to suppress obnoxious debug output */
-    int loglevel = av_log_get_level();
-    av_log_set_level( AV_LOG_QUIET );
-#endif
-
-    for( i=0; i<3; i++ )
-    {
-        pv->mcdeint_frame->data[i] = src[i];
-        pv->mcdeint_frame->linesize[i] = pv->width[i];
-    }
-    pv->mcdeint_avctx_enc->me_cmp     = FF_CMP_SAD;
-    pv->mcdeint_avctx_enc->me_sub_cmp = FF_CMP_SAD;
-    pv->mcdeint_frame->quality        = pv->mcdeint_qp * FF_QP2LAMBDA;
-
-    out_size = avcodec_encode_video( pv->mcdeint_avctx_enc,
-                                     pv->mcdeint_outbuf,
-                                     pv->mcdeint_outbuf_size,
-                                     pv->mcdeint_frame );
-
-    pv->mcdeint_frame_dec = pv->mcdeint_avctx_enc->coded_frame;
-
-    for( i = 0; i < 3; i++ )
-    {
-        int w    = pv->width[i];
-        int h    = pv->height[i];
-        int fils = pv->mcdeint_frame_dec->linesize[i];
-        int srcs = pv->width[i];
-
-        for( y = 0; y < h; y++ )
-        {
-            if( (y ^ parity) & 1 )
-            {
-                for( x = 0; x < w; x++ )
-                {
-                    if( (x-2)+(y-1)*w >= 0 && (x+2)+(y+1)*w < w*h )
-                    {
-                        uint8_t * filp =
-                            &pv->mcdeint_frame_dec->data[i][x + y*fils];
-                        uint8_t * srcp = &src[i][x + y*srcs];
-
-                        int diff0 = filp[-fils] - srcp[-srcs];
-                        int diff1 = filp[+fils] - srcp[+srcs];
-
-                        int spatial_score =
-                              ABS(srcp[-srcs-1] - srcp[+srcs-1])
-                            + ABS(srcp[-srcs  ] - srcp[+srcs  ])
-                            + ABS(srcp[-srcs+1] - srcp[+srcs+1]) - 1;
-
-                        int temp = filp[0];
-
-#define MCDEINT_CHECK(j)\
-                        {   int score = ABS(srcp[-srcs-1+j] - srcp[+srcs-1-j])\
-                                      + ABS(srcp[-srcs  +j] - srcp[+srcs  -j])\
-                                      + ABS(srcp[-srcs+1+j] - srcp[+srcs+1-j]);\
-                            if( score < spatial_score ) {\
-                                spatial_score = score;\
-                                diff0 = filp[-fils+j] - srcp[-srcs+j];\
-                                diff1 = filp[+fils-j] - srcp[+srcs-j];
-
-                        MCDEINT_CHECK(-1) MCDEINT_CHECK(-2) }} }}
-                        MCDEINT_CHECK( 1) MCDEINT_CHECK( 2) }} }}
-
-                        if(diff0 + diff1 > 0)
-                        {
-                            temp -= (diff0 + diff1 -
-                                     ABS( ABS(diff0) - ABS(diff1) ) / 2) / 2;
-                        }
-                        else
-                        {
-                            temp -= (diff0 + diff1 +
-                                     ABS( ABS(diff0) - ABS(diff1) ) / 2) / 2;
-                        }
-
-                        filp[0] = dst[i][x + y*w] =
-                            temp > 255U ? ~(temp>>31) : temp;
-                    }
-                    else
-                    {
-                        dst[i][x + y*w] =
-                            pv->mcdeint_frame_dec->data[i][x + y*fils];
-                    }
-                }
-            }
-        }
-
-        for( y = 0; y < h; y++ )
-        {
-            if( !((y ^ parity) & 1) )
-            {
-                for( x = 0; x < w; x++ )
-                {
-                    pv->mcdeint_frame_dec->data[i][x + y*fils] =
-                        dst[i][x + y*w]= src[i][x + y*srcs];
-                }
-            }
-        }
-    }
-
-#ifdef SUPPRESS_AV_LOG
-    /* TODO: restore previous log level */
-    av_log_set_level(loglevel);
-#endif
-}
-
 hb_filter_private_t * hb_deinterlace_init( int pix_fmt,
                                            int width,
                                            int height,
@@ -540,7 +420,7 @@ hb_filter_private_t * hb_deinterlace_init( int pix_fmt,
     pv->yadif_parity   = YADIF_PARITY_DEFAULT;
 
     pv->mcdeint_mode   = MCDEINT_MODE_DEFAULT;
-    pv->mcdeint_qp     = MCDEINT_QP_DEFAULT;
+    int mcdeint_qp     = MCDEINT_QP_DEFAULT;
 
     if( settings )
     {
@@ -548,7 +428,7 @@ hb_filter_private_t * hb_deinterlace_init( int pix_fmt,
                 &pv->yadif_mode,
                 &pv->yadif_parity,
                 &pv->mcdeint_mode,
-                &pv->mcdeint_qp );
+                &mcdeint_qp );
     }
 
     pv->cpu_count = hb_get_cpu_count();
@@ -611,56 +491,8 @@ hb_filter_private_t * hb_deinterlace_init( int pix_fmt,
         }
     }
 
-    /* Allocate mcdeint specific buffers */
-    if( pv->mcdeint_mode >= 0 )
-    {
-        avcodec_init();
-        avcodec_register_all();
-
-        AVCodec * enc = avcodec_find_encoder( CODEC_ID_SNOW );
-
-        int i;
-        for (i = 0; i < 3; i++ )
-        {
-            AVCodecContext * avctx_enc;
-
-            avctx_enc = pv->mcdeint_avctx_enc = avcodec_alloc_context();
-
-            avctx_enc->width                    = width;
-            avctx_enc->height                   = height;
-            avctx_enc->time_base                = (AVRational){1,25};  // meaningless
-            avctx_enc->gop_size                 = 300;
-            avctx_enc->max_b_frames             = 0;
-            avctx_enc->pix_fmt                  = PIX_FMT_YUV420P;
-            avctx_enc->flags                    = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
-            avctx_enc->strict_std_compliance    = FF_COMPLIANCE_EXPERIMENTAL;
-            avctx_enc->global_quality           = 1;
-            avctx_enc->flags2                   = CODEC_FLAG2_MEMC_ONLY;
-            avctx_enc->me_cmp                   = FF_CMP_SAD; //SSE;
-            avctx_enc->me_sub_cmp               = FF_CMP_SAD; //SSE;
-            avctx_enc->mb_cmp                   = FF_CMP_SSE;
-
-            switch( pv->mcdeint_mode )
-            {
-                case 3:
-                    avctx_enc->refs = 3;
-                case 2:
-                    avctx_enc->me_method = ME_UMH;
-                case 1:
-                    avctx_enc->flags |= CODEC_FLAG_4MV;
-                    avctx_enc->dia_size =2;
-                case 0:
-                    avctx_enc->flags |= CODEC_FLAG_QPEL;
-            }
-
-            hb_avcodec_open(avctx_enc, enc, 0);
-        }
-
-        pv->mcdeint_frame       = avcodec_alloc_frame();
-        pv->mcdeint_outbuf_size = width * height * 10;
-        pv->mcdeint_outbuf      = malloc( pv->mcdeint_outbuf_size );
-    }
-
+    mcdeint_init( &pv->mcdeint, pv->mcdeint_mode, mcdeint_qp, width, height );
+    
     return pv;
 }
 
@@ -721,20 +553,8 @@ void hb_deinterlace_close( hb_filter_private_t * pv )
         free( pv->yadif_arguments );
     }
 
-    /* Cleanup mcdeint specific buffers */
-    if( pv->mcdeint_mode >= 0 )
-    {
-        if( pv->mcdeint_avctx_enc )
-        {
-            hb_avcodec_close( pv->mcdeint_avctx_enc );
-            av_freep( &pv->mcdeint_avctx_enc );
-        }
-        if( pv->mcdeint_outbuf )
-        {
-            free( pv->mcdeint_outbuf );
-        }
-    }
-
+    mcdeint_close( &pv->mcdeint );
+    
     free( pv );
 }
 
@@ -817,7 +637,7 @@ int hb_deinterlace_work( hb_buffer_t * buf_in,
             avpicture_fill( &pv->pic_in,  pv->buf_out[(frame^1)]->data,
                             pix_fmt, width, height );
 
-            mcdeint_filter( pv->pic_in.data, pv->pic_out.data, parity, pv );
+            mcdeint_filter( pv->pic_in.data, pv->pic_out.data, parity, pv->width, pv->height, &pv->mcdeint );
 
             *buf_out = pv->buf_out[ (frame^1)];
         }