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

Side by Side Diff: source/libvpx/vp9/encoder/vp9_resize.c

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_rdopt.c ('k') | source/libvpx/vp9/encoder/vp9_skin_detection.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 return steps; 441 return steps;
442 } 442 }
443 443
444 static void resize_multistep(const uint8_t *const input, 444 static void resize_multistep(const uint8_t *const input,
445 int length, 445 int length,
446 uint8_t *output, 446 uint8_t *output,
447 int olength, 447 int olength,
448 uint8_t *buf) { 448 uint8_t *buf) {
449 int steps; 449 int steps;
450 if (length == olength) { 450 if (length == olength) {
451 memcpy(output, input, sizeof(uint8_t) * length); 451 memcpy(output, input, sizeof(output[0]) * length);
452 return; 452 return;
453 } 453 }
454 steps = get_down2_steps(length, olength); 454 steps = get_down2_steps(length, olength);
455 455
456 if (steps > 0) { 456 if (steps > 0) {
457 int s; 457 int s;
458 uint8_t *out = NULL; 458 uint8_t *out = NULL;
459 uint8_t *tmpbuf = NULL; 459 uint8_t *tmpbuf = NULL;
460 uint8_t *otmp, *otmp2; 460 uint8_t *otmp, *otmp2;
461 int filteredlength = length; 461 int filteredlength = length;
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 } 734 }
735 735
736 static void highbd_resize_multistep(const uint16_t *const input, 736 static void highbd_resize_multistep(const uint16_t *const input,
737 int length, 737 int length,
738 uint16_t *output, 738 uint16_t *output,
739 int olength, 739 int olength,
740 uint16_t *buf, 740 uint16_t *buf,
741 int bd) { 741 int bd) {
742 int steps; 742 int steps;
743 if (length == olength) { 743 if (length == olength) {
744 memcpy(output, input, sizeof(uint16_t) * length); 744 memcpy(output, input, sizeof(output[0]) * length);
745 return; 745 return;
746 } 746 }
747 steps = get_down2_steps(length, olength); 747 steps = get_down2_steps(length, olength);
748 748
749 if (steps > 0) { 749 if (steps > 0) {
750 int s; 750 int s;
751 uint16_t *out = NULL; 751 uint16_t *out = NULL;
752 uint16_t *tmpbuf = NULL; 752 uint16_t *tmpbuf = NULL;
753 uint16_t *otmp, *otmp2; 753 uint16_t *otmp, *otmp2;
754 int filteredlength = length; 754 int filteredlength = length;
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 uint8_t *ou, uint8_t *ov, int ouv_stride, 919 uint8_t *ou, uint8_t *ov, int ouv_stride,
920 int oheight, int owidth, int bd) { 920 int oheight, int owidth, int bd) {
921 vp9_highbd_resize_plane(y, height, width, y_stride, 921 vp9_highbd_resize_plane(y, height, width, y_stride,
922 oy, oheight, owidth, oy_stride, bd); 922 oy, oheight, owidth, oy_stride, bd);
923 vp9_highbd_resize_plane(u, height, width, uv_stride, 923 vp9_highbd_resize_plane(u, height, width, uv_stride,
924 ou, oheight, owidth, ouv_stride, bd); 924 ou, oheight, owidth, ouv_stride, bd);
925 vp9_highbd_resize_plane(v, height, width, uv_stride, 925 vp9_highbd_resize_plane(v, height, width, uv_stride,
926 ov, oheight, owidth, ouv_stride, bd); 926 ov, oheight, owidth, ouv_stride, bd);
927 } 927 }
928 #endif // CONFIG_VP9_HIGHBITDEPTH 928 #endif // CONFIG_VP9_HIGHBITDEPTH
OLDNEW
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_rdopt.c ('k') | source/libvpx/vp9/encoder/vp9_skin_detection.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698