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 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 uint16_t *dst = CONVERT_TO_SHORTPTR(dst8); | 67 uint16_t *dst = CONVERT_TO_SHORTPTR(dst8); |
68 | 68 |
69 // copy the left and right most columns out | 69 // copy the left and right most columns out |
70 const uint16_t *src_ptr1 = src; | 70 const uint16_t *src_ptr1 = src; |
71 const uint16_t *src_ptr2 = src + w - 1; | 71 const uint16_t *src_ptr2 = src + w - 1; |
72 uint16_t *dst_ptr1 = dst - extend_left; | 72 uint16_t *dst_ptr1 = dst - extend_left; |
73 uint16_t *dst_ptr2 = dst + w; | 73 uint16_t *dst_ptr2 = dst + w; |
74 | 74 |
75 for (i = 0; i < h; i++) { | 75 for (i = 0; i < h; i++) { |
76 vpx_memset16(dst_ptr1, src_ptr1[0], extend_left); | 76 vpx_memset16(dst_ptr1, src_ptr1[0], extend_left); |
77 memcpy(dst_ptr1 + extend_left, src_ptr1, w * sizeof(uint16_t)); | 77 memcpy(dst_ptr1 + extend_left, src_ptr1, w * sizeof(src_ptr1[0])); |
78 vpx_memset16(dst_ptr2, src_ptr2[0], extend_right); | 78 vpx_memset16(dst_ptr2, src_ptr2[0], extend_right); |
79 src_ptr1 += src_pitch; | 79 src_ptr1 += src_pitch; |
80 src_ptr2 += src_pitch; | 80 src_ptr2 += src_pitch; |
81 dst_ptr1 += dst_pitch; | 81 dst_ptr1 += dst_pitch; |
82 dst_ptr2 += dst_pitch; | 82 dst_ptr2 += dst_pitch; |
83 } | 83 } |
84 | 84 |
85 // Now copy the top and bottom lines into each line of the respective | 85 // Now copy the top and bottom lines into each line of the respective |
86 // borders | 86 // borders |
87 src_ptr1 = dst - extend_left; | 87 src_ptr1 = dst - extend_left; |
88 src_ptr2 = dst + dst_pitch * (h - 1) - extend_left; | 88 src_ptr2 = dst + dst_pitch * (h - 1) - extend_left; |
89 dst_ptr1 = dst + dst_pitch * (-extend_top) - extend_left; | 89 dst_ptr1 = dst + dst_pitch * (-extend_top) - extend_left; |
90 dst_ptr2 = dst + dst_pitch * (h) - extend_left; | 90 dst_ptr2 = dst + dst_pitch * (h) - extend_left; |
91 linesize = extend_left + extend_right + w; | 91 linesize = extend_left + extend_right + w; |
92 | 92 |
93 for (i = 0; i < extend_top; i++) { | 93 for (i = 0; i < extend_top; i++) { |
94 memcpy(dst_ptr1, src_ptr1, linesize * sizeof(uint16_t)); | 94 memcpy(dst_ptr1, src_ptr1, linesize * sizeof(src_ptr1[0])); |
95 dst_ptr1 += dst_pitch; | 95 dst_ptr1 += dst_pitch; |
96 } | 96 } |
97 | 97 |
98 for (i = 0; i < extend_bottom; i++) { | 98 for (i = 0; i < extend_bottom; i++) { |
99 memcpy(dst_ptr2, src_ptr2, linesize * sizeof(uint16_t)); | 99 memcpy(dst_ptr2, src_ptr2, linesize * sizeof(src_ptr2[0])); |
100 dst_ptr2 += dst_pitch; | 100 dst_ptr2 += dst_pitch; |
101 } | 101 } |
102 } | 102 } |
103 #endif // CONFIG_VP9_HIGHBITDEPTH | 103 #endif // CONFIG_VP9_HIGHBITDEPTH |
104 | 104 |
105 void vp9_copy_and_extend_frame(const YV12_BUFFER_CONFIG *src, | 105 void vp9_copy_and_extend_frame(const YV12_BUFFER_CONFIG *src, |
106 YV12_BUFFER_CONFIG *dst) { | 106 YV12_BUFFER_CONFIG *dst) { |
107 // Extend src frame in buffer | 107 // Extend src frame in buffer |
108 // Altref filtering assumes 16 pixel extension | 108 // Altref filtering assumes 16 pixel extension |
109 const int et_y = 16; | 109 const int et_y = 16; |
110 const int el_y = 16; | 110 const int el_y = 16; |
111 // Motion estimation may use src block variance with the block size up | 111 // Motion estimation may use src block variance with the block size up |
112 // to 64x64, so the right and bottom need to be extended to 64 multiple | 112 // to 64x64, so the right and bottom need to be extended to 64 multiple |
113 // or up to 16, whichever is greater. | 113 // or up to 16, whichever is greater. |
114 const int er_y = MAX(src->y_width + 16, ALIGN_POWER_OF_TWO(src->y_width, 6)) | 114 const int er_y = |
115 - src->y_crop_width; | 115 VPXMAX(src->y_width + 16, ALIGN_POWER_OF_TWO(src->y_width, 6)) - |
116 const int eb_y = MAX(src->y_height + 16, ALIGN_POWER_OF_TWO(src->y_height, 6)) | 116 src->y_crop_width; |
117 - src->y_crop_height; | 117 const int eb_y = |
| 118 VPXMAX(src->y_height + 16, ALIGN_POWER_OF_TWO(src->y_height, 6)) - |
| 119 src->y_crop_height; |
118 const int uv_width_subsampling = (src->uv_width != src->y_width); | 120 const int uv_width_subsampling = (src->uv_width != src->y_width); |
119 const int uv_height_subsampling = (src->uv_height != src->y_height); | 121 const int uv_height_subsampling = (src->uv_height != src->y_height); |
120 const int et_uv = et_y >> uv_height_subsampling; | 122 const int et_uv = et_y >> uv_height_subsampling; |
121 const int el_uv = el_y >> uv_width_subsampling; | 123 const int el_uv = el_y >> uv_width_subsampling; |
122 const int eb_uv = eb_y >> uv_height_subsampling; | 124 const int eb_uv = eb_y >> uv_height_subsampling; |
123 const int er_uv = er_y >> uv_width_subsampling; | 125 const int er_uv = er_y >> uv_width_subsampling; |
124 | 126 |
125 #if CONFIG_VP9_HIGHBITDEPTH | 127 #if CONFIG_VP9_HIGHBITDEPTH |
126 if (src->flags & YV12_FLAG_HIGHBITDEPTH) { | 128 if (src->flags & YV12_FLAG_HIGHBITDEPTH) { |
127 highbd_copy_and_extend_plane(src->y_buffer, src->y_stride, | 129 highbd_copy_and_extend_plane(src->y_buffer, src->y_stride, |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 copy_and_extend_plane(src->u_buffer + src_uv_offset, src->uv_stride, | 191 copy_and_extend_plane(src->u_buffer + src_uv_offset, src->uv_stride, |
190 dst->u_buffer + dst_uv_offset, dst->uv_stride, | 192 dst->u_buffer + dst_uv_offset, dst->uv_stride, |
191 srcw_uv, srch_uv, | 193 srcw_uv, srch_uv, |
192 et_uv, el_uv, eb_uv, er_uv); | 194 et_uv, el_uv, eb_uv, er_uv); |
193 | 195 |
194 copy_and_extend_plane(src->v_buffer + src_uv_offset, src->uv_stride, | 196 copy_and_extend_plane(src->v_buffer + src_uv_offset, src->uv_stride, |
195 dst->v_buffer + dst_uv_offset, dst->uv_stride, | 197 dst->v_buffer + dst_uv_offset, dst->uv_stride, |
196 srcw_uv, srch_uv, | 198 srcw_uv, srch_uv, |
197 et_uv, el_uv, eb_uv, er_uv); | 199 et_uv, el_uv, eb_uv, er_uv); |
198 } | 200 } |
OLD | NEW |