[FFmpeg-soc] [soc]: r3848 - in dirac/libavcodec: dirac.c dirac.h diracdec.c

[conrad]

Author: conrad
Date: Wed Dec  3 22:28:45 2008
New Revision: 3848

Log:
Fix dirac_dump_source_parameters


Modified:
   dirac/libavcodec/dirac.c
   dirac/libavcodec/dirac.h
   dirac/libavcodec/diracdec.c

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Wed Dec  3 22:28:45 2008
@@ -141,11 +141,8 @@ void dirac_dump_source_parameters(AVCode
     dprintf(avctx, "        Dumping source parameters:\n");
     dprintf(avctx, "-----------------------------------------------------\n");
 
-    dprintf(avctx, "Luma size=%dx%d\n",
-            source->width, source->height);
-    dprintf(avctx, "Chroma size=%dx%d, format: %s\n",
-            source->chroma_width, source->chroma_height,
-            chroma_format_str[source->chroma_format]);
+    dprintf(avctx, "Luma size=%dx%d  chroma format %d\n",
+            source->width, source->height, source->chroma_format);
 
     if (! source->interlaced)
         dprintf(avctx, "No interlacing\n");
@@ -153,23 +150,24 @@ void dirac_dump_source_parameters(AVCode
         dprintf(avctx, "Interlacing: top fields first=%d\n",
                 source->top_field_first);
 
-    dprintf(avctx, "Frame rate: %d/%d = %f\n",
-            source->frame_rate.num, source->frame_rate.den,
-            (double) source->frame_rate.num / source->frame_rate.den);
-    dprintf(avctx, "Aspect ratio: %d/%d = %f\n",
-            source->aspect_ratio.num, source->aspect_ratio.den,
-            (double) source->aspect_ratio.num / source->aspect_ratio.den);
+    dprintf(avctx, "Frame rate: %d/%d\n",
+            avctx->time_base.den, avctx->time_base.num);
+    dprintf(avctx, "Aspect ratio: %d/%d\n",
+            avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den);
 
     dprintf(avctx, "Clean space: loff=%d, roff=%d, size=%dx%d\n",
             source->clean_left_offset, source->clean_right_offset,
             source->clean_width, source->clean_height);
 
     dprintf(avctx, "Luma offset=%d, Luma excursion=%d\n",
-            source->luma_offset, source->luma_excursion);
+            source->pixel_range.luma_offset,
+            source->pixel_range.luma_excursion);
     dprintf(avctx, "Croma offset=%d, Chroma excursion=%d\n",
-            source->chroma_offset, source->chroma_excursion);
-
-    /* XXX: This list is incomplete, add the other members. */
+            source->pixel_range.chroma_offset,
+            source->pixel_range.chroma_excursion);
+    dprintf(avctx, "Color spec: Primary %d  Matrix %d  Transfer %d\n",
+            source->color_spec.primaries, source->color_spec.matrix,
+            source->color_spec.transfer_function);
 
     dprintf(avctx, "-----------------------------------------------------\n");
 }

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Wed Dec  3 22:28:45 2008
@@ -28,8 +28,6 @@
  * @author Marco Gerards <marco at gnu.org>
  */
 
-#undef DEBUG
-
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dirac_arith.h"

Modified: dirac/libavcodec/diracdec.c
==============================================================================
--- dirac/libavcodec/diracdec.c	(original)
+++ dirac/libavcodec/diracdec.c	Wed Dec  3 22:28:45 2008
@@ -25,8 +25,6 @@
  * @author Marco Gerards <marco at gnu.org>
  */
 
-#undef DEBUG
-
 #include "dirac.h"
 #include "avcodec.h"
 #include "dsputil.h"
@@ -858,9 +856,7 @@ int dirac_decode_frame(AVCodecContext *a
             avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_hshift,
                                           &s->chroma_vshift);
             /* Dump the header. */
-#if 0
             dirac_dump_source_parameters(avctx);
-#endif
 
         } else if (parse_code & 0x8)
             // we found a picture