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

Side by Side Diff: source/libvpx/vpxdec.c

Issue 341293003: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vpx_scale/mips/dspr2/yv12extend_dspr2.c ('k') | source/libvpx/vpxenc.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) 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 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
866 } else { 866 } else {
867 display_width = display_size[0]; 867 display_width = display_size[0];
868 display_height = display_size[1]; 868 display_height = display_size[1];
869 } 869 }
870 } 870 }
871 scaled_img = vpx_img_alloc(NULL, VPX_IMG_FMT_I420, display_width, 871 scaled_img = vpx_img_alloc(NULL, VPX_IMG_FMT_I420, display_width,
872 display_height, 16); 872 display_height, 16);
873 } 873 }
874 874
875 if (img->d_w != scaled_img->d_w || img->d_h != scaled_img->d_h) { 875 if (img->d_w != scaled_img->d_w || img->d_h != scaled_img->d_h) {
876 #if CONFIG_LIBYUV
876 vpx_image_scale(img, scaled_img, kFilterBox); 877 vpx_image_scale(img, scaled_img, kFilterBox);
877 img = scaled_img; 878 img = scaled_img;
879 #else
880 fprintf(stderr, "Failed to scale output frame: %s.\n"
881 "Scaling is disabled in this configuration. "
882 "To enable scaling, configure with --enable-libyuv\n",
883 vpx_codec_error(&decoder));
884 return EXIT_FAILURE;
885 #endif
878 } 886 }
879 } 887 }
880 888
881 if (single_file) { 889 if (single_file) {
882 if (use_y4m) { 890 if (use_y4m) {
883 char buf[Y4M_BUFFER_SIZE] = {0}; 891 char buf[Y4M_BUFFER_SIZE] = {0};
884 size_t len = 0; 892 size_t len = 0;
885 if (frame_out == 1) { 893 if (frame_out == 1) {
886 // Y4M file header 894 // Y4M file header
887 len = y4m_write_file_header(buf, sizeof(buf), 895 len = y4m_write_file_header(buf, sizeof(buf),
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 if (arg_match(&arg, &looparg, argi)) { 997 if (arg_match(&arg, &looparg, argi)) {
990 loops = arg_parse_uint(&arg); 998 loops = arg_parse_uint(&arg);
991 break; 999 break;
992 } 1000 }
993 } 1001 }
994 free(argv); 1002 free(argv);
995 for (i = 0; !error && i < loops; i++) 1003 for (i = 0; !error && i < loops; i++)
996 error = main_loop(argc, argv_); 1004 error = main_loop(argc, argv_);
997 return error; 1005 return error;
998 } 1006 }
OLDNEW
« no previous file with comments | « source/libvpx/vpx_scale/mips/dspr2/yv12extend_dspr2.c ('k') | source/libvpx/vpxenc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698