DTS debug messages.

blend_rgb16 changes. <- Need testing further.

CVS patchset: 2773
CVS date: 2002/10/03 06:04:54

2 files changed, 20 insertions, 8 deletions

diff --git a/src/libdts/xine_decoder.c b/src/libdts/xine_decoder.c
index 2970a5e82..7af50d220 100644
--- a/src/libdts/xine_decoder.c
+++ b/src/libdts/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.26 2002/09/05 22:18:56 mroi Exp $
+ * $Id: xine_decoder.c,v 1.27 2002/10/03 06:04:54 jcdutton Exp $
  *
  * 04-09-2001 DTS passtrough  (C) Joachim Koenig 
  * 09-12-2001 DTS passthrough inprovements (C) James Courtier-Dutton
@@ -41,6 +41,9 @@
 #include "audio_out.h"
 #include "buffer.h"
 
+/*
+#define LOG_DEBUG
+*/
 
 typedef struct dts_decoder_s {
   audio_decoder_t  audio_decoder;
@@ -128,7 +131,10 @@ void dts_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
     audio_buffer->frame_header_count = buf->decoder_info[1]; /* Number of frames */
     audio_buffer->first_access_unit = buf->decoder_info[2]; /* First access unit */
 
-    /* printf("DTS first access unit=%u\n",audio_buffer->first_access_unit); */
+#ifdef LOG_DEBUG
+    printf("DTS first access unit=%u\n",audio_buffer->first_access_unit);
+#endif
+
     if (n == first_access_unit) {
       audio_buffer->vpts       = buf->pts;
     } else {
@@ -155,13 +161,13 @@ void dts_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
       break;
     }
 
-    /* printf("DTS AC5 length=%d\n",ac5_length); */
-    /*
+#ifdef LOG_DEBUG
+    printf("DTS AC5 length=%d\n",ac5_length);
     for(i=2000;i<2048;i++) {
       printf("%02x ",data[i]);
     }
     printf("\n");
-     */ 
+#endif
   
     if (ac5_length > 8191) {
       printf("ac5_length too long\n");
@@ -187,7 +193,10 @@ void dts_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
       }
     }
     
-    /* printf("DTS length=%d loop=%d pts=%u\n",ac5_pcm_length,n,audio_buffer->vpts); */
+#ifdef LOG_DEBUG
+    printf("DTS length=%d loop=%d pts=%u\n",ac5_pcm_length,n,audio_buffer->vpts);
+#endif
+
     audio_buffer->num_frames = ac5_pcm_length;
 
     data_out[0] = 0x72; data_out[1] = 0xf8;	/* spdif syncword    */
diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c
index 3ade25735..ae061e588 100644
--- a/src/video_out/alphablend.c
+++ b/src/video_out/alphablend.c
@@ -30,8 +30,8 @@
 
 /*
 #define LOG_BLEND_YUV
-#define LOG_BLEND_RGB16
 */
+#define LOG_BLEND_RGB16
 
 #include <string.h>
 #include <stdlib.h>
@@ -171,6 +171,9 @@ void blend_rgb16 (uint8_t * img, vo_overlay_t * img_overl,
 #ifdef LOG_BLEND_RGB16
   printf("blend_rgb16: img_height=%i, dst_height=%i\n", img_height, dst_height);
   printf("blend_rgb16: img_width=%i, dst_width=%i\n", img_width, dst_width);
+  if (img_width & 1) { printf("blend_rgb16s: odd\n");}
+  else { printf("blend_rgb16s: even\n");}
+
 #endif
 /* stripe_height is used in yuv2rgb scaling, so use the same scale factor here for overlays. */
   stripe_height = 16 * img_height / dst_height;
@@ -180,7 +183,7 @@ void blend_rgb16 (uint8_t * img, vo_overlay_t * img_overl,
 #ifdef LOG_BLEND_RGB16
   printf("blend_rgb16: dy_step=%i, x_scale=%i\n", dy_step, x_scale);
 #endif
-
+  if (img_width & 1) img_width++;
   img_offset = ( ( (img_overl->y * img_height) / dst_height) * img_width) 
              + ( (img_overl->x * img_width) / dst_width);
 #ifdef LOG_BLEND_RGB16