Re: [libav-devel] [PATCH] cook: extend channel uncoupling tables so the full bit range is covered.

[Benjamin Larsson]

On 03/06/2012 10:45 PM, Ronald S. Bultje wrote:
From: "Ronald S. Bultje"<rsbul...@gmail.com>
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-sta...@libav.org
---
  libavcodec/cookdata.h |   22 ++++++++++++++++------
  1 file changed, 16 insertions(+), 6 deletions(-)

Nice, I like the solution, but it definitely needs a comment in the 
source. And why do you add a 1 in the beginning just to offset the table 
later ?

MvH
Benjamin Larsson

diff --git a/libavcodec/cookdata.h b/libavcodec/cookdata.h
index e8d6ebf..a5c51f5 100644
--- a/libavcodec/cookdata.h
+++ b/libavcodec/cookdata.h
@@ -510,23 +510,30 @@ static const int cplband[51] = {
      19,
  };

-static const float cplscale2[3] = {
+static const float cplscale2[5] = {
+1,
  0.953020632266998,0.70710676908493,0.302905440330505,
+0,
  };

-static const float cplscale3[7] = {
+static const float cplscale3[9] = {
+1,
  0.981279790401459,0.936997592449188,0.875934481620789,0.70710676908493,
  0.482430040836334,0.349335819482803,0.192587479948997,
+0,
  };

-static const float cplscale4[15] = {
+static const float cplscale4[17] = {
+1,
  0.991486728191376,0.973249018192291,0.953020632266998,0.930133521556854,
  0.903453230857849,0.870746195316315,0.826180458068848,0.70710676908493,
  0.563405573368073,0.491732746362686,0.428686618804932,0.367221474647522,
  0.302905440330505,0.229752898216248,0.130207896232605,
+0,
  };

-static const float cplscale5[31] = {
+static const float cplscale5[33] = {
+1,
  0.995926380157471,0.987517595291138,0.978726446628571,0.969505727291107,
  0.95979779958725,0.949531257152557,0.938616216182709,0.926936149597168,
  0.914336204528809,0.900602877140045,0.885426938533783,0.868331849575043,
@@ -535,9 +542,11 @@ static const float cplscale5[31] = {
  0.464778542518616,0.434642940759659,0.404955863952637,0.375219136476517,
  0.344963222742081,0.313672333955765,0.280692428350449,0.245068684220314,
  0.205169528722763,0.157508864998817,0.0901700109243393,
+0,
  };

-static const float cplscale6[63] = {
+static const float cplscale6[65] = {
+1,
  0.998005926609039,0.993956744670868,0.989822506904602,0.985598564147949,
  0.981279790401459,0.976860702037811,0.972335040569305,0.967696130275726,
  0.962936460971832,0.958047747612000,0.953020632266998,0.947844684123993,
@@ -554,10 +563,11 @@ static const float cplscale6[63] = {
  0.302905440330505,0.286608695983887,0.269728302955627,0.252119421958923,
  0.233590632677078,0.213876649737358,0.192587479948997,0.169101938605309,
  0.142307326197624,0.109772264957428,0.0631198287010193,
+0,
  };

  static const float* const cplscales[5] = {
-    cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
+    cplscale2+1, cplscale3+1, cplscale4+1, cplscale5+1, cplscale6+1,
  };

  #endif /* AVCODEC_COOKDATA_H */

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel