| 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 VP9_CX_EXPORTS += exports_enc | 11 VP9_CX_EXPORTS += exports_enc |
| 12 | 12 |
| 13 VP9_CX_SRCS-yes += $(VP9_COMMON_SRCS-yes) | 13 VP9_CX_SRCS-yes += $(VP9_COMMON_SRCS-yes) |
| 14 VP9_CX_SRCS-no += $(VP9_COMMON_SRCS-no) | 14 VP9_CX_SRCS-no += $(VP9_COMMON_SRCS-no) |
| 15 VP9_CX_SRCS_REMOVE-yes += $(VP9_COMMON_SRCS_REMOVE-yes) | 15 VP9_CX_SRCS_REMOVE-yes += $(VP9_COMMON_SRCS_REMOVE-yes) |
| 16 VP9_CX_SRCS_REMOVE-no += $(VP9_COMMON_SRCS_REMOVE-no) | 16 VP9_CX_SRCS_REMOVE-no += $(VP9_COMMON_SRCS_REMOVE-no) |
| 17 | 17 |
| 18 VP9_CX_SRCS-yes += vp9_cx_iface.c | 18 VP9_CX_SRCS-yes += vp9_cx_iface.c |
| 19 | 19 |
| 20 VP9_CX_SRCS-yes += encoder/vp9_bitstream.c | 20 VP9_CX_SRCS-yes += encoder/vp9_bitstream.c |
| 21 VP9_CX_SRCS-yes += encoder/vp9_cost.h |
| 22 VP9_CX_SRCS-yes += encoder/vp9_cost.c |
| 21 VP9_CX_SRCS-yes += encoder/vp9_dct.c | 23 VP9_CX_SRCS-yes += encoder/vp9_dct.c |
| 22 VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c | 24 VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c |
| 23 VP9_CX_SRCS-yes += encoder/vp9_encodeframe.h | 25 VP9_CX_SRCS-yes += encoder/vp9_encodeframe.h |
| 24 VP9_CX_SRCS-yes += encoder/vp9_encodemb.c | 26 VP9_CX_SRCS-yes += encoder/vp9_encodemb.c |
| 25 VP9_CX_SRCS-yes += encoder/vp9_encodemv.c | 27 VP9_CX_SRCS-yes += encoder/vp9_encodemv.c |
| 26 VP9_CX_SRCS-yes += encoder/vp9_extend.c | 28 VP9_CX_SRCS-yes += encoder/vp9_extend.c |
| 27 VP9_CX_SRCS-yes += encoder/vp9_firstpass.c | 29 VP9_CX_SRCS-yes += encoder/vp9_firstpass.c |
| 28 VP9_CX_SRCS-yes += encoder/vp9_block.h | 30 VP9_CX_SRCS-yes += encoder/vp9_block.h |
| 29 VP9_CX_SRCS-yes += encoder/vp9_writer.h | 31 VP9_CX_SRCS-yes += encoder/vp9_writer.h |
| 30 VP9_CX_SRCS-yes += encoder/vp9_writer.c | 32 VP9_CX_SRCS-yes += encoder/vp9_writer.c |
| 33 VP9_CX_SRCS-yes += encoder/vp9_write_bit_buffer.c |
| 31 VP9_CX_SRCS-yes += encoder/vp9_write_bit_buffer.h | 34 VP9_CX_SRCS-yes += encoder/vp9_write_bit_buffer.h |
| 32 VP9_CX_SRCS-yes += encoder/vp9_bitstream.h | 35 VP9_CX_SRCS-yes += encoder/vp9_bitstream.h |
| 33 VP9_CX_SRCS-yes += encoder/vp9_encodemb.h | 36 VP9_CX_SRCS-yes += encoder/vp9_encodemb.h |
| 34 VP9_CX_SRCS-yes += encoder/vp9_encodemv.h | 37 VP9_CX_SRCS-yes += encoder/vp9_encodemv.h |
| 35 VP9_CX_SRCS-yes += encoder/vp9_extend.h | 38 VP9_CX_SRCS-yes += encoder/vp9_extend.h |
| 36 VP9_CX_SRCS-yes += encoder/vp9_firstpass.h | 39 VP9_CX_SRCS-yes += encoder/vp9_firstpass.h |
| 37 VP9_CX_SRCS-yes += encoder/vp9_lookahead.c | 40 VP9_CX_SRCS-yes += encoder/vp9_lookahead.c |
| 38 VP9_CX_SRCS-yes += encoder/vp9_lookahead.h | 41 VP9_CX_SRCS-yes += encoder/vp9_lookahead.h |
| 39 VP9_CX_SRCS-yes += encoder/vp9_mcomp.h | 42 VP9_CX_SRCS-yes += encoder/vp9_mcomp.h |
| 40 VP9_CX_SRCS-yes += encoder/vp9_onyx_int.h | 43 VP9_CX_SRCS-yes += encoder/vp9_onyx_int.h |
| 41 VP9_CX_SRCS-yes += encoder/vp9_quantize.h | 44 VP9_CX_SRCS-yes += encoder/vp9_quantize.h |
| 42 VP9_CX_SRCS-yes += encoder/vp9_ratectrl.h | 45 VP9_CX_SRCS-yes += encoder/vp9_ratectrl.h |
| 43 VP9_CX_SRCS-yes += encoder/vp9_rdopt.h | 46 VP9_CX_SRCS-yes += encoder/vp9_rdopt.h |
| 44 VP9_CX_SRCS-yes += encoder/vp9_pickmode.h | 47 VP9_CX_SRCS-yes += encoder/vp9_pickmode.h |
| 48 VP9_CX_SRCS-yes += encoder/vp9_svc_layercontext.h |
| 45 VP9_CX_SRCS-yes += encoder/vp9_tokenize.h | 49 VP9_CX_SRCS-yes += encoder/vp9_tokenize.h |
| 46 VP9_CX_SRCS-yes += encoder/vp9_treewriter.h | 50 VP9_CX_SRCS-yes += encoder/vp9_treewriter.h |
| 47 VP9_CX_SRCS-yes += encoder/vp9_variance.h | 51 VP9_CX_SRCS-yes += encoder/vp9_variance.h |
| 48 VP9_CX_SRCS-yes += encoder/vp9_mcomp.c | 52 VP9_CX_SRCS-yes += encoder/vp9_mcomp.c |
| 49 VP9_CX_SRCS-yes += encoder/vp9_onyx_if.c | 53 VP9_CX_SRCS-yes += encoder/vp9_onyx_if.c |
| 50 VP9_CX_SRCS-yes += encoder/vp9_picklpf.c | 54 VP9_CX_SRCS-yes += encoder/vp9_picklpf.c |
| 51 VP9_CX_SRCS-yes += encoder/vp9_picklpf.h | 55 VP9_CX_SRCS-yes += encoder/vp9_picklpf.h |
| 52 VP9_CX_SRCS-yes += encoder/vp9_quantize.c | 56 VP9_CX_SRCS-yes += encoder/vp9_quantize.c |
| 53 VP9_CX_SRCS-yes += encoder/vp9_ratectrl.c | 57 VP9_CX_SRCS-yes += encoder/vp9_ratectrl.c |
| 54 VP9_CX_SRCS-yes += encoder/vp9_rdopt.c | 58 VP9_CX_SRCS-yes += encoder/vp9_rdopt.c |
| 55 VP9_CX_SRCS-yes += encoder/vp9_pickmode.c | 59 VP9_CX_SRCS-yes += encoder/vp9_pickmode.c |
| 56 VP9_CX_SRCS-yes += encoder/vp9_sad.c | 60 VP9_CX_SRCS-yes += encoder/vp9_sad.c |
| 57 VP9_CX_SRCS-yes += encoder/vp9_segmentation.c | 61 VP9_CX_SRCS-yes += encoder/vp9_segmentation.c |
| 58 VP9_CX_SRCS-yes += encoder/vp9_segmentation.h | 62 VP9_CX_SRCS-yes += encoder/vp9_segmentation.h |
| 63 VP9_CX_SRCS-yes += encoder/vp9_speed_features.c |
| 64 VP9_CX_SRCS-yes += encoder/vp9_speed_features.h |
| 59 VP9_CX_SRCS-yes += encoder/vp9_subexp.c | 65 VP9_CX_SRCS-yes += encoder/vp9_subexp.c |
| 60 VP9_CX_SRCS-yes += encoder/vp9_subexp.h | 66 VP9_CX_SRCS-yes += encoder/vp9_subexp.h |
| 67 VP9_CX_SRCS-yes += encoder/vp9_svc_layercontext.c |
| 61 VP9_CX_SRCS-yes += encoder/vp9_resize.c | 68 VP9_CX_SRCS-yes += encoder/vp9_resize.c |
| 62 VP9_CX_SRCS-yes += encoder/vp9_resize.h | 69 VP9_CX_SRCS-yes += encoder/vp9_resize.h |
| 63 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c | 70 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c |
| 71 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.h |
| 64 VP9_CX_SRCS-yes += encoder/vp9_tokenize.c | 72 VP9_CX_SRCS-yes += encoder/vp9_tokenize.c |
| 65 VP9_CX_SRCS-yes += encoder/vp9_treewriter.c | 73 VP9_CX_SRCS-yes += encoder/vp9_treewriter.c |
| 66 VP9_CX_SRCS-yes += encoder/vp9_variance.c | 74 VP9_CX_SRCS-yes += encoder/vp9_variance.c |
| 67 VP9_CX_SRCS-yes += encoder/vp9_vaq.c | 75 VP9_CX_SRCS-yes += encoder/vp9_aq_variance.c |
| 68 VP9_CX_SRCS-yes += encoder/vp9_vaq.h | 76 VP9_CX_SRCS-yes += encoder/vp9_aq_variance.h |
| 77 VP9_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.c |
| 78 VP9_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.h |
| 79 VP9_CX_SRCS-yes += encoder/vp9_aq_complexity.c |
| 80 VP9_CX_SRCS-yes += encoder/vp9_aq_complexity.h |
| 69 ifeq ($(CONFIG_VP9_POSTPROC),yes) | 81 ifeq ($(CONFIG_VP9_POSTPROC),yes) |
| 70 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.h | 82 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.h |
| 71 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.c | 83 VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.c |
| 72 endif | 84 endif |
| 73 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.c | 85 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.c |
| 74 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.h | 86 VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.h |
| 75 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.c | 87 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.c |
| 76 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.h | 88 VP9_CX_SRCS-yes += encoder/vp9_mbgraph.h |
| 77 | 89 |
| 78 | 90 |
| 79 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_mcomp_x86.h | 91 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_mcomp_x86.h |
| 80 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_mmx.c | 92 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_mmx.c |
| 81 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_impl_mmx.asm | 93 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_impl_mmx.asm |
| 82 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_sad_mmx.asm | 94 VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_sad_mmx.asm |
| 83 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_impl_sse2.asm | 95 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_impl_sse2.asm |
| 84 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_variance_impl_intrin_avx2.c | 96 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_variance_impl_intrin_avx2.c |
| 85 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad4d_sse2.asm | 97 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad4d_sse2.asm |
| 98 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_sad4d_intrin_avx2.c |
| 86 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance_impl_sse2.asm | 99 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance_impl_sse2.asm |
| 87 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_subpel_variance_impl_intrin_avx2.c | 100 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_subpel_variance_impl_intrin_avx2.c |
| 88 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm | 101 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm |
| 89 VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm | 102 VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm |
| 90 | 103 |
| 91 ifeq ($(CONFIG_USE_X86INC),yes) | 104 ifeq ($(CONFIG_USE_X86INC),yes) |
| 92 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm | 105 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm |
| 93 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm | 106 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm |
| 94 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm | 107 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm |
| 95 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_sse2.c | 108 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_sse2.c |
| 96 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_variance_avx2.c | 109 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_variance_avx2.c |
| 97 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance.asm | 110 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance.asm |
| 98 endif | 111 endif |
| 99 | 112 |
| 100 ifeq ($(ARCH_X86_64),yes) | 113 ifeq ($(ARCH_X86_64),yes) |
| 101 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3.asm | 114 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3.asm |
| 102 endif | 115 endif |
| 103 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_sad_ssse3.asm | 116 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_sad_ssse3.asm |
| 104 VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_sad_sse4.asm | 117 VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_sad_sse4.asm |
| 105 VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm | 118 VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm |
| 106 | 119 |
| 107 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c | 120 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c |
| 108 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct32x32_sse2.c | 121 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct32x32_sse2.c |
| 109 | 122 |
| 110 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_dct_avx2.c | 123 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_dct_avx2.c |
| 111 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_dct32x32_avx2.c | 124 VP9_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_dct32x32_avx2.c |
| 112 | 125 |
| 113 VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes)) | 126 VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes)) |
| OLD | NEW |