Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1dsp: K&R formatting cosmetics

Conflicts:
	libavcodec/vc1dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/53/head
Michael Niedermayer 11 years ago
commit 4daf8bc31b
  1. 248
      libavcodec/vc1dsp.c

@ -31,9 +31,7 @@
#include "rnd_avg.h"
#include "vc1dsp.h"
/** Apply overlap transform to horizontal edge
*/
/* Apply overlap transform to horizontal edge */
static void vc1_v_overlap_c(uint8_t *src, int stride)
{
int i;
@ -57,8 +55,7 @@ static void vc1_v_overlap_c(uint8_t* src, int stride)
}
}
/** Apply overlap transform to vertical edge
*/
/* Apply overlap transform to vertical edge */
static void vc1_h_overlap_c(uint8_t *src, int stride)
{
int i;
@ -142,21 +139,28 @@ static void vc1_h_s_overlap_c(int16_t *left, int16_t *right)
* @return whether other 3 pairs should be filtered or not
* @see 8.6
*/
static av_always_inline int vc1_filter_line(uint8_t* src, int stride, int pq){
int a0 = (2*(src[-2*stride] - src[ 1*stride]) - 5*(src[-1*stride] - src[ 0*stride]) + 4) >> 3;
static av_always_inline int vc1_filter_line(uint8_t *src, int stride, int pq)
{
int a0 = (2 * (src[-2 * stride] - src[1 * stride]) -
5 * (src[-1 * stride] - src[0 * stride]) + 4) >> 3;
int a0_sign = a0 >> 31; /* Store sign */
a0 = (a0 ^ a0_sign) - a0_sign; /* a0 = FFABS(a0); */
if (a0 < pq) {
int a1 = FFABS((2*(src[-4*stride] - src[-1*stride]) - 5*(src[-3*stride] - src[-2*stride]) + 4) >> 3);
int a2 = FFABS((2*(src[ 0*stride] - src[ 3*stride]) - 5*(src[ 1*stride] - src[ 2*stride]) + 4) >> 3);
int a1 = FFABS((2 * (src[-4 * stride] - src[-1 * stride]) -
5 * (src[-3 * stride] - src[-2 * stride]) + 4) >> 3);
int a2 = FFABS((2 * (src[ 0 * stride] - src[ 3 * stride]) -
5 * (src[ 1 * stride] - src[ 2 * stride]) + 4) >> 3);
if (a1 < a0 || a2 < a0) {
int clip = src[-1 * stride] - src[0 * stride];
int clip_sign = clip >> 31;
clip = ((clip ^ clip_sign) - clip_sign) >> 1;
if (clip) {
int a3 = FFMIN(a1, a2);
int d = 5 * (a3 - a0);
int d_sign = (d >> 31);
d = ((d ^ d_sign) - d_sign) >> 3;
d_sign ^= a0_sign;
@ -184,7 +188,8 @@ static av_always_inline int vc1_filter_line(uint8_t* src, int stride, int pq){
* @param pq block quantizer
* @see 8.6
*/
static inline void vc1_loop_filter(uint8_t* src, int step, int stride, int len, int pq)
static inline void vc1_loop_filter(uint8_t *src, int step, int stride,
int len, int pq)
{
int i;
int filt3;
@ -230,14 +235,15 @@ static void vc1_h_loop_filter16_c(uint8_t *src, int stride, int pq)
vc1_loop_filter(src, stride, 1, 16, pq);
}
/** Do inverse transform on 8x8 block
*/
/* Do inverse transform on 8x8 block */
static void vc1_inv_trans_8x8_dc_c(uint8_t *dest, int linesize, int16_t *block)
{
int i;
int dc = block[0];
dc = (3 * dc + 1) >> 1;
dc = (3 * dc + 16) >> 5;
for (i = 0; i < 8; i++) {
dest[0] = av_clip_uint8(dest[0] + dc);
dest[1] = av_clip_uint8(dest[1] + dc);
@ -320,14 +326,15 @@ static void vc1_inv_trans_8x8_c(int16_t block[64])
}
}
/** Do inverse transform on 8x4 part of block
*/
/* Do inverse transform on 8x4 part of block */
static void vc1_inv_trans_8x4_dc_c(uint8_t *dest, int linesize, int16_t *block)
{
int i;
int dc = block[0];
dc = (3 * dc + 1) >> 1;
dc = (17 * dc + 64) >> 7;
for (i = 0; i < 4; i++) {
dest[0] = av_clip_uint8(dest[0] + dc);
dest[1] = av_clip_uint8(dest[1] + dc);
@ -349,6 +356,7 @@ static void vc1_inv_trans_8x4_c(uint8_t *dest, int linesize, int16_t *block)
src = block;
dst = block;
for (i = 0; i < 4; i++) {
t1 = 12 * (src[0] + src[4]) + 4;
t2 = 12 * (src[0] - src[4]) + 4;
@ -395,14 +403,15 @@ static void vc1_inv_trans_8x4_c(uint8_t *dest, int linesize, int16_t *block)
}
}
/** Do inverse transform on 4x8 parts of block
*/
/* Do inverse transform on 4x8 parts of block */
static void vc1_inv_trans_4x8_dc_c(uint8_t *dest, int linesize, int16_t *block)
{
int i;
int dc = block[0];
dc = (17 * dc + 4) >> 3;
dc = (12 * dc + 64) >> 7;
for (i = 0; i < 8; i++) {
dest[0] = av_clip_uint8(dest[0] + dc);
dest[1] = av_clip_uint8(dest[1] + dc);
@ -420,6 +429,7 @@ static void vc1_inv_trans_4x8_c(uint8_t *dest, int linesize, int16_t *block)
src = block;
dst = block;
for (i = 0; i < 8; i++) {
t1 = 17 * (src[0] + src[2]) + 4;
t2 = 17 * (src[0] - src[2]) + 4;
@ -466,14 +476,15 @@ static void vc1_inv_trans_4x8_c(uint8_t *dest, int linesize, int16_t *block)
}
}
/** Do inverse transform on 4x4 part of block
*/
/* Do inverse transform on 4x4 part of block */
static void vc1_inv_trans_4x4_dc_c(uint8_t *dest, int linesize, int16_t *block)
{
int i;
int dc = block[0];
dc = (17 * dc + 4) >> 3;
dc = (17 * dc + 64) >> 7;
for (i = 0; i < 4; i++) {
dest[0] = av_clip_uint8(dest[0] + dc);
dest[1] = av_clip_uint8(dest[1] + dc);
@ -524,19 +535,25 @@ static void vc1_inv_trans_4x4_c(uint8_t *dest, int linesize, int16_t *block)
}
/* motion compensation functions */
/** Filter in case of 2 filters */
/* Filter in case of 2 filters */
#define VC1_MSPEL_FILTER_16B(DIR, TYPE) \
static av_always_inline int vc1_mspel_ ## DIR ## _filter_16bits(const TYPE *src, int stride, int mode) \
static av_always_inline int vc1_mspel_ ## DIR ## _filter_16bits(const TYPE *src, \
int stride, \
int mode) \
{ \
switch(mode) { \
case 0: /* no shift - should not occur */ \
return 0; \
case 1: /* 1/4 shift */ \
return -4*src[-stride] + 53*src[0] + 18*src[stride] - 3*src[stride*2]; \
return -4 * src[-stride] + 53 * src[0] + \
18 * src[stride] - 3 * src[stride * 2]; \
case 2: /* 1/2 shift */ \
return -src[-stride] + 9*src[0] + 9*src[stride] - src[stride*2]; \
return -1 * src[-stride] + 9 * src[0] + \
9 * src[stride] - 1 * src[stride * 2]; \
case 3: /* 3/4 shift */ \
return -3*src[-stride] + 18*src[0] + 53*src[stride] - 4*src[stride*2]; \
return -3 * src[-stride] + 18 * src[0] + \
53 * src[stride] - 4 * src[stride * 2]; \
} \
return 0; /* should not occur */ \
}
@ -544,28 +561,34 @@ static av_always_inline int vc1_mspel_ ## DIR ## _filter_16bits(const TYPE *src,
VC1_MSPEL_FILTER_16B(ver, uint8_t)
VC1_MSPEL_FILTER_16B(hor, int16_t)
/** Filter used to interpolate fractional pel values
*/
static av_always_inline int vc1_mspel_filter(const uint8_t *src, int stride, int mode, int r)
/* Filter used to interpolate fractional pel values */
static av_always_inline int vc1_mspel_filter(const uint8_t *src, int stride,
int mode, int r)
{
switch (mode) {
case 0: // no shift
return src[0];
case 1: // 1/4 shift
return (-4*src[-stride] + 53*src[0] + 18*src[stride] - 3*src[stride*2] + 32 - r) >> 6;
return (-4 * src[-stride] + 53 * src[0] +
18 * src[stride] - 3 * src[stride * 2] + 32 - r) >> 6;
case 2: // 1/2 shift
return (-src[-stride] + 9*src[0] + 9*src[stride] - src[stride*2] + 8 - r) >> 4;
return (-1 * src[-stride] + 9 * src[0] +
9 * src[stride] - 1 * src[stride * 2] + 8 - r) >> 4;
case 3: // 3/4 shift
return (-3*src[-stride] + 18*src[0] + 53*src[stride] - 4*src[stride*2] + 32 - r) >> 6;
return (-3 * src[-stride] + 18 * src[0] +
53 * src[stride] - 4 * src[stride * 2] + 32 - r) >> 6;
}
return 0; // should not occur
}
/** Function used to do motion compensation with bicubic interpolation
*/
/* Function used to do motion compensation with bicubic interpolation */
#define VC1_MSPEL_MC(OP, OP4, OPNAME) \
static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst, const uint8_t *src, ptrdiff_t stride, int hmode, int vmode, int rnd)\
static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst, \
const uint8_t *src, \
ptrdiff_t stride, \
int hmode, \
int vmode, \
int rnd) \
{ \
int i, j; \
\
@ -597,8 +620,7 @@ static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst, const uint8_t
} \
\
return; \
}\
else { /* No horizontal filter, output 8 lines to dst */\
} else { /* No horizontal filter, output 8 lines to dst */ \
r = 1 - rnd; \
\
for (j = 0; j < 8; j++) { \
@ -672,7 +694,10 @@ PUT_VC1_MSPEL(1, 3)
PUT_VC1_MSPEL(2, 3)
PUT_VC1_MSPEL(3, 3)
static void put_no_rnd_vc1_chroma_mc8_c(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y){
static void put_no_rnd_vc1_chroma_mc8_c(uint8_t *dst /* align 8 */,
uint8_t *src /* align 1 */,
int stride, int h, int x, int y)
{
const int A = (8 - x) * (8 - y);
const int B = (x) * (8 - y);
const int C = (8 - x) * (y);
@ -681,22 +706,31 @@ static void put_no_rnd_vc1_chroma_mc8_c(uint8_t *dst/*align 8*/, uint8_t *src/*a
av_assert2(x < 8 && y < 8 && x >= 0 && y >= 0);
for(i=0; i<h; i++)
{
dst[0] = (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1] + 32 - 4) >> 6;
dst[1] = (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2] + 32 - 4) >> 6;
dst[2] = (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3] + 32 - 4) >> 6;
dst[3] = (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4] + 32 - 4) >> 6;
dst[4] = (A*src[4] + B*src[5] + C*src[stride+4] + D*src[stride+5] + 32 - 4) >> 6;
dst[5] = (A*src[5] + B*src[6] + C*src[stride+5] + D*src[stride+6] + 32 - 4) >> 6;
dst[6] = (A*src[6] + B*src[7] + C*src[stride+6] + D*src[stride+7] + 32 - 4) >> 6;
dst[7] = (A*src[7] + B*src[8] + C*src[stride+7] + D*src[stride+8] + 32 - 4) >> 6;
for (i = 0; i < h; i++) {
dst[0] = (A * src[0] + B * src[1] +
C * src[stride + 0] + D * src[stride + 1] + 32 - 4) >> 6;
dst[1] = (A * src[1] + B * src[2] +
C * src[stride + 1] + D * src[stride + 2] + 32 - 4) >> 6;
dst[2] = (A * src[2] + B * src[3] +
C * src[stride + 2] + D * src[stride + 3] + 32 - 4) >> 6;
dst[3] = (A * src[3] + B * src[4] +
C * src[stride + 3] + D * src[stride + 4] + 32 - 4) >> 6;
dst[4] = (A * src[4] + B * src[5] +
C * src[stride + 4] + D * src[stride + 5] + 32 - 4) >> 6;
dst[5] = (A * src[5] + B * src[6] +
C * src[stride + 5] + D * src[stride + 6] + 32 - 4) >> 6;
dst[6] = (A * src[6] + B * src[7] +
C * src[stride + 6] + D * src[stride + 7] + 32 - 4) >> 6;
dst[7] = (A * src[7] + B * src[8] +
C * src[stride + 7] + D * src[stride + 8] + 32 - 4) >> 6;
dst += stride;
src += stride;
}
}
static void put_no_rnd_vc1_chroma_mc4_c(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y){
static void put_no_rnd_vc1_chroma_mc4_c(uint8_t *dst, uint8_t *src,
int stride, int h, int x, int y)
{
const int A = (8 - x) * (8 - y);
const int B = (x) * (8 - y);
const int C = (8 - x) * (y);
@ -705,19 +739,25 @@ static void put_no_rnd_vc1_chroma_mc4_c(uint8_t *dst, uint8_t *src, int stride,
av_assert2(x < 8 && y < 8 && x >= 0 && y >= 0);
for(i=0; i<h; i++)
{
dst[0] = (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1] + 32 - 4) >> 6;
dst[1] = (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2] + 32 - 4) >> 6;
dst[2] = (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3] + 32 - 4) >> 6;
dst[3] = (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4] + 32 - 4) >> 6;
for (i = 0; i < h; i++) {
dst[0] = (A * src[0] + B * src[1] +
C * src[stride + 0] + D * src[stride + 1] + 32 - 4) >> 6;
dst[1] = (A * src[1] + B * src[2] +
C * src[stride + 1] + D * src[stride + 2] + 32 - 4) >> 6;
dst[2] = (A * src[2] + B * src[3] +
C * src[stride + 2] + D * src[stride + 3] + 32 - 4) >> 6;
dst[3] = (A * src[3] + B * src[4] +
C * src[stride + 3] + D * src[stride + 4] + 32 - 4) >> 6;
dst += stride;
src += stride;
}
}
#define avg2(a,b) ((a+b+1)>>1)
static void avg_no_rnd_vc1_chroma_mc8_c(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y){
#define avg2(a, b) (((a) + (b) + 1) >> 1)
static void avg_no_rnd_vc1_chroma_mc8_c(uint8_t *dst /* align 8 */,
uint8_t *src /* align 1 */,
int stride, int h, int x, int y)
{
const int A = (8 - x) * (8 - y);
const int B = (x) * (8 - y);
const int C = (8 - x) * (y);
@ -726,16 +766,31 @@ static void avg_no_rnd_vc1_chroma_mc8_c(uint8_t *dst/*align 8*/, uint8_t *src/*a
av_assert2(x < 8 && y < 8 && x >= 0 && y >= 0);
for(i=0; i<h; i++)
{
dst[0] = avg2(dst[0], ((A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1] + 32 - 4) >> 6));
dst[1] = avg2(dst[1], ((A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2] + 32 - 4) >> 6));
dst[2] = avg2(dst[2], ((A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3] + 32 - 4) >> 6));
dst[3] = avg2(dst[3], ((A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4] + 32 - 4) >> 6));
dst[4] = avg2(dst[4], ((A*src[4] + B*src[5] + C*src[stride+4] + D*src[stride+5] + 32 - 4) >> 6));
dst[5] = avg2(dst[5], ((A*src[5] + B*src[6] + C*src[stride+5] + D*src[stride+6] + 32 - 4) >> 6));
dst[6] = avg2(dst[6], ((A*src[6] + B*src[7] + C*src[stride+6] + D*src[stride+7] + 32 - 4) >> 6));
dst[7] = avg2(dst[7], ((A*src[7] + B*src[8] + C*src[stride+7] + D*src[stride+8] + 32 - 4) >> 6));
for (i = 0; i < h; i++) {
dst[0] = avg2(dst[0], ((A * src[0] + B * src[1] +
C * src[stride + 0] + D * src[stride + 1] +
32 - 4) >> 6));
dst[1] = avg2(dst[1], ((A * src[1] + B * src[2] +
C * src[stride + 1] + D * src[stride + 2] +
32 - 4) >> 6));
dst[2] = avg2(dst[2], ((A * src[2] + B * src[3] +
C * src[stride + 2] + D * src[stride + 3] +
32 - 4) >> 6));
dst[3] = avg2(dst[3], ((A * src[3] + B * src[4] +
C * src[stride + 3] + D * src[stride + 4] +
32 - 4) >> 6));
dst[4] = avg2(dst[4], ((A * src[4] + B * src[5] +
C * src[stride + 4] + D * src[stride + 5] +
32 - 4) >> 6));
dst[5] = avg2(dst[5], ((A * src[5] + B * src[6] +
C * src[stride + 5] + D * src[stride + 6] +
32 - 4) >> 6));
dst[6] = avg2(dst[6], ((A * src[6] + B * src[7] +
C * src[stride + 6] + D * src[stride + 7] +
32 - 4) >> 6));
dst[7] = avg2(dst[7], ((A * src[7] + B * src[8] +
C * src[stride + 7] + D * src[stride + 8] +
32 - 4) >> 6));
dst += stride;
src += stride;
}
@ -763,7 +818,8 @@ static void avg_no_rnd_vc1_chroma_mc4_c(uint8_t *dst/*align 8*/, uint8_t *src/*a
#if CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER
static void sprite_h_c(uint8_t *dst, const uint8_t *src, int offset, int advance, int count)
static void sprite_h_c(uint8_t *dst, const uint8_t *src, int offset,
int advance, int count)
{
while (count--) {
int a = src[(offset >> 16)];
@ -773,9 +829,16 @@ static void sprite_h_c(uint8_t *dst, const uint8_t *src, int offset, int advance
}
}
static av_always_inline void sprite_v_template(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset1,
int two_sprites, const uint8_t *src2a, const uint8_t *src2b, int offset2,
int alpha, int scaled, int width)
static av_always_inline void sprite_v_template(uint8_t *dst,
const uint8_t *src1a,
const uint8_t *src1b,
int offset1,
int two_sprites,
const uint8_t *src2a,
const uint8_t *src2b,
int offset2,
int alpha, int scaled,
int width)
{
int a1, b1, a2, b2;
while (width--) {
@ -796,32 +859,49 @@ static av_always_inline void sprite_v_template(uint8_t *dst, const uint8_t *src1
}
}
static void sprite_v_single_c(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset, int width)
static void sprite_v_single_c(uint8_t *dst, const uint8_t *src1a,
const uint8_t *src1b,
int offset, int width)
{
sprite_v_template(dst, src1a, src1b, offset, 0, NULL, NULL, 0, 0, 1, width);
}
static void sprite_v_double_noscale_c(uint8_t *dst, const uint8_t *src1a, const uint8_t *src2a, int alpha, int width)
static void sprite_v_double_noscale_c(uint8_t *dst, const uint8_t *src1a,
const uint8_t *src2a,
int alpha, int width)
{
sprite_v_template(dst, src1a, NULL, 0, 1, src2a, NULL, 0, alpha, 0, width);
}
static void sprite_v_double_onescale_c(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset1,
const uint8_t *src2a, int alpha, int width)
{
sprite_v_template(dst, src1a, src1b, offset1, 1, src2a, NULL, 0, alpha, 1, width);
}
static void sprite_v_double_twoscale_c(uint8_t *dst, const uint8_t *src1a, const uint8_t *src1b, int offset1,
const uint8_t *src2a, const uint8_t *src2b, int offset2,
static void sprite_v_double_onescale_c(uint8_t *dst,
const uint8_t *src1a,
const uint8_t *src1b,
int offset1,
const uint8_t *src2a,
int alpha, int width)
{
sprite_v_template(dst, src1a, src1b, offset1, 1, src2a, src2b, offset2, alpha, 2, width);
sprite_v_template(dst, src1a, src1b, offset1, 1, src2a, NULL, 0, alpha, 1,
width);
}
static void sprite_v_double_twoscale_c(uint8_t *dst,
const uint8_t *src1a,
const uint8_t *src1b,
int offset1,
const uint8_t *src2a,
const uint8_t *src2b,
int offset2,
int alpha,
int width)
{
sprite_v_template(dst, src1a, src1b, offset1, 1, src2a, src2b, offset2,
alpha, 2, width);
}
#endif
#endif /* CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER */
av_cold void ff_vc1dsp_init(VC1DSPContext* dsp) {
av_cold void ff_vc1dsp_init(VC1DSPContext *dsp)
{
dsp->vc1_inv_trans_8x8 = vc1_inv_trans_8x8_c;
dsp->vc1_inv_trans_4x8 = vc1_inv_trans_4x8_c;
dsp->vc1_inv_trans_8x4 = vc1_inv_trans_8x4_c;
@ -830,10 +910,12 @@ av_cold void ff_vc1dsp_init(VC1DSPContext* dsp) {
dsp->vc1_inv_trans_4x8_dc = vc1_inv_trans_4x8_dc_c;
dsp->vc1_inv_trans_8x4_dc = vc1_inv_trans_8x4_dc_c;
dsp->vc1_inv_trans_4x4_dc = vc1_inv_trans_4x4_dc_c;
dsp->vc1_h_overlap = vc1_h_overlap_c;
dsp->vc1_v_overlap = vc1_v_overlap_c;
dsp->vc1_h_s_overlap = vc1_h_s_overlap_c;
dsp->vc1_v_s_overlap = vc1_v_s_overlap_c;
dsp->vc1_v_loop_filter4 = vc1_v_loop_filter4_c;
dsp->vc1_h_loop_filter4 = vc1_h_loop_filter4_c;
dsp->vc1_v_loop_filter8 = vc1_v_loop_filter8_c;
@ -886,7 +968,7 @@ av_cold void ff_vc1dsp_init(VC1DSPContext* dsp) {
dsp->sprite_v_double_noscale = sprite_v_double_noscale_c;
dsp->sprite_v_double_onescale = sprite_v_double_onescale_c;
dsp->sprite_v_double_twoscale = sprite_v_double_twoscale_c;
#endif
#endif /* CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER */
if (ARCH_ARM)
ff_vc1dsp_init_arm(dsp);

Loading…
Cancel
Save