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

Side by Side Diff: source/libvpx/vp8/encoder/onyx_if.c

Issue 390713002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: libvpx: Pull from upstream Created 6 years, 5 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/vp8/decoder/onyxd_if.c ('k') | source/libvpx/vp8/vp8_dx_iface.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 4868 matching lines...) Expand 10 before | Expand all | Expand 10 after
4879 YV12_BUFFER_CONFIG *force_src_buffer = NULL; 4879 YV12_BUFFER_CONFIG *force_src_buffer = NULL;
4880 4880
4881 if (!cpi) 4881 if (!cpi)
4882 return -1; 4882 return -1;
4883 4883
4884 cm = &cpi->common; 4884 cm = &cpi->common;
4885 4885
4886 if (setjmp(cpi->common.error.jmp)) 4886 if (setjmp(cpi->common.error.jmp))
4887 { 4887 {
4888 cpi->common.error.setjmp = 0; 4888 cpi->common.error.setjmp = 0;
4889 vp8_clear_system_state();
4889 return VPX_CODEC_CORRUPT_FRAME; 4890 return VPX_CODEC_CORRUPT_FRAME;
4890 } 4891 }
4891 4892
4892 cpi->common.error.setjmp = 1; 4893 cpi->common.error.setjmp = 1;
4893 4894
4894 vpx_usec_timer_start(&cmptimer); 4895 vpx_usec_timer_start(&cmptimer);
4895 4896
4896 cpi->source = NULL; 4897 cpi->source = NULL;
4897 4898
4898 #if !(CONFIG_REALTIME_ONLY) 4899 #if !(CONFIG_REALTIME_ONLY)
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
5549 } 5550 }
5550 5551
5551 return Total; 5552 return Total;
5552 } 5553 }
5553 5554
5554 5555
5555 int vp8_get_quantizer(VP8_COMP *cpi) 5556 int vp8_get_quantizer(VP8_COMP *cpi)
5556 { 5557 {
5557 return cpi->common.base_qindex; 5558 return cpi->common.base_qindex;
5558 } 5559 }
OLDNEW
« no previous file with comments | « source/libvpx/vp8/decoder/onyxd_if.c ('k') | source/libvpx/vp8/vp8_dx_iface.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698