*** empty log message ***

4 files changed, 212 insertions, 42 deletions

diff --git a/client/player.cc b/client/player.cc
index 1f789b9..1689dcf 100644
--- a/client/player.cc
+++ b/client/player.cc
@@ -32,7 +32,6 @@
 //#define COLORSPACE_YV12
 
 static int num = 0;
-static bool first = true;
 
 Player::Player(QWidget *w, Decoder *d)
 {
@@ -43,9 +42,7 @@ Player::Player(QWidget *w, Decoder *d)
 
   connect(this, SIGNAL(timeout()), this, SLOT(show_frame()));
 
-	dvdecoder = dv_decoder_new(FALSE/*this value is unused*/, FALSE, FALSE);
-  dv_set_quality(dvdecoder, DV_QUALITY_COLOR | DV_QUALITY_AC_1);
-  //dv_set_quality(dvdecoder, DV_QUALITY_BEST);
+  dvdecoder.setOutputBuffer(render.getDisplayData());
 }
 
 Player::~Player()
@@ -61,34 +58,7 @@ void Player::show_frame()
   frame = decoder->getFrame();
   if(!frame) return;
 
-  if(first) {
-#ifdef COLORSPACE_YV12
-    yuv[0] = (unsigned char*)render.xvimage->data;
-    yuv[1] = (unsigned char*)yuv[0] + (WIDTH * HEIGHT);
-    yuv[2] = (unsigned char*)yuv[1] + (WIDTH * HEIGHT / 4);
-    pitches[0] = WIDTH;
-    pitches[1] = WIDTH / 2;
-    pitches[2] = WIDTH / 2;
-#else
-    yuv[0] = (unsigned char*)render.getDisplayData(); // Decode directly to the XVideo buffer
-    pitches[0] = WIDTH * 2;
-#endif
-
-    dv_parse_header(dvdecoder, frame->data);
-    //dv_parse_packs(decoder, frame->data); // Not needed anyway!
-    
-    dvdecoder->system = e_dv_system_625_50;  // PAL lines, PAL framerate
-    dvdecoder->sampling = e_dv_sample_422;  // 4 bytes y, 2 bytes u, 2 bytes v
-    dvdecoder->std = e_dv_std_iec_61834;
-    dvdecoder->num_dif_seqs = 12;
-    first = false;
-  }
-
-  dv_decode_full_frame(dvdecoder, 
-                       frame->data,
-                       e_dv_color_yuv, 
-                       yuv,
-                       pitches);
+  dvdecoder.decode((char*)frame->data);
 
   render.width = widget->width();
   render.height = widget->height();
diff --git a/client/player.h b/client/player.h
index 824e2c0..723fc33 100644
--- a/client/player.h
+++ b/client/player.h
@@ -37,10 +37,7 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/Xvlib.h>
 
-//#include "libdv_wrapper.h"
-// Use libdv
-#include <libdv/dv.h>
-#include <libdv/dv_types.h>
+#include "libdv_wrapper.h"
 
 #include "xvaccelrenderer.h"
 
@@ -55,12 +52,7 @@ public slots:
   void show_frame();
 
 private:
-  int pitches[3];
-  unsigned char* yuv[3];
-
-  //  LibDVWrapper dvdecoder;
-  dv_decoder_t *dvdecoder;
-
+  LibDVWrapper dvdecoder;
 
   Decoder *decoder;
   QWidget *widget;
