OLD | NEW |
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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 if (cm->new_fb_idx > 0 && cm->frame_bufs[cm->new_fb_idx].ref_count > 0) | 261 if (cm->new_fb_idx > 0 && cm->frame_bufs[cm->new_fb_idx].ref_count > 0) |
262 cm->frame_bufs[cm->new_fb_idx].ref_count--; | 262 cm->frame_bufs[cm->new_fb_idx].ref_count--; |
263 | 263 |
264 return -1; | 264 return -1; |
265 } | 265 } |
266 | 266 |
267 cm->error.setjmp = 1; | 267 cm->error.setjmp = 1; |
268 | 268 |
269 vp9_decode_frame(pbi, source, source + size, psource); | 269 vp9_decode_frame(pbi, source, source + size, psource); |
270 | 270 |
271 if (!cm->show_existing_frame) | 271 swap_frame_buffers(pbi); |
272 swap_frame_buffers(pbi); | |
273 else | |
274 cm->frame_to_show = get_frame_new_buffer(cm); | |
275 | 272 |
276 vp9_clear_system_state(); | 273 vp9_clear_system_state(); |
277 | 274 |
278 cm->last_width = cm->width; | 275 cm->last_width = cm->width; |
279 cm->last_height = cm->height; | 276 cm->last_height = cm->height; |
280 | 277 |
281 if (!cm->show_existing_frame) | 278 if (!cm->show_existing_frame) |
282 cm->last_show_frame = cm->show_frame; | 279 cm->last_show_frame = cm->show_frame; |
283 if (cm->show_frame) { | 280 if (cm->show_frame) { |
284 if (!cm->show_existing_frame) | 281 if (!cm->show_existing_frame) |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 *sd = *cm->frame_to_show; | 314 *sd = *cm->frame_to_show; |
318 ret = 0; | 315 ret = 0; |
319 } | 316 } |
320 #else | 317 #else |
321 *sd = *cm->frame_to_show; | 318 *sd = *cm->frame_to_show; |
322 ret = 0; | 319 ret = 0; |
323 #endif /*!CONFIG_POSTPROC*/ | 320 #endif /*!CONFIG_POSTPROC*/ |
324 vp9_clear_system_state(); | 321 vp9_clear_system_state(); |
325 return ret; | 322 return ret; |
326 } | 323 } |
OLD | NEW |