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

Side by Side Diff: source/libvpx/vpx/src/svc_encodeframe.c

Issue 290653003: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 7 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) 2013 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 static const SvcInternal *get_const_svc_internal(const SvcContext *svc_ctx) { 227 static const SvcInternal *get_const_svc_internal(const SvcContext *svc_ctx) {
228 if (svc_ctx == NULL) return NULL; 228 if (svc_ctx == NULL) return NULL;
229 return (const SvcInternal *)svc_ctx->internal; 229 return (const SvcInternal *)svc_ctx->internal;
230 } 230 }
231 231
232 static void svc_log_reset(SvcContext *svc_ctx) { 232 static void svc_log_reset(SvcContext *svc_ctx) {
233 SvcInternal *const si = (SvcInternal *)svc_ctx->internal; 233 SvcInternal *const si = (SvcInternal *)svc_ctx->internal;
234 si->message_buffer[0] = '\0'; 234 si->message_buffer[0] = '\0';
235 } 235 }
236 236
237 static int svc_log(SvcContext *svc_ctx, int level, const char *fmt, ...) { 237 static int svc_log(SvcContext *svc_ctx, SVC_LOG_LEVEL level,
238 const char *fmt, ...) {
238 char buf[512]; 239 char buf[512];
239 int retval = 0; 240 int retval = 0;
240 va_list ap; 241 va_list ap;
241 SvcInternal *const si = get_svc_internal(svc_ctx); 242 SvcInternal *const si = get_svc_internal(svc_ctx);
242 243
243 if (level > svc_ctx->log_level) { 244 if (level > svc_ctx->log_level) {
244 return retval; 245 return retval;
245 } 246 }
246 247
247 va_start(ap, fmt); 248 va_start(ap, fmt);
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 return si->rc_stats_buf_used; 1138 return si->rc_stats_buf_used;
1138 } 1139 }
1139 1140
1140 char *vpx_svc_get_rc_stats_buffer(const SvcContext *svc_ctx) { 1141 char *vpx_svc_get_rc_stats_buffer(const SvcContext *svc_ctx) {
1141 const SvcInternal *const si = get_const_svc_internal(svc_ctx); 1142 const SvcInternal *const si = get_const_svc_internal(svc_ctx);
1142 if (svc_ctx == NULL || si == NULL) return NULL; 1143 if (svc_ctx == NULL || si == NULL) return NULL;
1143 return si->rc_stats_buf; 1144 return si->rc_stats_buf;
1144 } 1145 }
1145 1146
1146 1147
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698