diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2015-01-29 16:41:25 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-29 16:41:25 -0800 |
| commit | 3b3e299650b26ac7195852cb2d923830c754c122 (patch) | |
| tree | 013c9beada52bb5136edadf54d1673c38bed5fe6 | |
| parent | 68340a34706b4db35bbb879dacff758c0a80bd1e (diff) | |
| parent | 10d5e09c87aedad11d8bf909223191a3330721b8 (diff) | |
| download | libvpx-3b3e299650b26ac7195852cb2d923830c754c122.tar libvpx-3b3e299650b26ac7195852cb2d923830c754c122.tar.gz libvpx-3b3e299650b26ac7195852cb2d923830c754c122.tar.bz2 libvpx-3b3e299650b26ac7195852cb2d923830c754c122.zip | |
Merge "Fix issues in 32bit PIC enabled build"
| -rw-r--r-- | third_party/x86inc/x86inc.asm | 3 | ||||
| -rw-r--r-- | vp9/encoder/x86/vp9_variance_sse2.c | 28 |
2 files changed, 21 insertions, 10 deletions
diff --git a/third_party/x86inc/x86inc.asm b/third_party/x86inc/x86inc.asm index 8e75a4b19..9273fc97e 100644 --- a/third_party/x86inc/x86inc.asm +++ b/third_party/x86inc/x86inc.asm @@ -78,6 +78,9 @@ %macro SECTION_RODATA 0-1 16 %ifidn __OUTPUT_FORMAT__,macho64 SECTION .text align=%1 + %elifidn __OUTPUT_FORMAT__,macho32 + SECTION .text align=%1 + fakegot: %elifidn __OUTPUT_FORMAT__,macho SECTION .text align=%1 fakegot: diff --git a/vp9/encoder/x86/vp9_variance_sse2.c b/vp9/encoder/x86/vp9_variance_sse2.c index b4d2b0ac4..8490bbbdc 100644 --- a/vp9/encoder/x86/vp9_variance_sse2.c +++ b/vp9/encoder/x86/vp9_variance_sse2.c @@ -314,13 +314,15 @@ unsigned int vp9_mse16x16_sse2(const uint8_t *src, int src_stride, return *sse; } +// The 2 unused parameters are place holders for PIC enabled build. #define DECL(w, opt) \ int vp9_sub_pixel_variance##w##xh_##opt(const uint8_t *src, \ ptrdiff_t src_stride, \ int x_offset, int y_offset, \ const uint8_t *dst, \ ptrdiff_t dst_stride, \ - int height, unsigned int *sse) + int height, unsigned int *sse, \ + void *unused0, void *unused) #define DECLS(opt1, opt2) \ DECL(4, opt2); \ DECL(8, opt1); \ @@ -342,26 +344,26 @@ unsigned int vp9_sub_pixel_variance##w##x##h##_##opt(const uint8_t *src, \ unsigned int sse; \ int se = vp9_sub_pixel_variance##wf##xh_##opt(src, src_stride, x_offset, \ y_offset, dst, dst_stride, \ - h, &sse); \ + h, &sse, NULL, NULL); \ if (w > wf) { \ unsigned int sse2; \ int se2 = vp9_sub_pixel_variance##wf##xh_##opt(src + 16, src_stride, \ x_offset, y_offset, \ dst + 16, dst_stride, \ - h, &sse2); \ + h, &sse2, NULL, NULL); \ se += se2; \ sse += sse2; \ if (w > wf * 2) { \ se2 = vp9_sub_pixel_variance##wf##xh_##opt(src + 32, src_stride, \ x_offset, y_offset, \ dst + 32, dst_stride, \ - h, &sse2); \ + h, &sse2, NULL, NULL); \ se += se2; \ sse += sse2; \ se2 = vp9_sub_pixel_variance##wf##xh_##opt(src + 48, src_stride, \ x_offset, y_offset, \ dst + 48, dst_stride, \ - h, &sse2); \ + h, &sse2, NULL, NULL); \ se += se2; \ sse += sse2; \ } \ @@ -391,6 +393,7 @@ FNS(ssse3, ssse3); #undef FNS #undef FN +// The 2 unused parameters are place holders for PIC enabled build. #define DECL(w, opt) \ int vp9_sub_pixel_avg_variance##w##xh_##opt(const uint8_t *src, \ ptrdiff_t src_stride, \ @@ -399,7 +402,8 @@ int vp9_sub_pixel_avg_variance##w##xh_##opt(const uint8_t *src, \ ptrdiff_t dst_stride, \ const uint8_t *sec, \ ptrdiff_t sec_stride, \ - int height, unsigned int *sse) + int height, unsigned int *sse, \ + void *unused0, void *unused) #define DECLS(opt1, opt2) \ DECL(4, opt2); \ DECL(8, opt1); \ @@ -422,26 +426,30 @@ unsigned int vp9_sub_pixel_avg_variance##w##x##h##_##opt(const uint8_t *src, \ unsigned int sse; \ int se = vp9_sub_pixel_avg_variance##wf##xh_##opt(src, src_stride, x_offset, \ y_offset, dst, dst_stride, \ - sec, w, h, &sse); \ + sec, w, h, &sse, NULL, \ + NULL); \ if (w > wf) { \ unsigned int sse2; \ int se2 = vp9_sub_pixel_avg_variance##wf##xh_##opt(src + 16, src_stride, \ x_offset, y_offset, \ dst + 16, dst_stride, \ - sec + 16, w, h, &sse2); \ + sec + 16, w, h, &sse2, \ + NULL, NULL); \ se += se2; \ sse += sse2; \ if (w > wf * 2) { \ se2 = vp9_sub_pixel_avg_variance##wf##xh_##opt(src + 32, src_stride, \ x_offset, y_offset, \ dst + 32, dst_stride, \ - sec + 32, w, h, &sse2); \ + sec + 32, w, h, &sse2, \ + NULL, NULL); \ se += se2; \ sse += sse2; \ se2 = vp9_sub_pixel_avg_variance##wf##xh_##opt(src + 48, src_stride, \ x_offset, y_offset, \ dst + 48, dst_stride, \ - sec + 48, w, h, &sse2); \ + sec + 48, w, h, &sse2, \ + NULL, NULL); \ se += se2; \ sse += sse2; \ } \ |