Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

VP3: K&R formatting cosmetics

Browse Source
pull/64/head
Vittorio Giovara 11 years ago
parent 66d04c068a
commit d2264740e6
4 changed files with 3792 additions and 3758 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 714
      libavcodec/vp3.c
  2. 12
      libavcodec/vp3_parser.c
  3. 28
      libavcodec/vp3data.h
  4. 136
      libavcodec/vp3dsp.c

714
libavcodec/vp3.c
View File

File diff suppressed because it is too large Load Diff

12
libavcodec/vp3_parser.c
Unescape View File

@ -25,10 +25,10 @@ static int parse(AVCodecParserContext *s,
const uint8_t **poutbuf, int *poutbuf_size, const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
if(avctx->codec_id == AV_CODEC_ID_THEORA) if (avctx->codec_id == AV_CODEC_ID_THEORA)
s->pict_type= (buf[0]&0x40) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; s->pict_type = (buf[0] & 0x40) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
else else
s->pict_type= (buf[0]&0x80) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; s->pict_type = (buf[0] & 0x80) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
*poutbuf = buf; *poutbuf = buf;
*poutbuf_size = buf_size; *poutbuf_size = buf_size;
@ -36,7 +36,9 @@ static int parse(AVCodecParserContext *s,
} }
AVCodecParser ff_vp3_parser = { AVCodecParser ff_vp3_parser = {
.codec_ids = { AV_CODEC_ID_THEORA, AV_CODEC_ID_VP3, AV_CODEC_ID_VP6, .codec_ids = {
AV_CODEC_ID_VP6F, AV_CODEC_ID_VP6A }, AV_CODEC_ID_THEORA, AV_CODEC_ID_VP3,
AV_CODEC_ID_VP6, AV_CODEC_ID_VP6F, AV_CODEC_ID_VP6A
},
.parser_parse = parse, .parser_parse = parse,
}; };

28
libavcodec/vp3data.h
Unescape View File

