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

Side by Side Diff: source/libvpx/vp8/decoder/onyxd_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/test/vpx_temporal_svc_encoder.sh ('k') | source/libvpx/vp8/encoder/onyx_if.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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 } 379 }
380 } 380 }
381 } 381 }
382 #endif 382 #endif
383 383
384 pbi->ready_for_new_data = 0; 384 pbi->ready_for_new_data = 0;
385 pbi->last_time_stamp = time_stamp; 385 pbi->last_time_stamp = time_stamp;
386 386
387 decode_exit: 387 decode_exit:
388 pbi->common.error.setjmp = 0; 388 pbi->common.error.setjmp = 0;
389 vp8_clear_system_state();
389 return retcode; 390 return retcode;
390 } 391 }
391 int vp8dx_get_raw_frame(VP8D_COMP *pbi, YV12_BUFFER_CONFIG *sd, int64_t *time_st amp, int64_t *time_end_stamp, vp8_ppflags_t *flags) 392 int vp8dx_get_raw_frame(VP8D_COMP *pbi, YV12_BUFFER_CONFIG *sd, int64_t *time_st amp, int64_t *time_end_stamp, vp8_ppflags_t *flags)
392 { 393 {
393 int ret = -1; 394 int ret = -1;
394 395
395 if (pbi->ready_for_new_data == 1) 396 if (pbi->ready_for_new_data == 1)
396 return ret; 397 return ret;
397 398
398 /* ie no raw frame to show!!! */ 399 /* ie no raw frame to show!!! */
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 remove_decompressor(pbi); 492 remove_decompressor(pbi);
492 } 493 }
493 else 494 else
494 { 495 {
495 /* TODO : remove frame threads and decoder instances for each 496 /* TODO : remove frame threads and decoder instances for each
496 * thread here */ 497 * thread here */
497 } 498 }
498 499
499 return VPX_CODEC_OK; 500 return VPX_CODEC_OK;
500 } 501 }
OLDNEW
« no previous file with comments | « source/libvpx/test/vpx_temporal_svc_encoder.sh ('k') | source/libvpx/vp8/encoder/onyx_if.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698