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

conrad subversion at mplayerhq.hu
Mon Nov 10 04:12:22 CET 2008


Author: conrad
Date: Mon Nov 10 04:12:22 2008
New Revision: 3803

Log:
Comment nits


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

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Mon Nov 10 04:12:22 2008
@@ -37,7 +37,7 @@
 #include "dirac_wavelet.h"
 #include "mpeg12data.h"
 
-/* Defaults for source parameters. */
+/* defaults for source parameters */
 static const dirac_source_params dirac_source_parameters_defaults[] =
 {
     { 640,  480,  2, 0, 0, 1,  1, 640,  480,  0, 0, 1, 0 },
@@ -172,7 +172,7 @@ void dirac_dump_source_parameters(AVCode
 }
 
 /**
- * Parse the source parameters in the access unit header
+ * Parse the source parameters in the sequence header.
  */
 static int parse_source_parameters(DiracContext *s)
 {
@@ -195,12 +195,11 @@ static int parse_source_parameters(Dirac
     s->source.chroma_height = s->source.luma_height >> s->chroma_vshift;
 
     if (get_bits1(gb))
-        /* Interlace. */
         s->source.interlaced = svq3_get_ue_golomb(gb);
     if (s->source.interlaced > 1)
         return -1;
 
-    /* Framerate. */
+    /* framerate */
     if (get_bits1(gb)) {
         s->source.frame_rate_index = svq3_get_ue_golomb(gb);
 
@@ -265,7 +264,7 @@ static int parse_source_parameters(Dirac
         s->source.chroma_excursion = dirac_preset_chroma_excursion[idx];
     }
 
-    /* Color spec. */
+    /* color spec */
     s->source.color_spec = dirac_color_spec_presets[s->source.color_spec_index];
     if (get_bits1(gb)) {
         s->source.color_spec_index = svq3_get_ue_golomb(gb);
@@ -276,7 +275,7 @@ static int parse_source_parameters(Dirac
         s->source.color_spec = dirac_color_spec_presets[s->source.color_spec_index];
 
         if (! s->source.color_spec_index) {
-            /* Color primaries. */
+            /* color primaries */
             if (get_bits1(gb)) {
                 unsigned int primaries_idx = svq3_get_ue_golomb(gb);
 
@@ -286,7 +285,7 @@ static int parse_source_parameters(Dirac
                 s->source.color_spec.primaries = primaries_idx;
             }
 
-            /* Override matrix. */
+            /* override matrix */
             if (get_bits1(gb)) {
                 unsigned int matrix_idx = svq3_get_ue_golomb(gb);
 
@@ -296,7 +295,7 @@ static int parse_source_parameters(Dirac
                 s->source.color_spec.matrix = matrix_idx;
             }
 
-            /* Transfer function. */
+            /* transfer function */
             if (get_bits1(gb)) {
                 unsigned int tf_idx = svq3_get_ue_golomb(gb);
 
@@ -317,7 +316,7 @@ static int parse_source_parameters(Dirac
 }
 
 /**
- * Parse the sequence header
+ * Parse the sequence header.
  */
 int ff_dirac_parse_sequence_header(DiracContext *s)
 {
@@ -327,7 +326,7 @@ int ff_dirac_parse_sequence_header(Dirac
     unsigned int video_format;
     unsigned int picture_coding_mode;
 
-    /* Parse parameters. */
+    /* parse parameters */
     version_major = svq3_get_ue_golomb(gb);
     version_minor = svq3_get_ue_golomb(gb);
     /* XXX: Don't check the version yet, existing encoders do not yet

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Mon Nov 10 04:12:22 2008
@@ -67,20 +67,20 @@ typedef struct {
 
 
 typedef struct {
-    /* Information about the frames. */
+    /* information about the frames */
     unsigned int luma_width;           ///< the luma component width
     unsigned int luma_height;          ///< the luma component height
-    /** Choma format: 0: 4:4:4, 1: 4:2:2, 2: 4:2:0 */
+    /** choma format: 0: 4:4:4, 1: 4:2:2, 2: 4:2:0 */
     unsigned int chroma_format;
 
-    /* Interlacing. */
+    /* interlacing */
     char interlaced;                   ///< flag for interlacing
     char top_field_first;
 
     unsigned int frame_rate_index;     ///< index into dirac_frame_rate[]
     unsigned int aspect_ratio_index;   ///< index into dirac_aspect_ratio[]
 
-    /* Clean area. */
+    /* clean area */
     uint16_t clean_width;
     uint16_t clean_height;
     uint16_t clean_left_offset;
@@ -89,7 +89,7 @@ typedef struct {
     unsigned int signal_range_index;   ///< index into dirac_signal_range[]
     unsigned int color_spec_index;     ///< index into ff_dirac_color_spec_presets[]
 
-    /* Calculated: */
+    /* calculated fields */
     unsigned int chroma_width;         ///< the chroma component width
     unsigned int chroma_height;        ///< the chroma component height
     unsigned int luma_depth;
@@ -98,7 +98,7 @@ typedef struct {
     AVRational frame_rate;
     AVRational aspect_ratio;
 
-    /* Luma and chroma offsets. */
+    /* luma and chroma offsets */
     uint16_t luma_offset;
     uint16_t luma_excursion;
     uint16_t chroma_offset;



More information about the FFmpeg-soc mailing list