new filter, to detect best crop size

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6062 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 138 insertions, 1 deletions

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index b8325a4c4d..8aa2e7a037 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -6,7 +6,7 @@ LIBNAME2 = libmpencoders.a
 
 AUDIO_SRCS=dec_audio.c ad.c ad_a52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dk4adpcm.c ad_dshow.c ad_dvdpcm.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_mp3.c ad_msadpcm.c ad_pcm.c ad_roqaudio.c ad_msgsm.c ad_faad.c ad_vorbis.c ad_libmad.c
 VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_zlib.c vd_mpegpes.c
-VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c
+VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c
 ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c
 NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c
 
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 4497e93764..bad5724378 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -26,6 +26,7 @@ extern vf_info_t vf_info_mirror;
 extern vf_info_t vf_info_palette;
 extern vf_info_t vf_info_lavc;
 extern vf_info_t vf_info_dvbscale;
+extern vf_info_t vf_info_cropdetect;
 
 char** vo_plugin_args=(char**) NULL;
 
@@ -51,6 +52,7 @@ static vf_info_t* filter_list[]={
     &vf_info_lavc,
 #endif
     &vf_info_dvbscale,
+    &vf_info_cropdetect,
     NULL
 };
 
diff --git a/libmpcodecs/vf_cropdetect.c b/libmpcodecs/vf_cropdetect.c
new file mode 100644
index 0000000000..a535152cf0
--- /dev/null
+++ b/libmpcodecs/vf_cropdetect.c
@@ -0,0 +1,135 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+
+#include "../config.h"
+#include "../mp_msg.h"
+
+#include "img_format.h"
+#include "mp_image.h"
+#include "vf.h"
+
+#include "../libvo/fastmemcpy.h"
+#include "../postproc/rgb2rgb.h"
+
+struct vf_priv_s {
+    int x1,y1,x2,y2;
+    int limit;
+};
+
+static int checkline(unsigned char* src,int stride,int len,int bpp){
+    int total=0;
+    int div=len;
+    int x;
+    switch(bpp){
+    case 1:
+	while(--len>=0){
+	    total+=src[0]; src+=stride;
+	}
+	break;
+    case 3:
+    case 4:
+	while(--len>=0){
+	    total+=src[0]+src[1]+src[2]; src+=stride;
+	}
+	div*=3;
+	break;
+    }
+    total/=div;
+//    printf("total=%d\n",total);
+    return total;
+}
+
+//===========================================================================//
+
+static int config(struct vf_instance_s* vf,
+        int width, int height, int d_width, int d_height,
+	unsigned int flags, unsigned int outfmt){
+    vf->priv->x1=width;
+    vf->priv->y1=height;
+    vf->priv->x2=0;
+    vf->priv->y2=0;
+    return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
+}
+
+static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+    mp_image_t *dmpi;
+    int bpp=mpi->bpp/8;
+    int x,y;
+
+    // hope we'll get DR buffer:
+    dmpi=vf_get_image(vf->next,mpi->imgfmt,
+	MP_IMGTYPE_EXPORT, 0,
+	mpi->w, mpi->h);
+
+    dmpi->planes[0]=mpi->planes[0];
+    dmpi->planes[1]=mpi->planes[1];
+    dmpi->planes[2]=mpi->planes[2];
+    dmpi->stride[0]=mpi->stride[0];
+    dmpi->stride[1]=mpi->stride[1];
+    dmpi->stride[2]=mpi->stride[2];
+    dmpi->width=mpi->width;
+    dmpi->height=mpi->height;
+
+//static int checkline(unsigned char* src,int stride,int len,int bpp){
+    
+    for(y=0;y<vf->priv->y1;y++){
+	if(checkline(mpi->planes[0]+mpi->stride[0]*y,bpp,mpi->w,bpp)>vf->priv->limit){
+	    vf->priv->y1=y;
+	    break;
+	}
+    }
+
+    for(y=mpi->h-1;y>vf->priv->y2;y--){
+	if(checkline(mpi->planes[0]+mpi->stride[0]*y,bpp,mpi->w,bpp)>vf->priv->limit){
+	    vf->priv->y2=y;
+	    break;
+	}
+    }
+
+    for(y=0;y<vf->priv->x1;y++){
+	if(checkline(mpi->planes[0]+bpp*y,mpi->stride[0],mpi->h,bpp)>vf->priv->limit){
+	    vf->priv->x1=y;
+	    break;
+	}
+    }
+
+    for(y=mpi->w-1;y>vf->priv->x2;y--){
+	if(checkline(mpi->planes[0]+bpp*y,mpi->stride[0],mpi->h,bpp)>vf->priv->limit){
+	    vf->priv->x2=y;
+	    break;
+	}
+    }
+
+    x=(vf->priv->x1+1)&(~1);
+    y=(vf->priv->y1+1)&(~1);
+    
+    printf("crop area: X: %d..%d  Y: %d..%d  (-vop crop=%d:%d:%d:%d)\n",
+	vf->priv->x1,vf->priv->x2,
+	vf->priv->y1,vf->priv->y2,
+	(vf->priv->x2-x)&(~1),(vf->priv->y2-y)&(~1),x,y
+	  );
+
+    vf_next_put_image(vf,dmpi);
+}
+
+//===========================================================================//
+
+static int open(vf_instance_t *vf, char* args){
+    vf->config=config;
+    vf->put_image=put_image;
+    vf->priv=malloc(sizeof(struct vf_priv_s));
+    vf->priv->limit=24; // should be option
+    return 1;
+}
+
+vf_info_t vf_info_cropdetect = {
+    "autodetect crop size",
+    "cropdetect",
+    "A'rpi",
+    "",
+    open
+};
+
+//===========================================================================//