[FFmpeg-cvslog] r20166 - in trunk/libavcodec/arm: dsputil_init_arm.c dsputil_init_armv5te.c dsputil_init_armv6.c dsputil_init_neon.c
mru
subversion
Sun Oct 4 15:13:09 CEST 2009
Author: mru
Date: Sun Oct 4 15:13:08 2009
New Revision: 20166
Log:
ARM: cosmetics
Modified:
trunk/libavcodec/arm/dsputil_init_arm.c
trunk/libavcodec/arm/dsputil_init_armv5te.c
trunk/libavcodec/arm/dsputil_init_armv6.c
trunk/libavcodec/arm/dsputil_init_neon.c
Modified: trunk/libavcodec/arm/dsputil_init_arm.c
==============================================================================
--- trunk/libavcodec/arm/dsputil_init_arm.c Sun Oct 4 15:13:06 2009 (r20165)
+++ trunk/libavcodec/arm/dsputil_init_arm.c Sun Oct 4 15:13:08 2009 (r20166)
@@ -40,11 +40,11 @@ void put_no_rnd_pixels8_xy2_arm(uint8_t
void put_pixels16_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-CALL_2X_PIXELS(put_pixels16_x2_arm , put_pixels8_x2_arm , 8)
-CALL_2X_PIXELS(put_pixels16_y2_arm , put_pixels8_y2_arm , 8)
-CALL_2X_PIXELS(put_pixels16_xy2_arm, put_pixels8_xy2_arm, 8)
-CALL_2X_PIXELS(put_no_rnd_pixels16_x2_arm , put_no_rnd_pixels8_x2_arm , 8)
-CALL_2X_PIXELS(put_no_rnd_pixels16_y2_arm , put_no_rnd_pixels8_y2_arm , 8)
+CALL_2X_PIXELS(put_pixels16_x2_arm, put_pixels8_x2_arm, 8)
+CALL_2X_PIXELS(put_pixels16_y2_arm, put_pixels8_y2_arm, 8)
+CALL_2X_PIXELS(put_pixels16_xy2_arm, put_pixels8_xy2_arm, 8)
+CALL_2X_PIXELS(put_no_rnd_pixels16_x2_arm, put_no_rnd_pixels8_x2_arm, 8)
+CALL_2X_PIXELS(put_no_rnd_pixels16_y2_arm, put_no_rnd_pixels8_y2_arm, 8)
CALL_2X_PIXELS(put_no_rnd_pixels16_xy2_arm, put_no_rnd_pixels8_xy2_arm, 8)
void ff_add_pixels_clamped_ARM(short *block, unsigned char *dest,
@@ -83,18 +83,18 @@ void dsputil_init_arm(DSPContext* c, AVC
ff_put_pixels_clamped = c->put_pixels_clamped;
ff_add_pixels_clamped = c->add_pixels_clamped;
- if (avctx->lowres == 0) {
+ if (!avctx->lowres) {
if(avctx->idct_algo == FF_IDCT_AUTO ||
avctx->idct_algo == FF_IDCT_ARM){
- c->idct_put= j_rev_dct_ARM_put;
- c->idct_add= j_rev_dct_ARM_add;
- c->idct = j_rev_dct_ARM;
- c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
- } else if (avctx->idct_algo==FF_IDCT_SIMPLEARM){
- c->idct_put= simple_idct_ARM_put;
- c->idct_add= simple_idct_ARM_add;
- c->idct = simple_idct_ARM;
- c->idct_permutation_type= FF_NO_IDCT_PERM;
+ c->idct_put = j_rev_dct_ARM_put;
+ c->idct_add = j_rev_dct_ARM_add;
+ c->idct = j_rev_dct_ARM;
+ c->idct_permutation_type = FF_LIBMPEG2_IDCT_PERM;
+ } else if (avctx->idct_algo == FF_IDCT_SIMPLEARM){
+ c->idct_put = simple_idct_ARM_put;
+ c->idct_add = simple_idct_ARM_add;
+ c->idct = simple_idct_ARM;
+ c->idct_permutation_type = FF_NO_IDCT_PERM;
}
}
@@ -102,14 +102,15 @@ void dsputil_init_arm(DSPContext* c, AVC
c->put_pixels_tab[0][1] = put_pixels16_x2_arm;
c->put_pixels_tab[0][2] = put_pixels16_y2_arm;
c->put_pixels_tab[0][3] = put_pixels16_xy2_arm;
- c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm;
- c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm;
- c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm;
- c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm;
c->put_pixels_tab[1][0] = put_pixels8_arm;
c->put_pixels_tab[1][1] = put_pixels8_x2_arm;
c->put_pixels_tab[1][2] = put_pixels8_y2_arm;
c->put_pixels_tab[1][3] = put_pixels8_xy2_arm;
+
+ c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm;
+ c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm;
+ c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm;
+ c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm;
c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm;
c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm;
c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm;
Modified: trunk/libavcodec/arm/dsputil_init_armv5te.c
==============================================================================
--- trunk/libavcodec/arm/dsputil_init_armv5te.c Sun Oct 4 15:13:06 2009 (r20165)
+++ trunk/libavcodec/arm/dsputil_init_armv5te.c Sun Oct 4 15:13:08 2009 (r20166)
@@ -31,9 +31,9 @@ void av_cold ff_dsputil_init_armv5te(DSP
{
if (!avctx->lowres && (avctx->idct_algo == FF_IDCT_AUTO ||
avctx->idct_algo == FF_IDCT_SIMPLEARMV5TE)) {
- c->idct_put= simple_idct_put_armv5te;
- c->idct_add= simple_idct_add_armv5te;
- c->idct = simple_idct_armv5te;
+ c->idct_put = simple_idct_put_armv5te;
+ c->idct_add = simple_idct_add_armv5te;
+ c->idct = simple_idct_armv5te;
c->idct_permutation_type = FF_NO_IDCT_PERM;
}
Modified: trunk/libavcodec/arm/dsputil_init_armv6.c
==============================================================================
--- trunk/libavcodec/arm/dsputil_init_armv6.c Sun Oct 4 15:13:06 2009 (r20165)
+++ trunk/libavcodec/arm/dsputil_init_armv6.c Sun Oct 4 15:13:08 2009 (r20166)
@@ -29,9 +29,9 @@ void av_cold ff_dsputil_init_armv6(DSPCo
{
if (!avctx->lowres && (avctx->idct_algo == FF_IDCT_AUTO ||
avctx->idct_algo == FF_IDCT_SIMPLEARMV6)) {
- c->idct_put= ff_simple_idct_put_armv6;
- c->idct_add= ff_simple_idct_add_armv6;
- c->idct = ff_simple_idct_armv6;
- c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
+ c->idct_put = ff_simple_idct_put_armv6;
+ c->idct_add = ff_simple_idct_add_armv6;
+ c->idct = ff_simple_idct_armv6;
+ c->idct_permutation_type = FF_LIBMPEG2_IDCT_PERM;
}
}
Modified: trunk/libavcodec/arm/dsputil_init_neon.c
==============================================================================
--- trunk/libavcodec/arm/dsputil_init_neon.c Sun Oct 4 15:13:06 2009 (r20165)
+++ trunk/libavcodec/arm/dsputil_init_neon.c Sun Oct 4 15:13:08 2009 (r20166)
@@ -197,16 +197,16 @@ void ff_dsputil_init_neon(DSPContext *c,
if (!avctx->lowres) {
if (avctx->idct_algo == FF_IDCT_AUTO ||
avctx->idct_algo == FF_IDCT_SIMPLENEON) {
- c->idct_put= ff_simple_idct_put_neon;
- c->idct_add= ff_simple_idct_add_neon;
- c->idct = ff_simple_idct_neon;
+ c->idct_put = ff_simple_idct_put_neon;
+ c->idct_add = ff_simple_idct_add_neon;
+ c->idct = ff_simple_idct_neon;
c->idct_permutation_type = FF_PARTTRANS_IDCT_PERM;
} else if ((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER ||
CONFIG_VP6_DECODER) &&
avctx->idct_algo == FF_IDCT_VP3) {
- c->idct_put= ff_vp3_idct_put_neon;
- c->idct_add= ff_vp3_idct_add_neon;
- c->idct = ff_vp3_idct_neon;
+ c->idct_put = ff_vp3_idct_put_neon;
+ c->idct_add = ff_vp3_idct_add_neon;
+ c->idct = ff_vp3_idct_neon;
c->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
}
}
@@ -313,14 +313,15 @@ void ff_dsputil_init_neon(DSPContext *c,
c->vp3_h_loop_filter = ff_vp3_h_loop_filter_neon;
}
- c->vector_fmul = ff_vector_fmul_neon;
- c->vector_fmul_window = ff_vector_fmul_window_neon;
- c->vector_fmul_scalar = ff_vector_fmul_scalar_neon;
- c->butterflies_float = ff_butterflies_float_neon;
- c->scalarproduct_float = ff_scalarproduct_float_neon;
+ c->vector_fmul = ff_vector_fmul_neon;
+ c->vector_fmul_window = ff_vector_fmul_window_neon;
+ c->vector_fmul_scalar = ff_vector_fmul_scalar_neon;
+ c->butterflies_float = ff_butterflies_float_neon;
+ c->scalarproduct_float = ff_scalarproduct_float_neon;
c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_neon;
- c->vector_fmul_reverse = ff_vector_fmul_reverse_neon;
- c->vector_fmul_add = ff_vector_fmul_add_neon;
+ c->vector_fmul_reverse = ff_vector_fmul_reverse_neon;
+ c->vector_fmul_add = ff_vector_fmul_add_neon;
+ c->vector_clipf = ff_vector_clipf_neon;
c->vector_fmul_sv_scalar[0] = ff_vector_fmul_sv_scalar_2_neon;
c->vector_fmul_sv_scalar[1] = ff_vector_fmul_sv_scalar_4_neon;
@@ -328,10 +329,8 @@ void ff_dsputil_init_neon(DSPContext *c,
c->sv_fmul_scalar[0] = ff_sv_fmul_scalar_2_neon;
c->sv_fmul_scalar[1] = ff_sv_fmul_scalar_4_neon;
- c->vector_clipf = ff_vector_clipf_neon;
-
if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {
- c->float_to_int16 = ff_float_to_int16_neon;
+ c->float_to_int16 = ff_float_to_int16_neon;
c->float_to_int16_interleave = ff_float_to_int16_interleave_neon;
}
More information about the ffmpeg-cvslog
mailing list