| OLD | NEW |
|---|
| 1 ## | 1 ## |
| 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 ## Copyright (c) 2010 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 |
| 11 | 11 |
| 12 VP8_CX_EXPORTS += exports_enc | 12 VP8_CX_EXPORTS += exports_enc |
| 13 | 13 |
| 14 VP8_CX_SRCS-yes += $(VP8_COMMON_SRCS-yes) | 14 VP8_CX_SRCS-yes += $(VP8_COMMON_SRCS-yes) |
| 15 VP8_CX_SRCS-no += $(VP8_COMMON_SRCS-no) | 15 VP8_CX_SRCS-no += $(VP8_COMMON_SRCS-no) |
| 16 VP8_CX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes) | 16 VP8_CX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes) |
| 17 VP8_CX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no) | 17 VP8_CX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no) |
| 18 | 18 |
| 19 ifeq ($(ARCH_ARM),yes) | 19 ifeq ($(ARCH_ARM),yes) |
| 20 include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx_arm.mk | 20 include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx_arm.mk |
| 21 endif | 21 endif |
| 22 | 22 |
| 23 VP8_CX_SRCS-yes += vp8cx.mk |
| 24 |
| 23 VP8_CX_SRCS-yes += vp8_cx_iface.c | 25 VP8_CX_SRCS-yes += vp8_cx_iface.c |
| 24 | 26 |
| 25 # encoder | |
| 26 #INCLUDES += algo/vpx_common/vpx_mem/include | |
| 27 #INCLUDES += common | |
| 28 #INCLUDES += common | |
| 29 #INCLUDES += common | |
| 30 #INCLUDES += algo/vpx_ref/cpu_id/include | |
| 31 #INCLUDES += common | |
| 32 #INCLUDES += encoder | |
| 33 | |
| 34 VP8_CX_SRCS-yes += encoder/asm_enc_offsets.c | 27 VP8_CX_SRCS-yes += encoder/asm_enc_offsets.c |
| 35 VP8_CX_SRCS-yes += encoder/defaultcoefcounts.h | 28 VP8_CX_SRCS-yes += encoder/defaultcoefcounts.h |
| 36 VP8_CX_SRCS-yes += encoder/bitstream.c | 29 VP8_CX_SRCS-yes += encoder/bitstream.c |
| 37 VP8_CX_SRCS-yes += encoder/boolhuff.c | 30 VP8_CX_SRCS-yes += encoder/boolhuff.c |
| 38 VP8_CX_SRCS-yes += encoder/dct.c | 31 VP8_CX_SRCS-yes += encoder/dct.c |
| 39 VP8_CX_SRCS-yes += encoder/encodeframe.c | 32 VP8_CX_SRCS-yes += encoder/encodeframe.c |
| 40 VP8_CX_SRCS-yes += encoder/encodeframe.h | 33 VP8_CX_SRCS-yes += encoder/encodeframe.h |
| 41 VP8_CX_SRCS-yes += encoder/encodeintra.c | 34 VP8_CX_SRCS-yes += encoder/encodeintra.c |
| 42 VP8_CX_SRCS-yes += encoder/encodemb.c | 35 VP8_CX_SRCS-yes += encoder/encodemb.c |
| 43 VP8_CX_SRCS-yes += encoder/encodemv.c | 36 VP8_CX_SRCS-yes += encoder/encodemv.c |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 | 110 |
| 118 ifeq ($(CONFIG_REALTIME_ONLY),yes) | 111 ifeq ($(CONFIG_REALTIME_ONLY),yes) |
| 119 VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm | 112 VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm |
| 120 endif | 113 endif |
| 121 | 114 |
| 122 | 115 |
| 123 VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes)) | 116 VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes)) |
| 124 | 117 |
| 125 $(eval $(call asm_offsets_template,\ | 118 $(eval $(call asm_offsets_template,\ |
| 126 vp8_asm_enc_offsets.asm, $(VP8_PREFIX)encoder/asm_enc_offsets.c)) | 119 vp8_asm_enc_offsets.asm, $(VP8_PREFIX)encoder/asm_enc_offsets.c)) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11974002:
libvpx: Pull from upstream (Closed)
Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/