Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(937)

Side by Side Diff: source/libvpx/vp9/common/mips/dspr2/vp9_convolve8_avg_dspr2.c

Issue 1124333011: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: only update to last nights LKGR Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 } 406 }
407 } 407 }
408 } 408 }
409 409
410 void vp9_convolve8_avg_dspr2(const uint8_t *src, ptrdiff_t src_stride, 410 void vp9_convolve8_avg_dspr2(const uint8_t *src, ptrdiff_t src_stride,
411 uint8_t *dst, ptrdiff_t dst_stride, 411 uint8_t *dst, ptrdiff_t dst_stride,
412 const int16_t *filter_x, int x_step_q4, 412 const int16_t *filter_x, int x_step_q4,
413 const int16_t *filter_y, int y_step_q4, 413 const int16_t *filter_y, int y_step_q4,
414 int w, int h) { 414 int w, int h) {
415 /* Fixed size intermediate buffer places limits on parameters. */ 415 /* Fixed size intermediate buffer places limits on parameters. */
416 DECLARE_ALIGNED_ARRAY(32, uint8_t, temp, 64 * 135); 416 DECLARE_ALIGNED(32, uint8_t, temp[64 * 135]);
417 int32_t intermediate_height = ((h * y_step_q4) >> 4) + 7; 417 int32_t intermediate_height = ((h * y_step_q4) >> 4) + 7;
418 418
419 assert(w <= 64); 419 assert(w <= 64);
420 assert(h <= 64); 420 assert(h <= 64);
421 421
422 if (intermediate_height < h) 422 if (intermediate_height < h)
423 intermediate_height = h; 423 intermediate_height = h;
424 424
425 if (x_step_q4 != 16 || y_step_q4 != 16) 425 if (x_step_q4 != 16 || y_step_q4 != 16)
426 return vp9_convolve8_avg_c(src, src_stride, 426 return vp9_convolve8_avg_c(src, src_stride,
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 dst[x] = (dst[x] + src[x] + 1) >> 1; 686 dst[x] = (dst[x] + src[x] + 1) >> 1;
687 } 687 }
688 688
689 src += src_stride; 689 src += src_stride;
690 dst += dst_stride; 690 dst += dst_stride;
691 } 691 }
692 break; 692 break;
693 } 693 }
694 } 694 }
695 #endif 695 #endif
OLDNEW
« no previous file with comments | « source/libvpx/vp9/common/arm/neon/vp9_convolve_neon.c ('k') | source/libvpx/vp9/common/mips/dspr2/vp9_convolve8_dspr2.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698