5d4cffb35f
This commit adds a pick_sb_mode() function which selects the best 32x32 superblock coding mode. Then it selects the best per-MB modes, compares the two and encodes that in the bitstream. The bitstream coding is rather simplistic right now. At the SB level, we code a bit to indicate whether this block uses SB-coding (32x32 prediction) or MB-coding (anything else), and then we follow with the actual modes. This could and should be modified in the future, but is omitted from this commit because it will likely involve reorganizing much more code rather than just adding SB coding, so it's better to let that be judged on its own merits. Gains on derf: about even, YT/HD: +0.75%, STD/HD: +1.5%. Change-Id: Iae313a7cbd8f75b3c66d04a68b991cb096eaaba6
153 lines
6.0 KiB
C
153 lines
6.0 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#include "vpx_ports/config.h"
|
|
#include "vpx_rtcd.h"
|
|
#include "vp8/common/g_common.h"
|
|
#include "vp8/common/subpixel.h"
|
|
#include "vp8/common/loopfilter.h"
|
|
#include "vp8/common/recon.h"
|
|
#include "vp8/common/idct.h"
|
|
#include "vp8/common/onyxc_int.h"
|
|
|
|
extern void vp8_arch_x86_common_init(VP8_COMMON *ctx);
|
|
extern void vp8_arch_arm_common_init(VP8_COMMON *ctx);
|
|
|
|
void vp8_machine_specific_config(VP8_COMMON *ctx) {
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
|
VP8_COMMON_RTCD *rtcd = &ctx->rtcd;
|
|
|
|
rtcd->idct.idct1 = vp8_short_idct4x4llm_1_c;
|
|
rtcd->idct.idct16 = vp8_short_idct4x4llm_c;
|
|
rtcd->idct.idct1_scalar_add = vp8_dc_only_idct_add_c;
|
|
rtcd->idct.iwalsh1 = vp8_short_inv_walsh4x4_1_c;
|
|
rtcd->idct.iwalsh16 = vp8_short_inv_walsh4x4_c;
|
|
rtcd->idct.idct8 = vp8_short_idct8x8_c;
|
|
rtcd->idct.idct1_scalar_add_8x8 = vp8_dc_only_idct_add_8x8_c;
|
|
rtcd->idct.ihaar2 = vp8_short_ihaar2x2_c;
|
|
#if CONFIG_TX16X16
|
|
rtcd->idct.idct16x16 = vp8_short_idct16x16_c;
|
|
#endif
|
|
rtcd->recon.copy16x16 = vp8_copy_mem16x16_c;
|
|
rtcd->recon.copy8x8 = vp8_copy_mem8x8_c;
|
|
rtcd->recon.avg16x16 = vp8_avg_mem16x16_c;
|
|
rtcd->recon.avg8x8 = vp8_avg_mem8x8_c;
|
|
rtcd->recon.copy8x4 = vp8_copy_mem8x4_c;
|
|
rtcd->recon.recon = vp8_recon_b_c;
|
|
rtcd->recon.recon_uv = vp8_recon_uv_b_c;
|
|
rtcd->recon.recon2 = vp8_recon2b_c;
|
|
rtcd->recon.recon4 = vp8_recon4b_c;
|
|
rtcd->recon.recon_mb = vp8_recon_mb_c;
|
|
rtcd->recon.recon_mby = vp8_recon_mby_c;
|
|
#if CONFIG_SUPERBLOCKS
|
|
rtcd->recon.build_intra_predictors_sby_s =
|
|
vp8_build_intra_predictors_sby_s;
|
|
rtcd->recon.build_intra_predictors_sbuv_s =
|
|
vp8_build_intra_predictors_sbuv_s;
|
|
#endif
|
|
rtcd->recon.build_intra_predictors_mby =
|
|
vp8_build_intra_predictors_mby;
|
|
#if CONFIG_COMP_INTRA_PRED
|
|
rtcd->recon.build_comp_intra_predictors_mby =
|
|
vp8_build_comp_intra_predictors_mby;
|
|
#endif
|
|
rtcd->recon.build_intra_predictors_mby_s =
|
|
vp8_build_intra_predictors_mby_s;
|
|
rtcd->recon.build_intra_predictors_mbuv =
|
|
vp8_build_intra_predictors_mbuv;
|
|
rtcd->recon.build_intra_predictors_mbuv_s =
|
|
vp8_build_intra_predictors_mbuv_s;
|
|
#if CONFIG_COMP_INTRA_PRED
|
|
rtcd->recon.build_comp_intra_predictors_mbuv =
|
|
vp8_build_comp_intra_predictors_mbuv;
|
|
#endif
|
|
rtcd->recon.intra4x4_predict =
|
|
vp8_intra4x4_predict;
|
|
#if CONFIG_COMP_INTRA_PRED
|
|
rtcd->recon.comp_intra4x4_predict =
|
|
vp8_comp_intra4x4_predict;
|
|
#endif
|
|
rtcd->recon.intra8x8_predict =
|
|
vp8_intra8x8_predict;
|
|
#if CONFIG_COMP_INTRA_PRED
|
|
rtcd->recon.comp_intra8x8_predict =
|
|
vp8_comp_intra8x8_predict;
|
|
#endif
|
|
rtcd->recon.intra_uv4x4_predict =
|
|
vp8_intra_uv4x4_predict;
|
|
#if CONFIG_COMP_INTRA_PRED
|
|
rtcd->recon.comp_intra_uv4x4_predict =
|
|
vp8_comp_intra_uv4x4_predict;
|
|
#endif
|
|
|
|
rtcd->subpix.eighttap16x16 = vp8_eighttap_predict16x16_c;
|
|
rtcd->subpix.eighttap8x8 = vp8_eighttap_predict8x8_c;
|
|
rtcd->subpix.eighttap_avg16x16 = vp8_eighttap_predict_avg16x16_c;
|
|
rtcd->subpix.eighttap_avg8x8 = vp8_eighttap_predict_avg8x8_c;
|
|
rtcd->subpix.eighttap_avg4x4 = vp8_eighttap_predict_avg4x4_c;
|
|
rtcd->subpix.eighttap8x4 = vp8_eighttap_predict8x4_c;
|
|
rtcd->subpix.eighttap4x4 = vp8_eighttap_predict_c;
|
|
rtcd->subpix.eighttap16x16_sharp = vp8_eighttap_predict16x16_sharp_c;
|
|
rtcd->subpix.eighttap8x8_sharp = vp8_eighttap_predict8x8_sharp_c;
|
|
rtcd->subpix.eighttap_avg16x16_sharp = vp8_eighttap_predict_avg16x16_sharp_c;
|
|
rtcd->subpix.eighttap_avg8x8_sharp = vp8_eighttap_predict_avg8x8_sharp_c;
|
|
rtcd->subpix.eighttap_avg4x4_sharp = vp8_eighttap_predict_avg4x4_sharp_c;
|
|
rtcd->subpix.eighttap8x4_sharp = vp8_eighttap_predict8x4_sharp_c;
|
|
rtcd->subpix.eighttap4x4_sharp = vp8_eighttap_predict_sharp_c;
|
|
|
|
rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_c;
|
|
rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_c;
|
|
rtcd->subpix.sixtap_avg16x16 = vp8_sixtap_predict_avg16x16_c;
|
|
rtcd->subpix.sixtap_avg8x8 = vp8_sixtap_predict_avg8x8_c;
|
|
rtcd->subpix.sixtap8x4 = vp8_sixtap_predict8x4_c;
|
|
rtcd->subpix.sixtap4x4 = vp8_sixtap_predict_c;
|
|
rtcd->subpix.sixtap_avg4x4 = vp8_sixtap_predict_avg_c;
|
|
rtcd->subpix.bilinear16x16 = vp8_bilinear_predict16x16_c;
|
|
rtcd->subpix.bilinear8x8 = vp8_bilinear_predict8x8_c;
|
|
rtcd->subpix.bilinear_avg16x16 = vp8_bilinear_predict_avg16x16_c;
|
|
rtcd->subpix.bilinear_avg8x8 = vp8_bilinear_predict_avg8x8_c;
|
|
rtcd->subpix.bilinear8x4 = vp8_bilinear_predict8x4_c;
|
|
rtcd->subpix.bilinear4x4 = vp8_bilinear_predict4x4_c;
|
|
rtcd->subpix.bilinear_avg4x4 = vp8_bilinear_predict_avg4x4_c;
|
|
|
|
rtcd->loopfilter.normal_mb_v = vp8_loop_filter_mbv_c;
|
|
rtcd->loopfilter.normal_b_v = vp8_loop_filter_bv_c;
|
|
rtcd->loopfilter.normal_mb_h = vp8_loop_filter_mbh_c;
|
|
rtcd->loopfilter.normal_b_h = vp8_loop_filter_bh_c;
|
|
rtcd->loopfilter.simple_mb_v = vp8_loop_filter_simple_vertical_edge_c;
|
|
rtcd->loopfilter.simple_b_v = vp8_loop_filter_bvs_c;
|
|
rtcd->loopfilter.simple_mb_h = vp8_loop_filter_simple_horizontal_edge_c;
|
|
rtcd->loopfilter.simple_b_h = vp8_loop_filter_bhs_c;
|
|
|
|
#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_INTERNAL_STATS)
|
|
rtcd->postproc.down = vp8_mbpost_proc_down_c;
|
|
rtcd->postproc.across = vp8_mbpost_proc_across_ip_c;
|
|
rtcd->postproc.downacross = vp8_post_proc_down_and_across_c;
|
|
rtcd->postproc.addnoise = vp8_plane_add_noise_c;
|
|
rtcd->postproc.blend_mb_inner = vp8_blend_mb_inner_c;
|
|
rtcd->postproc.blend_mb_outer = vp8_blend_mb_outer_c;
|
|
rtcd->postproc.blend_b = vp8_blend_b_c;
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#if ARCH_X86 || ARCH_X86_64
|
|
vp8_arch_x86_common_init(ctx);
|
|
#endif
|
|
|
|
|
|
#if ARCH_ARM
|
|
vp8_arch_arm_common_init(ctx);
|
|
#endif
|
|
|
|
vpx_rtcd();
|
|
}
|