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

Side by Side Diff: source/libvpx/vp8/vp8_dx_iface.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/encoder/onyx_if.c ('k') | source/libvpx/vp9/common/vp9_blockd.h » ('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 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 int i; 402 int i;
403 #endif 403 #endif
404 pc->Width = ctx->si.w; 404 pc->Width = ctx->si.w;
405 pc->Height = ctx->si.h; 405 pc->Height = ctx->si.h;
406 { 406 {
407 int prev_mb_rows = pc->mb_rows; 407 int prev_mb_rows = pc->mb_rows;
408 408
409 if (setjmp(pbi->common.error.jmp)) 409 if (setjmp(pbi->common.error.jmp))
410 { 410 {
411 pbi->common.error.setjmp = 0; 411 pbi->common.error.setjmp = 0;
412 vp8_clear_system_state();
412 /* same return value as used in vp8dx_receive_compressed_dat a */ 413 /* same return value as used in vp8dx_receive_compressed_dat a */
413 return -1; 414 return -1;
414 } 415 }
415 416
416 pbi->common.error.setjmp = 1; 417 pbi->common.error.setjmp = 1;
417 418
418 if (pc->Width <= 0) 419 if (pc->Width <= 0)
419 { 420 {
420 pc->Width = w; 421 pc->Width = w;
421 vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME, 422 vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 }, 804 },
804 { /* encoder functions */ 805 { /* encoder functions */
805 NOT_IMPLEMENTED, 806 NOT_IMPLEMENTED,
806 NOT_IMPLEMENTED, 807 NOT_IMPLEMENTED,
807 NOT_IMPLEMENTED, 808 NOT_IMPLEMENTED,
808 NOT_IMPLEMENTED, 809 NOT_IMPLEMENTED,
809 NOT_IMPLEMENTED, 810 NOT_IMPLEMENTED,
810 NOT_IMPLEMENTED 811 NOT_IMPLEMENTED
811 } 812 }
812 }; 813 };
OLDNEW
« no previous file with comments | « source/libvpx/vp8/encoder/onyx_if.c ('k') | source/libvpx/vp9/common/vp9_blockd.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698