gecko-dev/media/libvpx/vp9/encoder/vp9_picklpf.c

193 строки
6.4 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 <assert.h>
#include <limits.h>
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
#include "./vpx_scale_rtcd.h"
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
#include "vpx_mem/vpx_mem.h"
Bug 1178215 - Update libvpx. r=rillian Update libvpx to e67d45d4ce92468ba193288b59093fef0a502662 * * * Bug 1178215 - Bump clobber for libvpx file renames. r=me --HG-- rename : media/libvpx/vp8/common/x86/variance_impl_mmx.asm => media/libvpx/vp8/common/x86/vp8_variance_impl_mmx.asm rename : media/libvpx/vp8/common/x86/variance_mmx.c => media/libvpx/vp8/common/x86/vp8_variance_mmx.c rename : media/libvpx/vp8/common/x86/variance_sse2.c => media/libvpx/vp8/common/x86/vp8_variance_sse2.c rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.c => media/libvpx/vp9/common/arm/neon/vp9_convolve_avg_neon.c rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve_avg_neon_asm.asm rename : media/libvpx/vp9/encoder/x86/vp9_dct32x32_avx2.c => media/libvpx/vp9/encoder/x86/vp9_dct32x32_avx2_impl.h rename : media/libvpx/vp9/encoder/x86/vp9_dct32x32_sse2.c => media/libvpx/vp9/encoder/x86/vp9_dct32x32_sse2_impl.h rename : media/libvpx/vp9/encoder/x86/vp9_dct_impl_sse2.c => media/libvpx/vp9/encoder/x86/vp9_dct_sse2_impl.h rename : media/libvpx/vp9/encoder/arm/neon/vp9_sad4d_neon.c => media/libvpx/vpx_dsp/arm/sad4d_neon.c rename : media/libvpx/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm => media/libvpx/vpx_dsp/arm/sad_media.asm rename : media/libvpx/vp9/encoder/arm/neon/vp9_sad_neon.c => media/libvpx/vpx_dsp/arm/sad_neon.c rename : media/libvpx/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm => media/libvpx/vpx_dsp/arm/variance_media.asm rename : media/libvpx/vp9/encoder/vp9_sad.c => media/libvpx/vpx_dsp/sad.c rename : media/libvpx/vp9/encoder/x86/vp9_highbd_sad4d_sse2.asm => media/libvpx/vpx_dsp/x86/highbd_sad4d_sse2.asm rename : media/libvpx/vp9/encoder/x86/vp9_highbd_sad_sse2.asm => media/libvpx/vpx_dsp/x86/highbd_sad_sse2.asm rename : media/libvpx/vp9/encoder/x86/vp9_highbd_variance_impl_sse2.asm => media/libvpx/vpx_dsp/x86/highbd_variance_impl_sse2.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad4d_intrin_avx2.c => media/libvpx/vpx_dsp/x86/sad4d_avx2.c rename : media/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm => media/libvpx/vpx_dsp/x86/sad4d_sse2.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad_intrin_avx2.c => media/libvpx/vpx_dsp/x86/sad_avx2.c rename : media/libvpx/vp8/common/x86/sad_mmx.asm => media/libvpx/vpx_dsp/x86/sad_mmx.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm => media/libvpx/vpx_dsp/x86/sad_sse2.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm => media/libvpx/vpx_dsp/x86/sad_sse3.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm => media/libvpx/vpx_dsp/x86/sad_sse4.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm => media/libvpx/vpx_dsp/x86/sad_ssse3.asm rename : media/libvpx/vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c => media/libvpx/vpx_dsp/x86/variance_impl_avx2.c rename : media/libvpx/vp8/common/x86/variance_impl_mmx.asm => media/libvpx/vpx_dsp/x86/variance_impl_mmx.asm
2015-06-30 00:07:20 +03:00
#include "vpx_ports/mem.h"
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
#include "vp9/common/vp9_loopfilter.h"
#include "vp9/common/vp9_onyxc_int.h"
#include "vp9/common/vp9_quant_common.h"
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
#include "vp9/encoder/vp9_encoder.h"
#include "vp9/encoder/vp9_picklpf.h"
#include "vp9/encoder/vp9_quantize.h"
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
static int get_max_filter_level(const VP9_COMP *cpi) {
if (cpi->oxcf.pass == 2) {
return cpi->twopass.section_intra_rating > 8 ? MAX_LOOP_FILTER * 3 / 4
: MAX_LOOP_FILTER;
} else {
return MAX_LOOP_FILTER;
}
}
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
static int64_t try_filter_frame(const YV12_BUFFER_CONFIG *sd,
VP9_COMP *const cpi,
int filt_level, int partial_frame) {
VP9_COMMON *const cm = &cpi->common;
int64_t filt_err;
if (cpi->num_workers > 1)
vp9_loop_filter_frame_mt(cm->frame_to_show, cm, cpi->td.mb.e_mbd.plane,
filt_level, 1, partial_frame,
cpi->workers, cpi->num_workers, &cpi->lf_row_sync);
else
vp9_loop_filter_frame(cm->frame_to_show, cm, &cpi->td.mb.e_mbd, filt_level,
1, partial_frame);
#if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth) {
filt_err = vp9_highbd_get_y_sse(sd, cm->frame_to_show);
} else {
filt_err = vp9_get_y_sse(sd, cm->frame_to_show);
}
#else
filt_err = vp9_get_y_sse(sd, cm->frame_to_show);
#endif // CONFIG_VP9_HIGHBITDEPTH
// Re-instate the unfiltered frame
vpx_yv12_copy_y(&cpi->last_frame_uf, cm->frame_to_show);
return filt_err;
}
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
static int search_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi,
int partial_frame) {
const VP9_COMMON *const cm = &cpi->common;
const struct loopfilter *const lf = &cm->lf;
const int min_filter_level = 0;
const int max_filter_level = get_max_filter_level(cpi);
int filt_direction = 0;
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
int64_t best_err;
int filt_best;
// Start the search at the previous frame filter level unless it is now out of
// range.
int filt_mid = clamp(lf->filter_level, min_filter_level, max_filter_level);
int filter_step = filt_mid < 16 ? 4 : filt_mid / 4;
// Sum squared error at each filter level
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
int64_t ss_err[MAX_LOOP_FILTER + 1];
// Set each entry to -1
Bug 1178215 - Update libvpx. r=rillian Update libvpx to e67d45d4ce92468ba193288b59093fef0a502662 * * * Bug 1178215 - Bump clobber for libvpx file renames. r=me --HG-- rename : media/libvpx/vp8/common/x86/variance_impl_mmx.asm => media/libvpx/vp8/common/x86/vp8_variance_impl_mmx.asm rename : media/libvpx/vp8/common/x86/variance_mmx.c => media/libvpx/vp8/common/x86/vp8_variance_mmx.c rename : media/libvpx/vp8/common/x86/variance_sse2.c => media/libvpx/vp8/common/x86/vp8_variance_sse2.c rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.c => media/libvpx/vp9/common/arm/neon/vp9_convolve_avg_neon.c rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve_avg_neon_asm.asm rename : media/libvpx/vp9/encoder/x86/vp9_dct32x32_avx2.c => media/libvpx/vp9/encoder/x86/vp9_dct32x32_avx2_impl.h rename : media/libvpx/vp9/encoder/x86/vp9_dct32x32_sse2.c => media/libvpx/vp9/encoder/x86/vp9_dct32x32_sse2_impl.h rename : media/libvpx/vp9/encoder/x86/vp9_dct_impl_sse2.c => media/libvpx/vp9/encoder/x86/vp9_dct_sse2_impl.h rename : media/libvpx/vp9/encoder/arm/neon/vp9_sad4d_neon.c => media/libvpx/vpx_dsp/arm/sad4d_neon.c rename : media/libvpx/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm => media/libvpx/vpx_dsp/arm/sad_media.asm rename : media/libvpx/vp9/encoder/arm/neon/vp9_sad_neon.c => media/libvpx/vpx_dsp/arm/sad_neon.c rename : media/libvpx/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm => media/libvpx/vpx_dsp/arm/variance_media.asm rename : media/libvpx/vp9/encoder/vp9_sad.c => media/libvpx/vpx_dsp/sad.c rename : media/libvpx/vp9/encoder/x86/vp9_highbd_sad4d_sse2.asm => media/libvpx/vpx_dsp/x86/highbd_sad4d_sse2.asm rename : media/libvpx/vp9/encoder/x86/vp9_highbd_sad_sse2.asm => media/libvpx/vpx_dsp/x86/highbd_sad_sse2.asm rename : media/libvpx/vp9/encoder/x86/vp9_highbd_variance_impl_sse2.asm => media/libvpx/vpx_dsp/x86/highbd_variance_impl_sse2.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad4d_intrin_avx2.c => media/libvpx/vpx_dsp/x86/sad4d_avx2.c rename : media/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm => media/libvpx/vpx_dsp/x86/sad4d_sse2.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad_intrin_avx2.c => media/libvpx/vpx_dsp/x86/sad_avx2.c rename : media/libvpx/vp8/common/x86/sad_mmx.asm => media/libvpx/vpx_dsp/x86/sad_mmx.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm => media/libvpx/vpx_dsp/x86/sad_sse2.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm => media/libvpx/vpx_dsp/x86/sad_sse3.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm => media/libvpx/vpx_dsp/x86/sad_sse4.asm rename : media/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm => media/libvpx/vpx_dsp/x86/sad_ssse3.asm rename : media/libvpx/vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c => media/libvpx/vpx_dsp/x86/variance_impl_avx2.c rename : media/libvpx/vp8/common/x86/variance_impl_mmx.asm => media/libvpx/vpx_dsp/x86/variance_impl_mmx.asm
2015-06-30 00:07:20 +03:00
memset(ss_err, 0xFF, sizeof(ss_err));
// Make a copy of the unfiltered / processed recon buffer
vpx_yv12_copy_y(cm->frame_to_show, &cpi->last_frame_uf);
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
best_err = try_filter_frame(sd, cpi, filt_mid, partial_frame);
filt_best = filt_mid;
ss_err[filt_mid] = best_err;
while (filter_step > 0) {
const int filt_high = MIN(filt_mid + filter_step, max_filter_level);
const int filt_low = MAX(filt_mid - filter_step, min_filter_level);
// Bias against raising loop filter in favor of lowering it.
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
int64_t bias = (best_err >> (15 - (filt_mid / 8))) * filter_step;
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
if ((cpi->oxcf.pass == 2) && (cpi->twopass.section_intra_rating < 20))
bias = (bias * cpi->twopass.section_intra_rating) / 20;
// yx, bias less for large block size
if (cm->tx_mode != ONLY_4X4)
bias >>= 1;
if (filt_direction <= 0 && filt_low != filt_mid) {
// Get Low filter error score
if (ss_err[filt_low] < 0) {
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
ss_err[filt_low] = try_filter_frame(sd, cpi, filt_low, partial_frame);
}
// If value is close to the best so far then bias towards a lower loop
// filter value.
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
if ((ss_err[filt_low] - bias) < best_err) {
// Was it actually better than the previous best?
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
if (ss_err[filt_low] < best_err)
best_err = ss_err[filt_low];
filt_best = filt_low;
}
}
// Now look at filt_high
if (filt_direction >= 0 && filt_high != filt_mid) {
if (ss_err[filt_high] < 0) {
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
ss_err[filt_high] = try_filter_frame(sd, cpi, filt_high, partial_frame);
}
// Was it better than the previous best?
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
if (ss_err[filt_high] < (best_err - bias)) {
best_err = ss_err[filt_high];
filt_best = filt_high;
}
}
// Half the step distance if the best filter value was the same as last time
if (filt_best == filt_mid) {
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
filter_step /= 2;
filt_direction = 0;
} else {
filt_direction = (filt_best < filt_mid) ? -1 : 1;
filt_mid = filt_best;
}
}
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
return filt_best;
}
void vp9_pick_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi,
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
LPF_PICK_METHOD method) {
VP9_COMMON *const cm = &cpi->common;
struct loopfilter *const lf = &cm->lf;
lf->sharpness_level = cm->frame_type == KEY_FRAME ? 0
: cpi->oxcf.sharpness;
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
if (method == LPF_PICK_MINIMAL_LPF && lf->filter_level) {
lf->filter_level = 0;
} else if (method >= LPF_PICK_FROM_Q) {
const int min_filter_level = 0;
const int max_filter_level = get_max_filter_level(cpi);
const int q = vp9_ac_quant(cm->base_qindex, 0, cm->bit_depth);
// These values were determined by linear fitting the result of the
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
// searched level, filt_guess = q * 0.316206 + 3.87252
#if CONFIG_VP9_HIGHBITDEPTH
int filt_guess;
switch (cm->bit_depth) {
case VPX_BITS_8:
filt_guess = ROUND_POWER_OF_TWO(q * 20723 + 1015158, 18);
break;
case VPX_BITS_10:
filt_guess = ROUND_POWER_OF_TWO(q * 20723 + 4060632, 20);
break;
case VPX_BITS_12:
filt_guess = ROUND_POWER_OF_TWO(q * 20723 + 16242526, 22);
break;
default:
assert(0 && "bit_depth should be VPX_BITS_8, VPX_BITS_10 "
"or VPX_BITS_12");
return;
}
#else
int filt_guess = ROUND_POWER_OF_TWO(q * 20723 + 1015158, 18);
#endif // CONFIG_VP9_HIGHBITDEPTH
if (cm->frame_type == KEY_FRAME)
filt_guess -= 4;
lf->filter_level = clamp(filt_guess, min_filter_level, max_filter_level);
} else {
Bug 1151175 - Update libvpx to 1.4.0. r=rillian vp9_thread.c has changed directories, which mach doesn't handle properly, resulting in "No rule to make target" for the old source file path. Bump clobber for libvpx file renames. --HG-- rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 21:46:25 +03:00
lf->filter_level = search_filter_level(sd, cpi,
method == LPF_PICK_FROM_SUBIMAGE);
}
}