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

[conrad]

Author: conrad
Date: Wed Dec  3 22:28:42 2008
New Revision: 3847

Log:
Remove Kr and Kb, their values are implied by dirac_color_matrix


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

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Wed Dec  3 22:28:42 2008
@@ -95,8 +95,6 @@ static const color_specification dirac_c
     { COLOR_PRIMARY_HDTV,     COLOR_MATRIX_HDTV, TRANSFER_FUNC_TV },
     { COLOR_PRIMARY_HDTV,     COLOR_MATRIX_HDTV, TRANSFER_FUNC_DCI_GAMMA },
 };
-static const float dirac_preset_kr[] = { 0.2126, 0.299, 0 /* XXX */ };
-static const float dirac_preset_kb[] = { 0.0722, 0.114, 0 /* XXX */ };
 
 static const enum PixelFormat dirac_pix_fmt[][2] = {
     { PIX_FMT_YUV444P, PIX_FMT_YUVJ444P },
@@ -301,8 +299,6 @@ static int parse_source_parameters(GetBi
                 return -1;
         }
     }
-    source->k_r = dirac_preset_kr[source->color_spec_index];
-    source->k_b = dirac_preset_kb[source->color_spec_index];
 
     luma_depth   = av_log2(source->pixel_range.luma_excursion   + 1);
     chroma_depth = av_log2(source->pixel_range.chroma_excursion + 1);

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Wed Dec  3 22:28:42 2008
@@ -104,8 +104,6 @@ typedef struct {
 
     dirac_pixel_range pixel_range;
     color_specification color_spec;
-    float k_r;
-    float k_b; /* XXX: ??? */
 } dirac_source_params;
 
 struct decoding_parameters {