diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 11:59:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 14:36:59 +0100 |
| commit | 69b3668b83eb6a69d90b65e33067019023d94104 (patch) | |
| tree | ab98bd7ba123bc8d695f95c4a07c269e03c53e16 /libavcodec/hevcdsp_template.c | |
| parent | 6a84d17bd79da6185ef9373f42ad87198b6b1b2f (diff) | |
| download | ffmpeg-streaming-69b3668b83eb6a69d90b65e33067019023d94104.zip ffmpeg-streaming-69b3668b83eb6a69d90b65e33067019023d94104.tar.gz | |
libavcodec/hevc: indention related cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevcdsp_template.c')
| -rw-r--r-- | libavcodec/hevcdsp_template.c | 47 |
1 files changed, 34 insertions, 13 deletions
diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c index ff691e4..5b3e619 100644 --- a/libavcodec/hevcdsp_template.c +++ b/libavcodec/hevcdsp_template.c @@ -845,16 +845,32 @@ static void FUNC(put_hevc_qpel_pixels)(int16_t *dst, ptrdiff_t dststride, } #define QPEL_FILTER_1(src, stride) \ - (-src[x - 3 * stride] + 4 * src[x - 2 * stride] - 10 * src[x - stride] + 58 * src[x] + \ - 17 * src[x + stride] - 5 * src[x + 2 * stride] + 1 * src[x + 3 * stride]) + (1 * -src[x - 3 * stride] + \ + 4 * src[x - 2 * stride] - \ + 10 * src[x - stride] + \ + 58 * src[x] + \ + 17 * src[x + stride] - \ + 5 * src[x + 2 * stride] + \ + 1 * src[x + 3 * stride]) #define QPEL_FILTER_2(src, stride) \ - (-src[x - 3 * stride] + 4 * src[x - 2 * stride] - 11 * src[x - stride] + 40 * src[x] + \ - 40 * src[x + stride] - 11 * src[x + 2 * stride] + 4 * src[x + 3 * stride] - src[x + 4 * stride]) + (1 * -src[x - 3 * stride] + \ + 4 * src[x - 2 * stride] - \ + 11 * src[x - stride] + \ + 40 * src[x] + \ + 40 * src[x + stride] - \ + 11 * src[x + 2 * stride] + \ + 4 * src[x + 3 * stride] - \ + 1 * src[x + 4 * stride]) #define QPEL_FILTER_3(src, stride) \ - (src[x - 2 * stride] - 5 * src[x - stride] + 17 * src[x] + 58 * src[x + stride] \ - - 10 * src[x + 2 * stride] + 4 * src[x + 3 * stride] - src[x + 4 * stride]) + (1 * src[x - 2 * stride] - \ + 5 * src[x - stride] + \ + 17 * src[x] + \ + 58 * src[x + stride] - \ + 10 * src[x + 2 * stride] + \ + 4 * src[x + 3 * stride] - \ + 1 * src[x + 4 * stride]) #define PUT_HEVC_QPEL_H(H) \ @@ -894,8 +910,10 @@ static void FUNC(put_hevc_qpel_v ## V)(int16_t *dst, ptrdiff_t dststride, \ } #define PUT_HEVC_QPEL_HV(H, V) \ -static void FUNC(put_hevc_qpel_h ## H ## v ## V)(int16_t *dst, ptrdiff_t dststride, \ - uint8_t *_src, ptrdiff_t _srcstride,\ +static void FUNC(put_hevc_qpel_h ## H ## v ## V)(int16_t *dst, \ + ptrdiff_t dststride, \ + uint8_t *_src, \ + ptrdiff_t _srcstride, \ int width, int height, \ int16_t* mcbuffer) \ { \ @@ -959,7 +977,10 @@ static void FUNC(put_hevc_epel_pixels)(int16_t *dst, ptrdiff_t dststride, } #define EPEL_FILTER(src, stride) \ - (filter_0 * src[x - stride] + filter_1 * src[x] + filter_2 * src[x + stride] + filter_3 * src[x + 2 * stride]) + (filter_0 * src[x - stride] + \ + filter_1 * src[x] + \ + filter_2 * src[x + stride] + \ + filter_3 * src[x + 2 * stride]) static void FUNC(put_hevc_epel_h)(int16_t *dst, ptrdiff_t dststride, uint8_t *_src, ptrdiff_t _srcstride, @@ -1162,9 +1183,9 @@ static void FUNC(weighted_pred_avg)(uint8_t denom, #define P3 pix[-4 * xstride] #define P2 pix[-3 * xstride] #define P1 pix[-2 * xstride] -#define P0 pix[-xstride] +#define P0 pix[-1 * xstride] #define Q0 pix[0] -#define Q1 pix[xstride] +#define Q1 pix[1 * xstride] #define Q2 pix[2 * xstride] #define Q3 pix[3 * xstride] @@ -1172,9 +1193,9 @@ static void FUNC(weighted_pred_avg)(uint8_t denom, #define TP3 pix[-4 * xstride + 3 * ystride] #define TP2 pix[-3 * xstride + 3 * ystride] #define TP1 pix[-2 * xstride + 3 * ystride] -#define TP0 pix[-xstride + 3 * ystride] +#define TP0 pix[-1 * xstride + 3 * ystride] #define TQ0 pix[3 * ystride] -#define TQ1 pix[xstride + 3 * ystride] +#define TQ1 pix[1 * xstride + 3 * ystride] #define TQ2 pix[2 * xstride + 3 * ystride] #define TQ3 pix[3 * xstride + 3 * ystride] |
