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

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

Issue 415333002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 4 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/vp9/encoder/vp9_speed_features.c ('k') | source/libvpx/vp9/vp9_cx_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) 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 ++lc->current_video_frame_in_layer; 216 ++lc->current_video_frame_in_layer;
217 } 217 }
218 218
219 int vp9_is_upper_layer_key_frame(const VP9_COMP *const cpi) { 219 int vp9_is_upper_layer_key_frame(const VP9_COMP *const cpi) {
220 return cpi->use_svc && 220 return cpi->use_svc &&
221 cpi->svc.number_temporal_layers == 1 && 221 cpi->svc.number_temporal_layers == 1 &&
222 cpi->svc.spatial_layer_id > 0 && 222 cpi->svc.spatial_layer_id > 0 &&
223 cpi->svc.layer_context[cpi->svc.spatial_layer_id].is_key_frame; 223 cpi->svc.layer_context[cpi->svc.spatial_layer_id].is_key_frame;
224 } 224 }
225 225
226 #if CONFIG_SPATIAL_SVC
226 int vp9_svc_lookahead_push(const VP9_COMP *const cpi, struct lookahead_ctx *ctx, 227 int vp9_svc_lookahead_push(const VP9_COMP *const cpi, struct lookahead_ctx *ctx,
227 YV12_BUFFER_CONFIG *src, int64_t ts_start, 228 YV12_BUFFER_CONFIG *src, int64_t ts_start,
228 int64_t ts_end, unsigned int flags) { 229 int64_t ts_end, unsigned int flags) {
229 struct lookahead_entry *buf; 230 struct lookahead_entry *buf;
230 int i, index; 231 int i, index;
231 232
232 if (vp9_lookahead_push(ctx, src, ts_start, ts_end, flags)) 233 if (vp9_lookahead_push(ctx, src, ts_start, ts_end, flags))
233 return 1; 234 return 1;
234 235
235 index = ctx->write_idx - 1; 236 index = ctx->write_idx - 1;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 // spatial_layer to -1 for lower layers. 346 // spatial_layer to -1 for lower layers.
346 buf->svc_params[cpi->svc.spatial_layer_id].spatial_layer = -1; 347 buf->svc_params[cpi->svc.spatial_layer_id].spatial_layer = -1;
347 if (cpi->svc.spatial_layer_id == cpi->svc.number_spatial_layers - 1) { 348 if (cpi->svc.spatial_layer_id == cpi->svc.number_spatial_layers - 1) {
348 vp9_lookahead_pop(ctx, drain); 349 vp9_lookahead_pop(ctx, drain);
349 } 350 }
350 } 351 }
351 } 352 }
352 353
353 return buf; 354 return buf;
354 } 355 }
356 #endif
OLDNEW
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_speed_features.c ('k') | source/libvpx/vp9/vp9_cx_iface.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698