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

Side by Side Diff: source/libvpx/vp9/encoder/vp9_encoder.h

Issue 592203002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 3 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_encodemv.c ('k') | source/libvpx/vp9/encoder/vp9_encoder.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) 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 210
211 vpx_fixed_buf_t two_pass_stats_in; 211 vpx_fixed_buf_t two_pass_stats_in;
212 struct vpx_codec_pkt_list *output_pkt_list; 212 struct vpx_codec_pkt_list *output_pkt_list;
213 213
214 #if CONFIG_FP_MB_STATS 214 #if CONFIG_FP_MB_STATS
215 vpx_fixed_buf_t firstpass_mb_stats_in; 215 vpx_fixed_buf_t firstpass_mb_stats_in;
216 #endif 216 #endif
217 217
218 vp8e_tuning tuning; 218 vp8e_tuning tuning;
219 vp9e_tune_content content; 219 vp9e_tune_content content;
220 #if CONFIG_VP9_HIGHBITDEPTH
221 int use_highbitdepth;
222 #endif
220 } VP9EncoderConfig; 223 } VP9EncoderConfig;
221 224
222 static INLINE int is_lossless_requested(const VP9EncoderConfig *cfg) { 225 static INLINE int is_lossless_requested(const VP9EncoderConfig *cfg) {
223 return cfg->best_allowed_q == 0 && cfg->worst_allowed_q == 0; 226 return cfg->best_allowed_q == 0 && cfg->worst_allowed_q == 0;
224 } 227 }
225 228
226 typedef struct VP9_COMP { 229 typedef struct VP9_COMP {
227 QUANTS quants; 230 QUANTS quants;
228 MACROBLOCK mb; 231 MACROBLOCK mb;
229 VP9_COMMON common; 232 VP9_COMMON common;
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 527
525 static INLINE int *cond_sad_list(const struct VP9_COMP *cpi, int *sad_list) { 528 static INLINE int *cond_sad_list(const struct VP9_COMP *cpi, int *sad_list) {
526 return cpi->sf.mv.subpel_search_method != SUBPEL_TREE ? sad_list : NULL; 529 return cpi->sf.mv.subpel_search_method != SUBPEL_TREE ? sad_list : NULL;
527 } 530 }
528 531
529 #ifdef __cplusplus 532 #ifdef __cplusplus
530 } // extern "C" 533 } // extern "C"
531 #endif 534 #endif
532 535
533 #endif // VP9_ENCODER_VP9_ENCODER_H_ 536 #endif // VP9_ENCODER_VP9_ENCODER_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_encodemv.c ('k') | source/libvpx/vp9/encoder/vp9_encoder.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698