swr: add triangular dither support
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Apr 2012 19:10:14 +0000 (21:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Apr 2012 19:18:33 +0000 (21:18 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswresample/dither.c
libswresample/swresample.c
libswresample/swresample.h

index 4e39cce..663e200 100644 (file)
@@ -40,6 +40,11 @@ void swri_get_dither(void *dst, int len, unsigned seed, enum AVSampleFormat out_
 
         switch(method){
             case SWR_DITHER_RECTANGULAR: v= ((double)seed) / UINT_MAX - 0.5; break;
+            case SWR_DITHER_TRIANGULAR :
+                v = ((double)seed) / UINT_MAX;
+                seed = seed*1664525 + 1013904223;
+                v-= ((double)seed) / UINT_MAX;
+                break;
             default: av_assert0(0);
         }
 
index 8b06061..58096b3 100644 (file)
@@ -55,6 +55,7 @@ static const AVOption options[]={
 {"res", "force resampling", 0, AV_OPT_TYPE_CONST, {.dbl=SWR_FLAG_RESAMPLE}, INT_MIN, INT_MAX, 0, "flags"},
 {"dither", "dither method"      , OFFSET(dither_method), AV_OPT_TYPE_INT, {.dbl=0}, 0, SWR_DITHER_NB-1, 0, "dither_method"},
 {"rectangular", "rectangular dither", 0, AV_OPT_TYPE_CONST, {.dbl=SWR_DITHER_RECTANGULAR}, INT_MIN, INT_MAX, 0, "dither_method"},
+{"triangular" , "triangular dither" , 0, AV_OPT_TYPE_CONST, {.dbl=SWR_DITHER_TRIANGULAR }, INT_MIN, INT_MAX, 0, "dither_method"},
 
 {0}
 };
index 1f87617..9bd5b67 100644 (file)
@@ -48,6 +48,7 @@
 enum SwrDitherType {
     SWR_DITHER_NONE = 0,
     SWR_DITHER_RECTANGULAR,
+    SWR_DITHER_TRIANGULAR,
     SWR_DITHER_NB,              ///< not part of API/ABI
 };