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

Side by Side Diff: source/libvpx/webmenc.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/vpxenc.c ('k') | source/libvpx/webmenc.cc » ('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) 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 #ifndef WEBMENC_H_ 10 #ifndef WEBMENC_H_
(...skipping 24 matching lines...) Expand all
35 STEREO_FORMAT_LEFT_RIGHT = 1, 35 STEREO_FORMAT_LEFT_RIGHT = 1,
36 STEREO_FORMAT_BOTTOM_TOP = 2, 36 STEREO_FORMAT_BOTTOM_TOP = 2,
37 STEREO_FORMAT_TOP_BOTTOM = 3, 37 STEREO_FORMAT_TOP_BOTTOM = 3,
38 STEREO_FORMAT_RIGHT_LEFT = 11 38 STEREO_FORMAT_RIGHT_LEFT = 11
39 } stereo_format_t; 39 } stereo_format_t;
40 40
41 void write_webm_file_header(struct EbmlGlobal *glob, 41 void write_webm_file_header(struct EbmlGlobal *glob,
42 const vpx_codec_enc_cfg_t *cfg, 42 const vpx_codec_enc_cfg_t *cfg,
43 const struct vpx_rational *fps, 43 const struct vpx_rational *fps,
44 stereo_format_t stereo_fmt, 44 stereo_format_t stereo_fmt,
45 unsigned int fourcc); 45 unsigned int fourcc,
46 const struct VpxRational *par);
46 47
47 void write_webm_block(struct EbmlGlobal *glob, 48 void write_webm_block(struct EbmlGlobal *glob,
48 const vpx_codec_enc_cfg_t *cfg, 49 const vpx_codec_enc_cfg_t *cfg,
49 const vpx_codec_cx_pkt_t *pkt); 50 const vpx_codec_cx_pkt_t *pkt);
50 51
51 void write_webm_file_footer(struct EbmlGlobal *glob); 52 void write_webm_file_footer(struct EbmlGlobal *glob);
52 53
53 #ifdef __cplusplus 54 #ifdef __cplusplus
54 } // extern "C" 55 } // extern "C"
55 #endif 56 #endif
56 57
57 #endif // WEBMENC_H_ 58 #endif // WEBMENC_H_
OLDNEW
« no previous file with comments | « source/libvpx/vpxenc.c ('k') | source/libvpx/webmenc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698