[FFmpeg-cvslog] avfilter/vf_spp: change temporary to unsigned

Michael Niedermayer git at videolan.org
Fri Dec 12 14:49:54 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 12 13:34:18 2014 +0100| [30d2ac4bf9b995bd9ab00e3a7277f4207be676e8] | committer: Michael Niedermayer

avfilter/vf_spp: change temporary to unsigned

More consistent with uspp and allows for future 10bit support

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30d2ac4bf9b995bd9ab00e3a7277f4207be676e8
---

 libavfilter/vf_spp.c     |    4 ++--
 libavfilter/vf_spp.h     |    4 ++--
 libavfilter/x86/vf_spp.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c
index 989e283..8eb0c7e 100644
--- a/libavfilter/vf_spp.c
+++ b/libavfilter/vf_spp.c
@@ -156,7 +156,7 @@ static void softthresh_c(int16_t dst[64], const int16_t src[64],
     }
 }
 
-static void store_slice_c(uint8_t *dst, const int16_t *src,
+static void store_slice_c(uint8_t *dst, const uint16_t *src,
                           int dst_linesize, int src_linesize,
                           int width, int height, int log2_scale,
                           const uint8_t dither[8][8])
@@ -186,7 +186,7 @@ static void store_slice_c(uint8_t *dst, const int16_t *src,
     }
 }
 
-static inline void add_block(int16_t *dst, int linesize, const int16_t block[64])
+static inline void add_block(uint16_t *dst, int linesize, const int16_t block[64])
 {
     int y;
 
diff --git a/libavfilter/vf_spp.h b/libavfilter/vf_spp.h
index 7e7e227..14e1ddb 100644
--- a/libavfilter/vf_spp.h
+++ b/libavfilter/vf_spp.h
@@ -37,7 +37,7 @@ typedef struct {
     int qscale_type;
     int temp_linesize;
     uint8_t *src;
-    int16_t *temp;
+    uint16_t *temp;
     AVCodecContext *avctx;
     AVDCT *dct;
     int8_t *non_b_qp_table;
@@ -45,7 +45,7 @@ typedef struct {
     int use_bframe_qp;
     int hsub, vsub;
 
-    void (*store_slice)(uint8_t *dst, const int16_t *src,
+    void (*store_slice)(uint8_t *dst, const uint16_t *src,
                         int dst_stride, int src_stride,
                         int width, int height, int log2_scale,
                         const uint8_t dither[8][8]);
diff --git a/libavfilter/x86/vf_spp.c b/libavfilter/x86/vf_spp.c
index eb46ddc..862190b 100644
--- a/libavfilter/x86/vf_spp.c
+++ b/libavfilter/x86/vf_spp.c
@@ -174,7 +174,7 @@ static void softthresh_mmx(int16_t dst[64], const int16_t src[64],
     dst[0] = (src[0] + 4) >> 3;
 }
 
-static void store_slice_mmx(uint8_t *dst, const int16_t *src,
+static void store_slice_mmx(uint8_t *dst, const uint16_t *src,
                             int dst_stride, int src_stride,
                             int width, int height, int log2_scale,
                             const uint8_t dither[8][8])



More information about the ffmpeg-cvslog mailing list