@ -26,8 +26,8 @@
/* these coefficients dequantize intraframe Y plane coefficients /* these coefficients dequantize intraframe Y plane coefficients
* (note: same as JPEG) */ * (note: same as JPEG) */
static const int16_t vp31_intra_y_dequant[64] = static const int16_t vp31_intra_y_dequant[64] = {
{ 16, 11, 10, 16, 24, 40, 51, 61, 16, 11, 10, 16, 24, 40, 51, 61,
12, 12, 14, 19, 26, 58, 60, 55, 12, 12, 14, 19, 26, 58, 60, 55,
14, 13, 16, 24, 40, 57, 69, 56, 14, 13, 16, 24, 40, 57, 69, 56,
14, 17, 22, 29, 51, 87, 80, 62, 14, 17, 22, 29, 51, 87, 80, 62,
@ -39,8 +39,8 @@ static const int16_t vp31_intra_y_dequant[64] =
/* these coefficients dequantize intraframe C plane coefficients /* these coefficients dequantize intraframe C plane coefficients
* (note: same as JPEG) */ * (note: same as JPEG) */
static const int16_t vp31_intra_c_dequant[64] = static const int16_t vp31_intra_c_dequant[64] = {
{ 17, 18, 24, 47, 99, 99, 99, 99, 17, 18, 24, 47, 99, 99, 99, 99,
18, 21, 26, 66, 99, 99, 99, 99, 18, 21, 26, 66, 99, 99, 99, 99,
24, 26, 56, 99, 99, 99, 99, 99, 24, 26, 56, 99, 99, 99, 99, 99,
47, 66, 99, 99, 99, 99, 99, 99, 47, 66, 99, 99, 99, 99, 99, 99,
@ -51,8 +51,8 @@ static const int16_t vp31_intra_c_dequant[64] =
}; };
/* these coefficients dequantize interframe coefficients (all planes) */ /* these coefficients dequantize interframe coefficients (all planes) */
static const int16_t vp31_inter_dequant[64] = static const int16_t vp31_inter_dequant[64] = {
{ 16, 16, 16, 20, 24, 28, 32, 40, 16, 16, 16, 20, 24, 28, 32, 40,
16, 16, 20, 24, 28, 32, 40, 48, 16, 16, 20, 24, 28, 32, 40, 48,
16, 20, 24, 28, 32, 40, 48, 64, 16, 20, 24, 28, 32, 40, 48, 64,
20, 24, 28, 32, 40, 48, 64, 64, 20, 24, 28, 32, 40, 48, 64, 64,
@ -62,8 +62,8 @@ static const int16_t vp31_inter_dequant[64] =
40, 48, 64, 64, 64, 96, 128, 128 40, 48, 64, 64, 64, 96, 128, 128
}; };
static const int16_t vp31_dc_scale_factor[64] = static const int16_t vp31_dc_scale_factor[64] = {
{ 220, 200, 190, 180, 170, 170, 160, 160, 220, 200, 190, 180, 170, 170, 160, 160,
150, 150, 140, 140, 130, 130, 120, 120, 150, 150, 140, 140, 130, 130, 120, 120,
110, 110, 100, 100, 90, 90, 90, 80, 110, 110, 100, 100, 90, 90, 90, 80,
80, 80, 70, 70, 70, 60, 60, 60, 80, 80, 70, 70, 70, 60, 60, 60,
@ -73,8 +73,8 @@ static const int16_t vp31_dc_scale_factor[64] =
20, 10, 10, 10, 10, 10, 10, 10 20, 10, 10, 10, 10, 10, 10, 10
}; };
static const uint32_t vp31_ac_scale_factor[64] = static const uint32_t vp31_ac_scale_factor[64] = {
{ 500, 450, 400, 370, 340, 310, 285, 265, 500, 450, 400, 370, 340, 310, 285, 265,
245, 225, 210, 195, 185, 180, 170, 160, 245, 225, 210, 195, 185, 180, 170, 160,
150, 145, 135, 130, 125, 115, 110, 107, 150, 145, 135, 130, 125, 115, 110, 107,
100, 96, 93, 89, 85, 82, 75, 74, 100, 96, 93, 89, 85, 82, 75, 74,
@ -84,8 +84,8 @@ static const uint32_t vp31_ac_scale_factor[64] =
21, 19, 18, 17, 15, 13, 12, 10 21, 19, 18, 17, 15, 13, 12, 10
}; };
static const uint8_t vp31_filter_limit_values[64] = static const uint8_t vp31_filter_limit_values[64] = {
{ 30, 25, 20, 20, 15, 15, 14, 14, 30, 25, 20, 20, 15, 15, 14, 14,
13, 13, 12, 12, 11, 11, 10, 10, 13, 13, 12, 12, 11, 11, 10, 10,
9, 9, 8, 8, 7, 7, 7, 7, 9, 9, 8, 8, 7, 7, 7, 7,
6, 6, 6, 6, 5, 5, 5, 5, 6, 6, 6, 6, 5, 5, 5, 5,
@ -113,7 +113,7 @@ static const uint16_t superblock_run_length_vlc_table[34][2] = {
{ 0x3EC, 10 }, { 0x3ED, 10 }, { 0x3EE, 10 }, { 0x3EF, 10 }, { 0x3EC, 10 }, { 0x3ED, 10 }, { 0x3EE, 10 }, { 0x3EF, 10 },
{ 0x3F, 6 } /* this last VLC is a special case for reading 12 more { 0x3F, 6 } /* this last VLC is a special case for reading 12 more
bits from stream and adding the value 34 */ * bits from stream and adding the value 34 */
}; };
static const uint16_t fragment_run_length_vlc_table[30][2] = { static const uint16_t fragment_run_length_vlc_table[30][2] = {
@ -224,7 +224,7 @@ static const int coeff_get_bits[32] = {
0, 0, 0, 0, 0, 0, 0, /* 0..6 are never used */ 0, 0, 0, 0, 0, 0, 0, /* 0..6 are never used */
0, 0, 0, 0, 0, 0, /* 7..12 use constant coeffs */ 0, 0, 0, 0, 0, 0, /* 7..12 use constant coeffs */
1, 1, 1, 1, /* 13..16 are constants but still need sign bit */ 1, 1, 1, 1, /* 13..16 are constants but still need sign bit */
2, 3, 4, 5, 6, 10, /* 17..22, for reading large coeffs */ 2, 3, 4, 5, 6,10, /* 17..22, for reading large coeffs */
1, 1, 1, 1, 1, 1, 1, /* 23..29 are constants but still need sign bit */ 1, 1, 1, 1, 1, 1, 1, /* 23..29 are constants but still need sign bit */
2, 2 /* 30..31 */ 2, 2 /* 30..31 */
}; };

136
libavcodec/vp3dsp.c
Unescape View File

@ -27,6 +27,7 @@
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "rnd_avg.h" #include "rnd_avg.h"
@ -41,9 +42,10 @@
#define xC6S2 25080 #define xC6S2 25080
#define xC7S1 12785 #define xC7S1 12785
#define M(a,b) (((a) * (b))>>16) #define M(a, b) (((a) * (b)) >> 16)
static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int type) static av_always_inline void idct(uint8_t *dst, int stride,
int16_t *input, int type)
{ {
int16_t *ip = input; int16_t *ip = input;
@ -55,8 +57,8 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
/* Inverse DCT on the rows now */ /* Inverse DCT on the rows now */
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
/* Check for non-zero values */ /* Check for non-zero values */
if ( ip[0 * 8] | ip[1 * 8] | ip[2 * 8] | ip[3 * 8] | if (ip[0 * 8] | ip[1 * 8] | ip[2 * 8] | ip[3 * 8] |
ip[4 * 8] | ip[5 * 8] | ip[6 * 8] | ip[7 * 8] ) { ip[4 * 8] | ip[5 * 8] | ip[6 * 8] | ip[7 * 8]) {
A = M(xC1S7, ip[1 * 8]) + M(xC7S1, ip[7 * 8]); A = M(xC1S7, ip[1 * 8]) + M(xC7S1, ip[7 * 8]);
B = M(xC7S1, ip[1 * 8]) - M(xC1S7, ip[7 * 8]); B = M(xC7S1, ip[1 * 8]) - M(xC1S7, ip[7 * 8]);
C = M(xC3S5, ip[3 * 8]) + M(xC5S3, ip[5 * 8]); C = M(xC3S5, ip[3 * 8]) + M(xC5S3, ip[5 * 8]);
@ -84,14 +86,14 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
Hd = Bd + H; Hd = Bd + H;
/* Final sequence of operations over-write original inputs. */ /* Final sequence of operations over-write original inputs. */
ip[0 * 8] = Gd + Cd ; ip[0 * 8] = Gd + Cd;
ip[7 * 8] = Gd - Cd ; ip[7 * 8] = Gd - Cd;
ip[1 * 8] = Add + Hd; ip[1 * 8] = Add + Hd;
ip[2 * 8] = Add - Hd; ip[2 * 8] = Add - Hd;
ip[3 * 8] = Ed + Dd ; ip[3 * 8] = Ed + Dd;
ip[4 * 8] = Ed - Dd ; ip[4 * 8] = Ed - Dd;
ip[5 * 8] = Fd + Bdd; ip[5 * 8] = Fd + Bdd;
ip[6 * 8] = Fd - Bdd; ip[6 * 8] = Fd - Bdd;
@ -102,11 +104,10 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
ip = input; ip = input;
for ( i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
/* Check for non-zero values (bitwise or faster than ||) */ /* Check for non-zero values (bitwise or faster than ||) */
if ( ip[1] | ip[2] | ip[3] | if (ip[1] | ip[2] | ip[3] |
ip[4] | ip[5] | ip[6] | ip[7] ) { ip[4] | ip[5] | ip[6] | ip[7]) {
A = M(xC1S7, ip[1]) + M(xC7S1, ip[7]); A = M(xC1S7, ip[1]) + M(xC7S1, ip[7]);
B = M(xC7S1, ip[1]) - M(xC1S7, ip[7]); B = M(xC7S1, ip[1]) - M(xC1S7, ip[7]);
C = M(xC3S5, ip[3]) + M(xC5S3, ip[5]); C = M(xC3S5, ip[3]) + M(xC5S3, ip[5]);
@ -121,9 +122,9 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
E = M(xC4S4, (ip[0] + ip[4])) + 8; E = M(xC4S4, (ip[0] + ip[4])) + 8;
F = M(xC4S4, (ip[0] - ip[4])) + 8; F = M(xC4S4, (ip[0] - ip[4])) + 8;
if(type==1){ //HACK if (type == 1) { // HACK
E += 16*128; E += 16 * 128;
F += 16*128; F += 16 * 128;
} }
G = M(xC2S6, ip[2]) + M(xC6S2, ip[6]); G = M(xC2S6, ip[2]) + M(xC6S2, ip[6]);
@ -140,52 +141,51 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
/* Final sequence of operations over-write original inputs. */ /* Final sequence of operations over-write original inputs. */
if (type == 1) { if (type == 1) {
dst[0*stride] = av_clip_uint8((Gd + Cd ) >> 4); dst[0 * stride] = av_clip_uint8((Gd + Cd) >> 4);
dst[7*stride] = av_clip_uint8((Gd - Cd ) >> 4); dst[7 * stride] = av_clip_uint8((Gd - Cd) >> 4);
dst[1*stride] = av_clip_uint8((Add + Hd ) >> 4); dst[1 * stride] = av_clip_uint8((Add + Hd) >> 4);
dst[2*stride] = av_clip_uint8((Add - Hd ) >> 4); dst[2 * stride] = av_clip_uint8((Add - Hd) >> 4);
dst[3*stride] = av_clip_uint8((Ed + Dd ) >> 4); dst[3 * stride] = av_clip_uint8((Ed + Dd) >> 4);
dst[4*stride] = av_clip_uint8((Ed - Dd ) >> 4); dst[4 * stride] = av_clip_uint8((Ed - Dd) >> 4);
dst[5*stride] = av_clip_uint8((Fd + Bdd ) >> 4); dst[5 * stride] = av_clip_uint8((Fd + Bdd) >> 4);
dst[6*stride] = av_clip_uint8((Fd - Bdd ) >> 4); dst[6 * stride] = av_clip_uint8((Fd - Bdd) >> 4);
}else{ } else {
dst[0*stride] = av_clip_uint8(dst[0*stride] + ((Gd + Cd ) >> 4)); dst[0 * stride] = av_clip_uint8(dst[0 * stride] + ((Gd + Cd) >> 4));
dst[7*stride] = av_clip_uint8(dst[7*stride] + ((Gd - Cd ) >> 4)); dst[7 * stride] = av_clip_uint8(dst[7 * stride] + ((Gd - Cd) >> 4));
dst[1*stride] = av_clip_uint8(dst[1*stride] + ((Add + Hd ) >> 4)); dst[1 * stride] = av_clip_uint8(dst[1 * stride] + ((Add + Hd) >> 4));
dst[2*stride] = av_clip_uint8(dst[2*stride] + ((Add - Hd ) >> 4)); dst[2 * stride] = av_clip_uint8(dst[2 * stride] + ((Add - Hd) >> 4));
dst[3*stride] = av_clip_uint8(dst[3*stride] + ((Ed + Dd ) >> 4)); dst[3 * stride] = av_clip_uint8(dst[3 * stride] + ((Ed + Dd) >> 4));
dst[4*stride] = av_clip_uint8(dst[4*stride] + ((Ed - Dd ) >> 4)); dst[4 * stride] = av_clip_uint8(dst[4 * stride] + ((Ed - Dd) >> 4));
dst[5*stride] = av_clip_uint8(dst[5*stride] + ((Fd + Bdd ) >> 4)); dst[5 * stride] = av_clip_uint8(dst[5 * stride] + ((Fd + Bdd) >> 4));
dst[6*stride] = av_clip_uint8(dst[6*stride] + ((Fd - Bdd ) >> 4)); dst[6 * stride] = av_clip_uint8(dst[6 * stride] + ((Fd - Bdd) >> 4));
} }
} else { } else {
if (type == 1) { if (type == 1) {
dst[0*stride]= dst[0*stride] =
dst[1*stride]= dst[1*stride] =
dst[2*stride]= dst[2*stride] =
dst[3*stride]= dst[3*stride] =
dst[4*stride]= dst[4*stride] =
dst[5*stride]= dst[5*stride] =
dst[6*stride]= dst[6*stride] =
dst[7*stride]= av_clip_uint8(128 + ((xC4S4 * ip[0] + (IdctAdjustBeforeShift<<16))>>20)); dst[7*stride] = av_clip_uint8(128 + ((xC4S4 * ip[0] + (IdctAdjustBeforeShift << 16)) >> 20));
}else{ } else {
if(ip[0]){ if (ip[0]) {
int v= ((xC4S4 * ip[0] + (IdctAdjustBeforeShift<<16))>>20); int v = (xC4S4 * ip[0] + (IdctAdjustBeforeShift << 16)) >> 20;
dst[0*stride] = av_clip_uint8(dst[0*stride] + v); dst[0 * stride] = av_clip_uint8(dst[0 * stride] + v);
dst[1*stride] = av_clip_uint8(dst[1*stride] + v); dst[1 * stride] = av_clip_uint8(dst[1 * stride] + v);
dst[2*stride] = av_clip_uint8(dst[2*stride] + v); dst[2 * stride] = av_clip_uint8(dst[2 * stride] + v);
dst[3*stride] = av_clip_uint8(dst[3*stride] + v); dst[3 * stride] = av_clip_uint8(dst[3 * stride] + v);
dst[4*stride] = av_clip_uint8(dst[4*stride] + v); dst[4 * stride] = av_clip_uint8(dst[4 * stride] + v);
dst[5*stride] = av_clip_uint8(dst[5*stride] + v); dst[5 * stride] = av_clip_uint8(dst[5 * stride] + v);
dst[6*stride] = av_clip_uint8(dst[6*stride] + v); dst[6 * stride] = av_clip_uint8(dst[6 * stride] + v);
dst[7*stride] = av_clip_uint8(dst[7*stride] + v); dst[7 * stride] = av_clip_uint8(dst[7 * stride] + v);
} }
} }
} }
@ -195,26 +195,26 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
} }
} }
static void vp3_idct_put_c(uint8_t *dest/*align 8*/, int line_size, static void vp3_idct_put_c(uint8_t *dest /* align 8 */, int line_size,
int16_t *block/*align 16*/) int16_t *block /* align 16 */)
{ {
idct(dest, line_size, block, 1); idct(dest, line_size, block, 1);
memset(block, 0, sizeof(*block) * 64); memset(block, 0, sizeof(*block) * 64);
} }
static void vp3_idct_add_c(uint8_t *dest/*align 8*/, int line_size, static void vp3_idct_add_c(uint8_t *dest /* align 8 */, int line_size,
int16_t *block/*align 16*/) int16_t *block /* align 16 */)
{ {
idct(dest, line_size, block, 2); idct(dest, line_size, block, 2);
memset(block, 0, sizeof(*block) * 64); memset(block, 0, sizeof(*block) * 64);
} }
static void vp3_idct_dc_add_c(uint8_t *dest/*align 8*/, int line_size, static void vp3_idct_dc_add_c(uint8_t *dest /* align 8 */, int line_size,
int16_t *block/*align 16*/) int16_t *block /* align 16 */)
{ {
int i, dc = (block[0] + 15) >> 5; int i, dc = (block[0] + 15) >> 5;
for(i = 0; i < 8; i++){ for (i = 0; i < 8; i++) {
dest[0] = av_clip_uint8(dest[0] + dc); dest[0] = av_clip_uint8(dest[0] + dc);
dest[1] = av_clip_uint8(dest[1] + dc); dest[1] = av_clip_uint8(dest[1] + dc);
dest[2] = av_clip_uint8(dest[2] + dc); dest[2] = av_clip_uint8(dest[2] + dc);
@ -233,13 +233,13 @@ static void vp3_v_loop_filter_c(uint8_t *first_pixel, int stride,
{ {
unsigned char *end; unsigned char *end;
int filter_value; int filter_value;
const int nstride= -stride; const int nstride = -stride;
for (end= first_pixel + 8; first_pixel < end; first_pixel++) { for (end = first_pixel + 8; first_pixel < end; first_pixel++) {
filter_value = filter_value = (first_pixel[2 * nstride] - first_pixel[stride]) +
(first_pixel[2 * nstride] - first_pixel[ stride]) (first_pixel[0] - first_pixel[nstride]) * 3;
+3*(first_pixel[0 ] - first_pixel[nstride]);
filter_value = bounding_values[(filter_value + 4) >> 3]; filter_value = bounding_values[(filter_value + 4) >> 3];
first_pixel[nstride] = av_clip_uint8(first_pixel[nstride] + filter_value); first_pixel[nstride] = av_clip_uint8(first_pixel[nstride] + filter_value);
first_pixel[0] = av_clip_uint8(first_pixel[0] - filter_value); first_pixel[0] = av_clip_uint8(first_pixel[0] - filter_value);
} }
@ -251,11 +251,11 @@ static void vp3_h_loop_filter_c(uint8_t *first_pixel, int stride,
unsigned char *end; unsigned char *end;
int filter_value; int filter_value;
for (end= first_pixel + 8*stride; first_pixel != end; first_pixel += stride) { for (end = first_pixel + 8 * stride; first_pixel != end; first_pixel += stride) {
filter_value = filter_value = (first_pixel[-2] - first_pixel[1]) +
(first_pixel[-2] - first_pixel[ 1]) (first_pixel[ 0] - first_pixel[-1]) * 3;
+3*(first_pixel[ 0] - first_pixel[-1]);
filter_value = bounding_values[(filter_value + 4) >> 3]; filter_value = bounding_values[(filter_value + 4) >> 3];
first_pixel[-1] = av_clip_uint8(first_pixel[-1] + filter_value); first_pixel[-1] = av_clip_uint8(first_pixel[-1] + filter_value);
first_pixel[ 0] = av_clip_uint8(first_pixel[ 0] - filter_value); first_pixel[ 0] = av_clip_uint8(first_pixel[ 0] - filter_value);
} }

Write Preview
Loading…
Cancel
Save