Ticket #1627: bug1627.diff

libmpcodecs/vf_cropdetect.c

@@ -15 +15 @@
     int x1,y1,x2,y2;
     int limit;
     int round;
+    int reset_count;
     int fno;
 };
 
@@ -57 +58 @@
     mp_image_t *dmpi;
     int bpp=mpi->bpp/8;
     int w,h,x,y,shrink_by;
+    static int mycount = 0; // Keep track of frames since last crop area reset
 
     // hope we'll get DR buffer:
     dmpi=vf_get_image(vf->next,mpi->imgfmt,
@@ -73 +75 @@
     dmpi->height=mpi->height;
 
 if(++vf->priv->fno>2){  // ignore first 2 frames - they may be empty
+    
+    // Reset the crop area every reset_count frames, if reset_count is > 0
+    mycount++;
+    if(vf->priv->reset_count && mycount >= vf->priv->reset_count){
+        vf->priv->x1=mpi->w-1;
+        vf->priv->y1=mpi->h-1;
+        vf->priv->x2=0;
+        vf->priv->y2=0;
+        mycount=0;
+    }
 
     for(y=0;y<vf->priv->y1;y++){
         if(checkline(mpi->planes[0]+mpi->stride[0]*y,bpp,mpi->w,bpp)>vf->priv->limit){
@@ -153 +165 @@
     vf->priv=malloc(sizeof(struct vf_priv_s));
     vf->priv->limit=24; // should be option
     vf->priv->round = 0;
-    if(args) sscanf(args, "%d:%d",
+    vf->priv->reset_count = 0;
+    if(args) sscanf(args, "%d:%d:%d",
     &vf->priv->limit,
-    &vf->priv->round);
+    &vf->priv->round,
+    &vf->priv->reset_count);
     return 1;
 }
 

DOCS/man/en/mplayer.1

@@ -5775 +5775 @@
 .PD 1
 .
 .TP
-.B cropdetect[=limit:round]
+.B cropdetect[=limit:round[:reset]]
 Calculates necessary cropping parameters and prints the recommended parameters
 to stdout.
 .PD 0
@@ -5789 +5789 @@
 The offset is automatically adjusted to center the video.
 Use 2 to get only even dimensions (needed for 4:2:2 video).
 16 is best when encoding to most video codecs.
+.br
+.IPs <reset>
+Counter that determines after how many frames cropdetect will reset
+the previously detected largest video area and start over to detect
+the current optimal crop area.  This can be usefull when channel
+logos distort the video area.  0 indicates never reset and return
+the the largest area encountered during playback. (default: 0).
 .RE
 .PD 1
 .