| 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 include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk | |
| 13 | |
| 14 VP8_DX_EXPORTS += exports_dec | 12 VP8_DX_EXPORTS += exports_dec |
| 15 | 13 |
| 16 VP8_DX_SRCS-yes += $(VP8_COMMON_SRCS-yes) | 14 VP8_DX_SRCS-yes += $(VP8_COMMON_SRCS-yes) |
| 17 VP8_DX_SRCS-no += $(VP8_COMMON_SRCS-no) | 15 VP8_DX_SRCS-no += $(VP8_COMMON_SRCS-no) |
| 18 VP8_DX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes) | 16 VP8_DX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes) |
| 19 VP8_DX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no) | 17 VP8_DX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no) |
| 20 | 18 |
| 21 VP8_DX_SRCS-yes += vp8dx.mk | |
| 22 | |
| 23 VP8_DX_SRCS-yes += vp8_dx_iface.c | 19 VP8_DX_SRCS-yes += vp8_dx_iface.c |
| 24 | 20 |
| 25 # common | |
| 26 #define ARM | |
| 27 #define DISABLE_THREAD | |
| 28 | |
| 29 #INCLUDES += algo/vpx_common/vpx_mem/include | |
| 30 #INCLUDES += common | |
| 31 #INCLUDES += common | |
| 32 #INCLUDES += common | |
| 33 #INCLUDES += common | |
| 34 #INCLUDES += decoder | |
| 35 | |
| 36 | |
| 37 | |
| 38 # decoder | |
| 39 #define ARM | |
| 40 #define DISABLE_THREAD | |
| 41 | |
| 42 #INCLUDES += algo/vpx_common/vpx_mem/include | |
| 43 #INCLUDES += common | |
| 44 #INCLUDES += common | |
| 45 #INCLUDES += common | |
| 46 #INCLUDES += common | |
| 47 #INCLUDES += decoder | |
| 48 | |
| 49 VP8_DX_SRCS-yes += decoder/asm_dec_offsets.c | 21 VP8_DX_SRCS-yes += decoder/asm_dec_offsets.c |
| 50 VP8_DX_SRCS-yes += decoder/dboolhuff.c | 22 VP8_DX_SRCS-yes += decoder/dboolhuff.c |
| 51 VP8_DX_SRCS-yes += decoder/decodemv.c | 23 VP8_DX_SRCS-yes += decoder/decodemv.c |
| 52 VP8_DX_SRCS-yes += decoder/decodframe.c | 24 VP8_DX_SRCS-yes += decoder/decodframe.c |
| 53 VP8_DX_SRCS-yes += decoder/detokenize.c | 25 VP8_DX_SRCS-yes += decoder/detokenize.c |
| 54 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/ec_types.h | 26 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/ec_types.h |
| 55 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/error_concealment.h | 27 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/error_concealment.h |
| 56 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/error_concealment.c | 28 VP8_DX_SRCS-$(CONFIG_ERROR_CONCEALMENT) += decoder/error_concealment.c |
| 57 VP8_DX_SRCS-yes += decoder/dboolhuff.h | 29 VP8_DX_SRCS-yes += decoder/dboolhuff.h |
| 58 VP8_DX_SRCS-yes += decoder/decodemv.h | 30 VP8_DX_SRCS-yes += decoder/decodemv.h |
| 59 VP8_DX_SRCS-yes += decoder/decoderthreading.h | 31 VP8_DX_SRCS-yes += decoder/decoderthreading.h |
| 60 VP8_DX_SRCS-yes += decoder/detokenize.h | 32 VP8_DX_SRCS-yes += decoder/detokenize.h |
| 61 VP8_DX_SRCS-yes += decoder/onyxd_int.h | 33 VP8_DX_SRCS-yes += decoder/onyxd_int.h |
| 62 VP8_DX_SRCS-yes += decoder/treereader.h | 34 VP8_DX_SRCS-yes += decoder/treereader.h |
| 63 VP8_DX_SRCS-yes += decoder/onyxd_if.c | 35 VP8_DX_SRCS-yes += decoder/onyxd_if.c |
| 64 VP8_DX_SRCS-$(CONFIG_MULTITHREAD) += decoder/threading.c | 36 VP8_DX_SRCS-$(CONFIG_MULTITHREAD) += decoder/threading.c |
| 65 | 37 |
| 66 VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes)) | 38 VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes)) |
| 39 |
| 40 $(eval $(call asm_offsets_template,\ |
| 41 vp8_asm_dec_offsets.asm, $(VP8_PREFIX)decoder/asm_dec_offsets.c)) |
| OLD | NEW |