Changeset 4303

Timestamp:

03/10/10 20:12:47 (6 months ago)

Author:

andoma

Message:

Default to OpenGL based deinterlacer

Location:

trunk/showtime/src

Files:

• ui/glw/glw_video_opengl.c (modified) (14 diffs)
• video/video_decoder.h (modified) (4 diffs)

trunk/showtime/src/ui/glw/glw_video_opengl.c

@@ -573 +573 @@
   float x1, x2, y1, y2;
 
+  const int bordersize = 3;
+
   if(rectmode) {
 
     if(interlace) {
 
-      x1 = 1;
-      y1 = 1;
-      x2 = width  - 1;
-      y2 = height - 1;
+      x1 = bordersize;
+      y1 = bordersize;
+      x2 = width  - bordersize;
+      y2 = height - bordersize;
 
     } else {
@@ -594 +596 @@
     if(interlace) {
 
-      x1 = 0 + (1.0 / (float)width);
-      y1 = 0 + (1.0 / (float)height);
-      x2 = 1 - (1.0 / (float)width);
-      y2 = 1 - (1.0 / (float)height);
+      x1 = 0 + (bordersize / (float)width);
+      y1 = 0 + (bordersize / (float)height);
+      x2 = 1 - (bordersize / (float)width);
+      y2 = 1 - (bordersize / (float)height);
 
     } else {
@@ -675 +677 @@
   glBindTexture(textype, tex);
   
-  render_video_quad(vd->vd_interlaced, rectmode, 
+  render_video_quad(vdf->vdf_cutborder, rectmode, 
                     vdf->vdf_width[0], vdf->vdf_height[0]);
   
@@ -740 +742 @@
   glBindTexture(textype, gv_tex_get(gvf_a, GVF_TEX_L));
 
-  render_video_quad(vd->vd_interlaced, rectmode, 
+  render_video_quad(fra->vdf_cutborder, rectmode, 
                     fra->vdf_width[0], fra->vdf_height[0]);
 
@@ -940 +942 @@
 
 
-
-
-
+typedef enum {
+  DEINTERLACE_NONE,
+  DEINTERLACE_OPENGL,
+  DEINTERLACE_YADIF_FRAME,
+  DEINTERLACE_YADIF_FIELD, // Best YADIF version
+  DEINTERLACE_YADIF_FRAME_NO_SPATIAL_ILACE,
+  DEINTERLACE_YADIF_FIELD_NO_SPATIAL_ILACE,
+} deinterlacertype_t;
 
 /**
@@ -956 +963 @@
   uint8_t *prev, *cur, *next, *src, *dst;
   int hshift, vshift;
-  deilace_type_t dt;
+  deinterlacertype_t dt;
   video_decoder_frame_t *vdf;
 
-  dt = disable_deinterlacer ? VD_DEILACE_NONE : vd->vd_deilace_conf;
-  if(dt == VD_DEILACE_AUTO)
-    dt = frame->interlaced_frame ? VD_DEILACE_YADIF_FIELD : VD_DEILACE_NONE;
+  const int parity = 0;
+
+  if(disable_deinterlacer) {
+    dt = DEINTERLACE_NONE;
+  } else {
+    dt = DEINTERLACE_OPENGL;
+  }
 
   avcodec_get_chroma_sub_sample(ctx->pix_fmt, &hshift, &vshift);
@@ -974 +985 @@
   switch(dt) {
 
-  case VD_DEILACE_AUTO:
-    return;
-
-    /*
-     *  No post processing
-     */
-
-  case VD_DEILACE_NONE:
+  case DEINTERLACE_NONE:
     vd->vd_active_frames_needed = 3;
-    vd->vd_interlaced = 0;
     if((vdf = vd_dequeue_for_decode(vd, wvec, hvec)) == NULL)
       return;
@@ -1001 +1004 @@
     }
 
-    vd->vd_interlaced = 0;
     vdf->vdf_pts = pts;
     vdf->vdf_epoch = epoch;
     vdf->vdf_duration = duration;
+    vdf->vdf_cutborder = 0;
     TAILQ_INSERT_TAIL(&vd->vd_display_queue, vdf, vdf_link);
     return;
 
-  case VD_DEILACE_HALF_RES:
+  case DEINTERLACE_OPENGL:
     duration /= 2;
 
-    tff = !!frame->top_field_first ^ vd->vd_field_parity;
+    tff = !!frame->top_field_first ^ parity;
 
     vd->vd_active_frames_needed = 3;
@@ -1019 +1022 @@
      *  OpenGL does bledning for us
      */
-
-    vd->vd_interlaced = 1;
 
     hvec[0] = hvec[0] / 2;
@@ -1069 +1070 @@
     
     vdf->vdf_debob = tff;
-    
+    vdf->vdf_cutborder = 1;
+
     vdf->vdf_pts = pts + duration;
     vdf->vdf_epoch = epoch;
@@ -1076 +1078 @@
     return;
     
-  case VD_DEILACE_YADIF_FRAME:
+  case DEINTERLACE_YADIF_FRAME:
     mode = 0; goto yadif;
-  case VD_DEILACE_YADIF_FIELD:
+  case DEINTERLACE_YADIF_FIELD:
     mode = 1; goto yadif;
-  case VD_DEILACE_YADIF_FRAME_NO_SPATIAL_ILACE:
+  case DEINTERLACE_YADIF_FRAME_NO_SPATIAL_ILACE:
     mode = 2; goto yadif;
-  case VD_DEILACE_YADIF_FIELD_NO_SPATIAL_ILACE:
+  case DEINTERLACE_YADIF_FIELD_NO_SPATIAL_ILACE:
     mode = 3;
   yadif:
@@ -1101 +1103 @@
 
     vd->vd_active_frames_needed = 3;
-    vd->vd_interlaced = 1;
-
     for(i = 0; i < 3; i++) {
       w = vd->vd_yadif_width  >> (i ? hshift : 0);
@@ -1115 +1115 @@
     }
 
-    tff = !!frame->top_field_first ^ vd->vd_field_parity;
+    tff = !!frame->top_field_first ^ parity;
 
     pts -= duration;
@@ -1172 +1172 @@
       vdf->vdf_epoch = epoch;
       vdf->vdf_duration = duration;
+      vdf->vdf_cutborder = 0;
       TAILQ_INSERT_TAIL(&vd->vd_display_queue, vdf, vdf_link);
     }

trunk/showtime/src/video/video_decoder.h

@@ -77 +77 @@
 }
 
-
-/**
- *
- */
-typedef enum {
-  VD_DEILACE_AUTO,
-  VD_DEILACE_NONE,
-  VD_DEILACE_HALF_RES,
-  VD_DEILACE_YADIF_FRAME,
-  VD_DEILACE_YADIF_FIELD,
-  VD_DEILACE_YADIF_FRAME_NO_SPATIAL_ILACE,
-  VD_DEILACE_YADIF_FIELD_NO_SPATIAL_ILACE,
-} deilace_type_t;
-
-
 TAILQ_HEAD(video_decoder_frame_queue, video_decoder_frame);
 
@@ -106 +91 @@
   int vdf_epoch;
 
-  int vdf_debob;
+  uint8_t vdf_debob;
+  uint8_t vdf_cutborder;
 
   void *vdf_data[3];
@@ -130 +116 @@
 
 
-  /* Configuration */
-
-  deilace_type_t vd_deilace_conf;
-  int vd_field_parity;
- 
   media_pipe_t *vd_mp;
-
 
   /* Mutex for protecting access to the frame queues */
@@ -187 +167 @@
 
   int vd_skip;
-
-  int vd_interlaced;
 
   int64_t vd_nextpts;