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

Unified Diff: source/libvpx/vpx/src/svc_encodeframe.c

Issue 478033002: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/vpx/internal/vpx_codec_internal.h ('k') | source/libvpx/vpx/src/vpx_codec.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vpx/src/svc_encodeframe.c
===================================================================
--- source/libvpx/vpx/src/svc_encodeframe.c (revision 290053)
+++ source/libvpx/vpx/src/svc_encodeframe.c (working copy)
@@ -510,8 +510,10 @@
}
}
+#if CONFIG_SPATIAL_SVC
for (i = 0; i < si->layers; ++i)
enc_cfg->ss_enable_auto_alt_ref[i] = si->enable_auto_alt_ref[i];
+#endif
// modify encoder configuration
enc_cfg->ss_number_layers = si->layers;
@@ -709,12 +711,14 @@
si->rc_stats_buf_used += cx_pkt->data.twopass_stats.sz;
break;
}
+#if CONFIG_SPATIAL_SVC
case VPX_CODEC_SPATIAL_SVC_LAYER_SIZES: {
int i;
for (i = 0; i < si->layers; ++i)
si->bytes_sum[i] += cx_pkt->data.layer_sizes[i];
break;
}
+#endif
default: {
break;
}
« no previous file with comments | « source/libvpx/vpx/internal/vpx_codec_internal.h ('k') | source/libvpx/vpx/src/vpx_codec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698