diff --git a/lib/libdv_wrapper.cc b/lib/libdv_wrapper.cc
new file mode 100644
index 0000000..d570e2c
--- /dev/null
+++ b/lib/libdv_wrapper.cc
@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            libdv_wrapper.cc
+ *
+ *  Mon Apr 10 11:20:18 CEST 2006
+ *  Copyright  2006 Bent Bisballe Nyeng
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of MIaV.
+ *
+ *  MIaV is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  MIaV is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with MIaV; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#include "libdv_wrapper.h"
+
+static bool first = true;
+
+LibDVWrapper::LibDVWrapper(DV::Quality quality,
+                           DV::System system,
+                           DV::Sampling sampling)
+{
+	decoder = dv_decoder_new(FALSE, // int ignored
+                           FALSE, // int clamp_luma
+                           FALSE);// int clamp_chroma
+  setQuality(quality);
+  setSystem(system);
+  setSampling(sampling);
+
+  width = 720;
+  height = 576;
+}
+
+
+LibDVWrapper::~LibDVWrapper()
+{
+  dv_decoder_free(decoder);
+}
+
+void LibDVWrapper::setQuality(DV::Quality quality)
+{
+  dv_set_quality(decoder, quality);
+}
+
+void LibDVWrapper::setSystem(DV::System system)
+{
+  decoder->system = (dv_system_t)system;
+}
+
+void LibDVWrapper::setSampling(DV::Sampling sampling)
+{
+  decoder->sampling = (dv_sample_t)sampling;
+}
+
+void LibDVWrapper::setOutputBuffer(char *output)
+{
+#ifdef COLORSPACE_YV12
+    yuv[0] = (unsigned char*)output;
+    yuv[1] = (unsigned char*)yuv[0] + (width * height);
+    yuv[2] = (unsigned char*)yuv[1] + (width * height / 4);
+    pitches[0] = width;
+    pitches[1] = width / 2;
+    pitches[2] = width / 2;
+#else
+    yuv[0] = (unsigned char*)output;//render.getDisplayData(); // Decode directly to the XVideo buffer
+    pitches[0] = width * 2;
+#endif
+}
+
+void LibDVWrapper::decode(char *input)
+{
+  if(first) {
+    dv_parse_header(decoder, (const uint8_t*)input);
+    //dv_parse_packs(decoder, frame->data); // Not needed anyway!
+    
+    //    decoder->system = e_dv_system_625_50;  // PAL lines, PAL framerate
+    //    decoder->sampling = e_dv_sample_422;  // 4 bytes y, 2 bytes u, 2 bytes v
+    decoder->std = e_dv_std_iec_61834;
+    decoder->num_dif_seqs = 12;
+    first = false;
+  }
+
+  dv_decode_full_frame(decoder,
+                       (const uint8_t*)input,
+                       e_dv_color_yuv,
+                       yuv,
+                       pitches);
+}
+
diff --git a/lib/libdv_wrapper.h b/lib/libdv_wrapper.h
new file mode 100644
index 0000000..995e8d7
--- /dev/null
+++ b/lib/libdv_wrapper.h
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            libdv_wrapper.h
+ *
+ *  Mon Apr 10 11:20:18 CEST 2006
+ *  Copyright  2006 Bent Bisballe Nyeng
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of MIaV.
+ *
+ *  MIaV is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  MIaV is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with MIaV; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#ifndef __MIAV_LIBDV_WRAPPER_H__
+#define __MIAV_LIBDV_WRAPPER_H__
+
+// Use libdv
+#include <libdv/dv.h>
+#include <libdv/dv_types.h>
+
+namespace DV {
+  /*
+    #define DV_QUALITY_COLOR       1     // Clear this bit to make monochrome
+
+    #define DV_QUALITY_AC_MASK     (0x3 << 1)
+    #define DV_QUALITY_DC          (0x0 << 1)
+    #define DV_QUALITY_AC_1        (0x1 << 1)
+    #define DV_QUALITY_AC_2        (0x2 << 1)
+    
+    #define DV_QUALITY_BEST       (DV_QUALITY_COLOR | DV_QUALITY_AC_2)
+    #define DV_QUALITY_FASTEST     0     // Monochrome, DC coeffs only
+  */
+  typedef enum {
+    ColorBest = DV_QUALITY_COLOR | DV_QUALITY_AC_MASK | DV_QUALITY_AC_2,
+    ColorGood = DV_QUALITY_COLOR | DV_QUALITY_AC_MASK | DV_QUALITY_AC_1,
+    ColorBad  = DV_QUALITY_COLOR | DV_QUALITY_AC_MASK | DV_QUALITY_DC,
+    MonocromeBest = DV_QUALITY_AC_MASK | DV_QUALITY_AC_2,
+    MonocromeGood = DV_QUALITY_AC_MASK | DV_QUALITY_AC_1,
+    MonocromeBad  = DV_QUALITY_AC_MASK | DV_QUALITY_DC
+  } Quality;
+  /*  
+      typedef enum system_e { 
+      e_dv_system_none = 0,
+      e_dv_system_525_60,    // NTSC
+      e_dv_system_625_50,    // PAL
+      } dv_system_t;
+  */
+  typedef enum {
+    //None = e_dv_system_none,
+    NTSC = e_dv_system_525_60,
+    PAL = e_dv_system_625_50
+  } System;
+
+  /*
+    typedef enum sample_e { 
+    e_dv_sample_none = 0,
+    e_dv_sample_411,
+    e_dv_sample_420,
+    e_dv_sample_422,
+    } dv_sample_t;
+  */
+  typedef enum {
+    //None = e_dv_sample_none,
+    YUV_411 = e_dv_sample_411,
+    YUV_420 = e_dv_sample_420,
+    YUV_422 = e_dv_sample_422
+  } Sampling;
+};
+
+class LibDVWrapper {
+public:
+  LibDVWrapper(DV::Quality quality = DV::ColorBest,
+               DV::System system = DV::PAL,
+               DV::Sampling sampling = DV::YUV_422);
+  ~LibDVWrapper();
+
+  void setQuality(DV::Quality quality);
+  void setSystem(DV::System system);
+  void setSampling(DV::Sampling sampling);
+
+  void setOutputBuffer(char *output);
+
+  void decode(char *input);
+
+private:
+  int width, height;
+
+  int pitches[3];
+  unsigned char* yuv[3];
+
+  dv_decoder_t *decoder;
+};
+
+#endif/*__MIAV_LIBDV_WRAPPER_H__*/