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

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

Issue 1019863002: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 9 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_rd.c ('k') | source/libvpx/vp9/encoder/x86/vp9_avg_intrin_sse2.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 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 int in_stride, 509 int in_stride,
510 uint8_t *output, 510 uint8_t *output,
511 int height2, 511 int height2,
512 int width2, 512 int width2,
513 int out_stride) { 513 int out_stride) {
514 int i; 514 int i;
515 uint8_t *intbuf = (uint8_t *)malloc(sizeof(uint8_t) * width2 * height); 515 uint8_t *intbuf = (uint8_t *)malloc(sizeof(uint8_t) * width2 * height);
516 uint8_t *tmpbuf = (uint8_t *)malloc(sizeof(uint8_t) * 516 uint8_t *tmpbuf = (uint8_t *)malloc(sizeof(uint8_t) *
517 (width < height ? height : width)); 517 (width < height ? height : width));
518 uint8_t *arrbuf = (uint8_t *)malloc(sizeof(uint8_t) * (height + height2)); 518 uint8_t *arrbuf = (uint8_t *)malloc(sizeof(uint8_t) * (height + height2));
519 assert(width > 0);
520 assert(height > 0);
521 assert(width2 > 0);
522 assert(height2 > 0);
519 for (i = 0; i < height; ++i) 523 for (i = 0; i < height; ++i)
520 resize_multistep(input + in_stride * i, width, 524 resize_multistep(input + in_stride * i, width,
521 intbuf + width2 * i, width2, tmpbuf); 525 intbuf + width2 * i, width2, tmpbuf);
522 for (i = 0; i < width2; ++i) { 526 for (i = 0; i < width2; ++i) {
523 fill_col_to_arr(intbuf + i, width2, height, arrbuf); 527 fill_col_to_arr(intbuf + i, width2, height, arrbuf);
524 resize_multistep(arrbuf, height, arrbuf + height, height2, tmpbuf); 528 resize_multistep(arrbuf, height, arrbuf + height, height2, tmpbuf);
525 fill_arr_to_col(output + i, out_stride, height2, arrbuf + height); 529 fill_arr_to_col(output + i, out_stride, height2, arrbuf + height);
526 } 530 }
527 free(intbuf); 531 free(intbuf);
528 free(tmpbuf); 532 free(tmpbuf);
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 uint8_t *ou, uint8_t *ov, int ouv_stride, 915 uint8_t *ou, uint8_t *ov, int ouv_stride,
912 int oheight, int owidth, int bd) { 916 int oheight, int owidth, int bd) {
913 vp9_highbd_resize_plane(y, height, width, y_stride, 917 vp9_highbd_resize_plane(y, height, width, y_stride,
914 oy, oheight, owidth, oy_stride, bd); 918 oy, oheight, owidth, oy_stride, bd);
915 vp9_highbd_resize_plane(u, height, width, uv_stride, 919 vp9_highbd_resize_plane(u, height, width, uv_stride,
916 ou, oheight, owidth, ouv_stride, bd); 920 ou, oheight, owidth, ouv_stride, bd);
917 vp9_highbd_resize_plane(v, height, width, uv_stride, 921 vp9_highbd_resize_plane(v, height, width, uv_stride,
918 ov, oheight, owidth, ouv_stride, bd); 922 ov, oheight, owidth, ouv_stride, bd);
919 } 923 }
920 #endif // CONFIG_VP9_HIGHBITDEPTH 924 #endif // CONFIG_VP9_HIGHBITDEPTH
OLDNEW
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_rd.c ('k') | source/libvpx/vp9/encoder/x86/vp9_avg_intrin_sse2.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698