[SCM] libav/experimental: Mark parameter src of vector_clipf() as const

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:50:32 UTC 2013


The following commit has been merged in the experimental branch:
commit 50e23ae9d3681476392d630e3daba304fa211122
Author: Vitor Sessak <vitor1001 at gmail.com>
Date:   Thu Aug 27 15:38:59 2009 +0000

    Mark parameter src of vector_clipf() as const
    
    Originally committed as revision 19729 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 758f613..e1f2eda 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -4102,13 +4102,13 @@ static inline uint32_t clipf_c_one(uint32_t a, uint32_t mini,
     else return a;
 }
 
-static void vector_clipf_c_opposite_sign(float *dst, float *src, float *min, float *max, int len){
+static void vector_clipf_c_opposite_sign(float *dst, const float *src, float *min, float *max, int len){
     int i;
     uint32_t mini = *(uint32_t*)min;
     uint32_t maxi = *(uint32_t*)max;
     uint32_t maxisign = maxi ^ (1<<31);
     uint32_t *dsti = (uint32_t*)dst;
-    uint32_t *srci = (uint32_t*)src;
+    const uint32_t *srci = (const uint32_t*)src;
     for(i=0; i<len; i+=8) {
         dsti[i + 0] = clipf_c_one(srci[i + 0], mini, maxi, maxisign);
         dsti[i + 1] = clipf_c_one(srci[i + 1], mini, maxi, maxisign);
@@ -4120,7 +4120,7 @@ static void vector_clipf_c_opposite_sign(float *dst, float *src, float *min, flo
         dsti[i + 7] = clipf_c_one(srci[i + 7], mini, maxi, maxisign);
     }
 }
-static void vector_clipf_c(float *dst, float *src, float min, float max, int len){
+static void vector_clipf_c(float *dst, const float *src, float min, float max, int len){
     int i;
     if(min < 0 && max > 0) {
         vector_clipf_c_opposite_sign(dst, src, &min, &max, len);
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 032dd1d..bad2d9e 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -396,7 +396,7 @@ typedef struct DSPContext {
     void (*vector_fmul_window)(float *dst, const float *src0, const float *src1, const float *win, float add_bias, int len);
     /* assume len is a multiple of 8, and arrays are 16-byte aligned */
     void (*int32_to_float_fmul_scalar)(float *dst, const int *src, float mul, int len);
-    void (*vector_clipf)(float *dst /* align 16 */, float *src /* align 16 */, float min, float max, int len /* align 16 */);
+    void (*vector_clipf)(float *dst /* align 16 */, const float *src /* align 16 */, float min, float max, int len /* align 16 */);
 
     /* C version: convert floats from the range [384.0,386.0] to ints in [-32768,32767]
      * simd versions: convert floats from [-32768.0,32767.0] without rescaling and arrays are 16byte aligned */
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 374aa64..bdf12e1 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -2346,7 +2346,7 @@ static void int32_to_float_fmul_scalar_sse2(float *dst, const int *src, float mu
     );
 }
 
-static void vector_clipf_sse(float *dst, float *src, float min, float max,
+static void vector_clipf_sse(float *dst, const float *src, float min, float max,
                              int len)
 {
     x86_reg i = (len-16)*4;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list