diff options
author | John Koleszar <jkoleszar@google.com> | 2011-06-28 00:05:04 -0400 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2011-06-28 00:05:04 -0400 |
commit | f86e14d8dc0e063ba2623d2b9a71ec5dac1ba839 (patch) | |
tree | 71fb63958600644cf4da685d92b7569dcbb7af56 /vp8 | |
parent | d7c6c9472f6b36a6615e9225322a737169b73451 (diff) | |
parent | be99868bd16fd46c7009e7052131705c116bda5a (diff) | |
download | libvpx-f86e14d8dc0e063ba2623d2b9a71ec5dac1ba839.tar libvpx-f86e14d8dc0e063ba2623d2b9a71ec5dac1ba839.tar.gz libvpx-f86e14d8dc0e063ba2623d2b9a71ec5dac1ba839.tar.bz2 libvpx-f86e14d8dc0e063ba2623d2b9a71ec5dac1ba839.zip |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8')
-rw-r--r-- | vp8/common/postproc.c | 17 | ||||
-rw-r--r-- | vp8/vp8_common.mk | 12 | ||||
-rw-r--r-- | vp8/vp8cx_arm.mk | 15 | ||||
-rw-r--r-- | vp8/vp8dx_arm.mk | 2 |
4 files changed, 22 insertions, 24 deletions
diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c index 7dbe96649..14c3b7bf3 100644 --- a/vp8/common/postproc.c +++ b/vp8/common/postproc.c @@ -837,7 +837,6 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t YV12_BUFFER_CONFIG *post = &oci->post_proc_buffer; int width = post->y_width; int height = post->y_height; - int mb_cols = width >> 4; unsigned char *y_buffer = oci->post_proc_buffer.y_buffer; int y_stride = oci->post_proc_buffer.y_stride; MODE_INFO *mi = oci->mi; @@ -861,7 +860,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t { case 0 : /* mv_top_bottom */ { - B_MODE_INFO *bmi = &mi->bmi[0]; + union b_mode_info *bmi = &mi->bmi[0]; MV *mv = &bmi->mv.as_mv; x1 = x0 + 8 + (mv->col >> 3); @@ -882,7 +881,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t } case 1 : /* mv_left_right */ { - B_MODE_INFO *bmi = &mi->bmi[0]; + union b_mode_info *bmi = &mi->bmi[0]; MV *mv = &bmi->mv.as_mv; x1 = x0 + 4 + (mv->col >> 3); @@ -903,7 +902,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t } case 2 : /* mv_quarters */ { - B_MODE_INFO *bmi = &mi->bmi[0]; + union b_mode_info *bmi = &mi->bmi[0]; MV *mv = &bmi->mv.as_mv; x1 = x0 + 4 + (mv->col >> 3); @@ -939,7 +938,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t } default : { - B_MODE_INFO *bmi = mi->bmi; + union b_mode_info *bmi = mi->bmi; int bx0, by0; for (by0 = y0; by0 < (y0+16); by0 += 4) @@ -1012,7 +1011,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t { int by, bx; unsigned char *yl, *ul, *vl; - B_MODE_INFO *bmi = mi->bmi; + union b_mode_info *bmi = mi->bmi; yl = y_ptr + x; ul = u_ptr + (x>>1); @@ -1025,9 +1024,9 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t if ((ppflags->display_b_modes_flag & (1<<mi->mbmi.mode)) || (ppflags->display_mb_modes_flag & B_PRED)) { - Y = B_PREDICTION_MODE_colors[bmi->mode][0]; - U = B_PREDICTION_MODE_colors[bmi->mode][1]; - V = B_PREDICTION_MODE_colors[bmi->mode][2]; + Y = B_PREDICTION_MODE_colors[bmi->as_mode][0]; + U = B_PREDICTION_MODE_colors[bmi->as_mode][1]; + V = B_PREDICTION_MODE_colors[bmi->as_mode][2]; POSTPROC_INVOKE(RTCD_VTABLE(oci), blend_b) (yl+bx, ul+(bx>>1), vl+(bx>>1), Y, U, V, 0xc000, y_stride); diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index f06ad42f9..7dd968401 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -99,6 +99,7 @@ VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/postproc_mmx.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm endif +# common (c) VP8_COMMON_SRCS-$(ARCH_ARM) += common/asm_com_offsets.c ifeq ($(CONFIG_CSM),yes) VP8_COMMON_SRCS-yes += common/maskingmv.c @@ -107,12 +108,11 @@ endif VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/arm_systemdependent.c -# common (c) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/bilinearfilter_arm.c -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/bilinearfilter_arm.h -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/filter_arm.c -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/loopfilter_arm.c -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/reconintra_arm.c +VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.c +VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.h +VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/filter_arm.c +VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.c +VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/reconintra_arm.c # common (armv6) VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/bilinearfilter_v6$(ASM) diff --git a/vp8/vp8cx_arm.mk b/vp8/vp8cx_arm.mk index 165dada2b..599bf4753 100644 --- a/vp8/vp8cx_arm.mk +++ b/vp8/vp8cx_arm.mk @@ -15,17 +15,16 @@ # encoder VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/arm_csystemdependent.c -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/quantize_arm.c -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/picklpf_arm.c -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/dct_arm.c -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/variance_arm.c -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/variance_arm.h -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/boolhuff_arm.c - -VP8_CX_SRCS_REMOVE-$(HAVE_ARMV5TE) += encoder/boolhuff.c +VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c +VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/picklpf_arm.c +VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.c +VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c +VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.h #File list for armv5te # encoder +VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/boolhuff_arm.c +VP8_CX_SRCS_REMOVE-$(HAVE_ARMV5TE) += encoder/boolhuff.c VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/boolhuff_armv5te$(ASM) VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_armv5$(ASM) VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_mbrow_armv5$(ASM) diff --git a/vp8/vp8dx_arm.mk b/vp8/vp8dx_arm.mk index 03084c573..583562b97 100644 --- a/vp8/vp8dx_arm.mk +++ b/vp8/vp8dx_arm.mk @@ -14,7 +14,7 @@ VP8_DX_SRCS-$(ARCH_ARM) += decoder/arm/arm_dsystemdependent.c VP8_CX_SRCS-$(ARCH_ARM) += decoder/asm_dec_offsets.c -VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/dequantize_arm.c +VP8_DX_SRCS-$(ARCH_ARM) += decoder/arm/dequantize_arm.c #File list for armv6 VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/dequant_dc_idct_v6$(ASM) |