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

Side by Side Diff: source/libvpx/vp9/encoder/vp9_svc_layercontext.c

Issue 812033011: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 5 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 21 matching lines...) Expand all
32 layer_end = svc->number_spatial_layers; 32 layer_end = svc->number_spatial_layers;
33 33
34 if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2) { 34 if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2) {
35 if (vp9_realloc_frame_buffer(&cpi->svc.empty_frame.img, 35 if (vp9_realloc_frame_buffer(&cpi->svc.empty_frame.img,
36 cpi->common.width, cpi->common.height, 36 cpi->common.width, cpi->common.height,
37 cpi->common.subsampling_x, 37 cpi->common.subsampling_x,
38 cpi->common.subsampling_y, 38 cpi->common.subsampling_y,
39 #if CONFIG_VP9_HIGHBITDEPTH 39 #if CONFIG_VP9_HIGHBITDEPTH
40 cpi->common.use_highbitdepth, 40 cpi->common.use_highbitdepth,
41 #endif 41 #endif
42 VP9_ENC_BORDER_IN_PIXELS, NULL, NULL, NULL)) 42 VP9_ENC_BORDER_IN_PIXELS,
43 cpi->common.byte_alignment,
44 NULL, NULL, NULL))
43 vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR, 45 vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
44 "Failed to allocate empty frame for multiple frame " 46 "Failed to allocate empty frame for multiple frame "
45 "contexts"); 47 "contexts");
46 48
47 vpx_memset(cpi->svc.empty_frame.img.buffer_alloc, 0x80, 49 vpx_memset(cpi->svc.empty_frame.img.buffer_alloc, 0x80,
48 cpi->svc.empty_frame.img.buffer_alloc_sz); 50 cpi->svc.empty_frame.img.buffer_alloc_sz);
49 cpi->svc.empty_frame_width = cpi->common.width; 51 cpi->svc.empty_frame_width = cpi->common.width;
50 cpi->svc.empty_frame_height = cpi->common.height; 52 cpi->svc.empty_frame_height = cpi->common.height;
51 } 53 }
52 } 54 }
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 // Only remove the buffer when pop the highest layer. 400 // Only remove the buffer when pop the highest layer.
399 if (cpi->svc.spatial_layer_id == cpi->svc.number_spatial_layers - 1) { 401 if (cpi->svc.spatial_layer_id == cpi->svc.number_spatial_layers - 1) {
400 vp9_lookahead_pop(ctx, drain); 402 vp9_lookahead_pop(ctx, drain);
401 } 403 }
402 } 404 }
403 } 405 }
404 406
405 return buf; 407 return buf;
406 } 408 }
407 #endif 409 #endif
OLDNEW
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_speed_features.c ('k') | source/libvpx/vp9/encoder/vp9_temporal_filter.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698