| OLD | NEW |
|---|
| 1 ## | 1 ## |
| 2 ## Copyright (c) 2015 The WebM project authors. All Rights Reserved. | 2 ## Copyright (c) 2015 The WebM project authors. All Rights Reserved. |
| 3 ## | 3 ## |
| 4 ## Use of this source code is governed by a BSD-style license | 4 ## Use of this source code is governed by a BSD-style license |
| 5 ## that can be found in the LICENSE file in the root of the source | 5 ## that can be found in the LICENSE file in the root of the source |
| 6 ## tree. An additional intellectual property rights grant can be found | 6 ## tree. An additional intellectual property rights grant can be found |
| 7 ## in the file PATENTS. All contributing project authors may | 7 ## in the file PATENTS. All contributing project authors may |
| 8 ## be found in the AUTHORS file in the root of the source tree. | 8 ## be found in the AUTHORS file in the root of the source tree. |
| 9 ## | 9 ## |
| 10 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 endif | 36 endif |
| 37 | 37 |
| 38 # intra predictions | 38 # intra predictions |
| 39 ifneq ($(filter yes,$(CONFIG_VP9) $(CONFIG_VP10)),) | 39 ifneq ($(filter yes,$(CONFIG_VP9) $(CONFIG_VP10)),) |
| 40 DSP_SRCS-yes += intrapred.c | 40 DSP_SRCS-yes += intrapred.c |
| 41 | 41 |
| 42 ifeq ($(CONFIG_USE_X86INC),yes) | 42 ifeq ($(CONFIG_USE_X86INC),yes) |
| 43 DSP_SRCS-$(HAVE_SSE) += x86/intrapred_sse2.asm | 43 DSP_SRCS-$(HAVE_SSE) += x86/intrapred_sse2.asm |
| 44 DSP_SRCS-$(HAVE_SSE2) += x86/intrapred_sse2.asm | 44 DSP_SRCS-$(HAVE_SSE2) += x86/intrapred_sse2.asm |
| 45 DSP_SRCS-$(HAVE_SSSE3) += x86/intrapred_ssse3.asm | 45 DSP_SRCS-$(HAVE_SSSE3) += x86/intrapred_ssse3.asm |
| 46 DSP_SRCS-$(HAVE_SSSE3) += x86/vpx_subpixel_8t_ssse3.asm |
| 46 endif # CONFIG_USE_X86INC | 47 endif # CONFIG_USE_X86INC |
| 47 | 48 |
| 48 ifeq ($(CONFIG_VP9_HIGHBITDEPTH),yes) | 49 ifeq ($(CONFIG_VP9_HIGHBITDEPTH),yes) |
| 49 ifeq ($(CONFIG_USE_X86INC),yes) | 50 ifeq ($(CONFIG_USE_X86INC),yes) |
| 50 DSP_SRCS-$(HAVE_SSE) += x86/highbd_intrapred_sse2.asm | 51 DSP_SRCS-$(HAVE_SSE) += x86/highbd_intrapred_sse2.asm |
| 51 DSP_SRCS-$(HAVE_SSE2) += x86/highbd_intrapred_sse2.asm | 52 DSP_SRCS-$(HAVE_SSE2) += x86/highbd_intrapred_sse2.asm |
| 52 endif # CONFIG_USE_X86INC | 53 endif # CONFIG_USE_X86INC |
| 53 endif # CONFIG_VP9_HIGHBITDEPTH | 54 endif # CONFIG_VP9_HIGHBITDEPTH |
| 54 | 55 |
| 55 DSP_SRCS-$(HAVE_NEON_ASM) += arm/intrapred_neon_asm$(ASM) | 56 DSP_SRCS-$(HAVE_NEON_ASM) += arm/intrapred_neon_asm$(ASM) |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 endif # CONFIG_USE_X86INC | 331 endif # CONFIG_USE_X86INC |
| 331 endif # CONFIG_VP9_HIGHBITDEPTH | 332 endif # CONFIG_VP9_HIGHBITDEPTH |
| 332 endif # CONFIG_ENCODERS || CONFIG_POSTPROC || CONFIG_VP9_POSTPROC | 333 endif # CONFIG_ENCODERS || CONFIG_POSTPROC || CONFIG_VP9_POSTPROC |
| 333 | 334 |
| 334 DSP_SRCS-no += $(DSP_SRCS_REMOVE-yes) | 335 DSP_SRCS-no += $(DSP_SRCS_REMOVE-yes) |
| 335 | 336 |
| 336 DSP_SRCS-yes += vpx_dsp_rtcd.c | 337 DSP_SRCS-yes += vpx_dsp_rtcd.c |
| 337 DSP_SRCS-yes += vpx_dsp_rtcd_defs.pl | 338 DSP_SRCS-yes += vpx_dsp_rtcd_defs.pl |
| 338 | 339 |
| 339 $(eval $(call rtcd_h_template,vpx_dsp_rtcd,vpx_dsp/vpx_dsp_rtcd_defs.pl)) | 340 $(eval $(call rtcd_h_template,vpx_dsp_rtcd,vpx_dsp/vpx_dsp_rtcd_defs.pl)) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1339513003:
libvpx: Pull from upstream (Closed)
Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master