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

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

Issue 375983002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 5 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/y4menc.c ('k') | source/libvpx/y4minput.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 * Based on code from the OggTheora software codec source code, 10 * Based on code from the OggTheora software codec source code,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 /*The amount to read directly into the converted frame buffer.*/ 51 /*The amount to read directly into the converted frame buffer.*/
52 size_t dst_buf_read_sz; 52 size_t dst_buf_read_sz;
53 /*The size of the auxilliary buffer.*/ 53 /*The size of the auxilliary buffer.*/
54 size_t aux_buf_sz; 54 size_t aux_buf_sz;
55 /*The amount to read into the auxilliary buffer.*/ 55 /*The amount to read into the auxilliary buffer.*/
56 size_t aux_buf_read_sz; 56 size_t aux_buf_read_sz;
57 y4m_convert_func convert; 57 y4m_convert_func convert;
58 unsigned char *dst_buf; 58 unsigned char *dst_buf;
59 unsigned char *aux_buf; 59 unsigned char *aux_buf;
60 enum vpx_img_fmt vpx_fmt; 60 enum vpx_img_fmt vpx_fmt;
61 int vpx_bps; 61 int bps;
62 unsigned int bit_depth;
62 }; 63 };
63 64
64 int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip, 65 int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
65 int only_420); 66 int only_420);
66 void y4m_input_close(y4m_input *_y4m); 67 void y4m_input_close(y4m_input *_y4m);
67 int y4m_input_fetch_frame(y4m_input *_y4m, FILE *_fin, vpx_image_t *img); 68 int y4m_input_fetch_frame(y4m_input *_y4m, FILE *_fin, vpx_image_t *img);
68 69
69 #ifdef __cplusplus 70 #ifdef __cplusplus
70 } // extern "C" 71 } // extern "C"
71 #endif 72 #endif
72 73
73 #endif // Y4MINPUT_H_ 74 #endif // Y4MINPUT_H_
OLDNEW
« no previous file with comments | « source/libvpx/y4menc.c ('k') | source/libvpx/y4minput.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698