virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

libavcodec/hevcdsp_template: random cosmetics to reduce diff to 064698d381

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-02 11:59:02 +01:00
parent 69b3668b83
commit 42dbe2d9b1
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libavcodec/hevcdsp_template.c
View File

@ -21,14 +21,11 @@
*/ */
#include "get_bits.h" #include "get_bits.h"
#include "hevc.h"
#include "bit_depth_template.c" #include "bit_depth_template.c"
#include "hevcdsp.h" #include "hevcdsp.h"
#include "hevc.h"
#define SET(dst, x) (dst) = (x)
#define SCALE(dst, x) (dst) = av_clip_int16(((x) + add) >> shift)
#define ADD_AND_SCALE(dst, x) (dst) = av_clip_pixel((dst) + av_clip_int16(((x) + add) >> shift))
static void FUNC(put_pcm)(uint8_t *_dst, ptrdiff_t stride, int size, static void FUNC(put_pcm)(uint8_t *_dst, ptrdiff_t stride, int size,
GetBitContext *gb, int pcm_bit_depth) GetBitContext *gb, int pcm_bit_depth)
@ -134,21 +131,29 @@ static void FUNC(transform_skip)(uint8_t *_dst, int16_t *coeffs,
} }
} }
static void FUNC(transform_4x4_luma_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t stride) #define SET(dst, x) (dst) = (x)
{ #define SCALE(dst, x) (dst) = av_clip_int16(((x) + add) >> shift)
#define TR_4x4_LUMA(dst, src, step, assign) \ #define ADD_AND_SCALE(dst, x) \
do { \ (dst) = av_clip_pixel((dst) + av_clip_int16(((x) + add) >> shift))
int c0 = src[0*step] + src[2*step]; \
int c1 = src[2*step] + src[3*step]; \ #define TR_4x4_LUMA(dst, src, step, assign) \
int c2 = src[0*step] - src[3*step]; \ do { \
int c3 = 74 * src[1*step]; \ int c0 = src[0 * step] + src[2 * step]; \
\ int c1 = src[2 * step] + src[3 * step]; \
assign(dst[2*step], 74 * (src[0*step] - src[2*step] + src[3*step])); \ int c2 = src[0 * step] - src[3 * step]; \
assign(dst[0*step], 29 * c0 + 55 * c1 + c3); \ int c3 = 74 * src[1 * step]; \
assign(dst[1*step], 55 * c2 - 29 * c1 + c3); \ \
assign(dst[3*step], 55 * c0 + 29 * c2 - c3); \ assign(dst[2 * step], 74 * (src[0 * step] - \
src[2 * step] + \
src[3 * step])); \
assign(dst[0 * step], 29 * c0 + 55 * c1 + c3); \
assign(dst[1 * step], 55 * c2 - 29 * c1 + c3); \
assign(dst[3 * step], 55 * c0 + 29 * c2 - c3); \
} while (0) } while (0)
static void FUNC(transform_4x4_luma_add)(uint8_t *_dst, int16_t *coeffs,
ptrdiff_t stride)
{
int i; int i;
pixel *dst = (pixel *)_dst; pixel *dst = (pixel *)_dst;
int shift = 7; int shift = 7;