Mercurial > libavcodec.hg
diff vp3.c @ 7995:1fbfce20cb79 libavcodec
Move VP3 loop filter to DSPContext
author | conrad |
---|---|
date | Sat, 04 Oct 2008 10:26:17 +0000 |
parents | 6cf217dad67d |
children | 28d9f91aeb28 |
line wrap: on
line diff
--- a/vp3.c Sat Oct 04 09:43:11 2008 +0000 +++ b/vp3.c Sat Oct 04 10:26:17 2008 +0000 @@ -1283,12 +1283,6 @@ } } - -static void horizontal_filter(unsigned char *first_pixel, int stride, - int *bounding_values); -static void vertical_filter(unsigned char *first_pixel, int stride, - int *bounding_values); - /* * Perform the final rendering for a particular slice of data. * The slice number ranges from 0..(macroblock_height - 1). @@ -1495,39 +1489,6 @@ emms_c(); } -static void horizontal_filter(unsigned char *first_pixel, int stride, - int *bounding_values) -{ - unsigned char *end; - int filter_value; - - for (end= first_pixel + 8*stride; first_pixel != end; first_pixel += stride) { - filter_value = - (first_pixel[-2] - first_pixel[ 1]) - +3*(first_pixel[ 0] - first_pixel[-1]); - filter_value = bounding_values[(filter_value + 4) >> 3]; - first_pixel[-1] = av_clip_uint8(first_pixel[-1] + filter_value); - first_pixel[ 0] = av_clip_uint8(first_pixel[ 0] - filter_value); - } -} - -static void vertical_filter(unsigned char *first_pixel, int stride, - int *bounding_values) -{ - unsigned char *end; - int filter_value; - const int nstride= -stride; - - for (end= first_pixel + 8; first_pixel < end; first_pixel++) { - filter_value = - (first_pixel[2 * nstride] - first_pixel[ stride]) - +3*(first_pixel[0 ] - first_pixel[nstride]); - filter_value = bounding_values[(filter_value + 4) >> 3]; - first_pixel[nstride] = av_clip_uint8(first_pixel[nstride] + filter_value); - first_pixel[0] = av_clip_uint8(first_pixel[0] - filter_value); - } -} - static void apply_loop_filter(Vp3DecodeContext *s) { int plane; @@ -1569,7 +1530,7 @@ /* do not perform left edge filter for left columns frags */ if ((x > 0) && (s->all_fragments[fragment].coding_method != MODE_COPY)) { - horizontal_filter( + s->dsp.vp3_h_loop_filter( plane_data + s->all_fragments[fragment].first_pixel, stride, bounding_values); } @@ -1577,7 +1538,7 @@ /* do not perform top edge filter for top row fragments */ if ((y > 0) && (s->all_fragments[fragment].coding_method != MODE_COPY)) { - vertical_filter( + s->dsp.vp3_v_loop_filter( plane_data + s->all_fragments[fragment].first_pixel, stride, bounding_values); } @@ -1588,7 +1549,7 @@ if ((x < width - 1) && (s->all_fragments[fragment].coding_method != MODE_COPY) && (s->all_fragments[fragment + 1].coding_method == MODE_COPY)) { - horizontal_filter( + s->dsp.vp3_h_loop_filter( plane_data + s->all_fragments[fragment + 1].first_pixel, stride, bounding_values); } @@ -1599,7 +1560,7 @@ if ((y < height - 1) && (s->all_fragments[fragment].coding_method != MODE_COPY) && (s->all_fragments[fragment + width].coding_method == MODE_COPY)) { - vertical_filter( + s->dsp.vp3_v_loop_filter( plane_data + s->all_fragments[fragment + width].first_pixel, stride, bounding_values); }