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

Side by Side Diff: source/libvpx/tools_common.h

Issue 1169543007: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « source/libvpx/test/vpxenc.sh ('k') | source/libvpx/vp8/common/rtcd_defs.pl » ('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 #ifndef TOOLS_COMMON_H_ 10 #ifndef TOOLS_COMMON_H_
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 }; 82 };
83 83
84 struct VpxInputContext { 84 struct VpxInputContext {
85 const char *filename; 85 const char *filename;
86 FILE *file; 86 FILE *file;
87 int64_t length; 87 int64_t length;
88 struct FileTypeDetectionBuffer detect; 88 struct FileTypeDetectionBuffer detect;
89 enum VideoFileType file_type; 89 enum VideoFileType file_type;
90 uint32_t width; 90 uint32_t width;
91 uint32_t height; 91 uint32_t height;
92 struct VpxRational pixel_aspect_ratio;
92 vpx_img_fmt_t fmt; 93 vpx_img_fmt_t fmt;
93 vpx_bit_depth_t bit_depth; 94 vpx_bit_depth_t bit_depth;
94 int only_i420; 95 int only_i420;
95 uint32_t fourcc; 96 uint32_t fourcc;
96 struct VpxRational framerate; 97 struct VpxRational framerate;
97 #if CONFIG_ENCODERS 98 #if CONFIG_ENCODERS
98 y4m_input y4m; 99 y4m_input y4m;
99 #endif 100 #endif
100 }; 101 };
101 102
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 void vpx_img_upshift(vpx_image_t *dst, vpx_image_t *src, int input_shift); 154 void vpx_img_upshift(vpx_image_t *dst, vpx_image_t *src, int input_shift);
154 void vpx_img_downshift(vpx_image_t *dst, vpx_image_t *src, int down_shift); 155 void vpx_img_downshift(vpx_image_t *dst, vpx_image_t *src, int down_shift);
155 void vpx_img_truncate_16_to_8(vpx_image_t *dst, vpx_image_t *src); 156 void vpx_img_truncate_16_to_8(vpx_image_t *dst, vpx_image_t *src);
156 #endif 157 #endif
157 158
158 #ifdef __cplusplus 159 #ifdef __cplusplus
159 } /* extern "C" */ 160 } /* extern "C" */
160 #endif 161 #endif
161 162
162 #endif // TOOLS_COMMON_H_ 163 #endif // TOOLS_COMMON_H_
OLDNEW
« no previous file with comments | « source/libvpx/test/vpxenc.sh ('k') | source/libvpx/vp8/common/rtcd_defs.pl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698