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

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

Issue 897063002: Revert "libvpx: Pull from upstream" (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 10 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/vpxstats.c ('k') | source/libvpx/webmdec.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 WEBMDEC_H_ 10 #ifndef WEBMDEC_H_
(...skipping 10 matching lines...) Expand all
21 struct WebmInputContext { 21 struct WebmInputContext {
22 void *reader; 22 void *reader;
23 void *segment; 23 void *segment;
24 uint8_t *buffer; 24 uint8_t *buffer;
25 const void *cluster; 25 const void *cluster;
26 const void *block_entry; 26 const void *block_entry;
27 const void *block; 27 const void *block;
28 int block_frame_index; 28 int block_frame_index;
29 int video_track_index; 29 int video_track_index;
30 uint64_t timestamp_ns; 30 uint64_t timestamp_ns;
31 int is_key_frame;
32 }; 31 };
33 32
34 // Checks if the input is a WebM file. If so, initializes WebMInputContext so 33 // Checks if the input is a WebM file. If so, initializes WebMInputContext so
35 // that webm_read_frame can be called to retrieve a video frame. 34 // that webm_read_frame can be called to retrieve a video frame.
36 // Returns 1 on success and 0 on failure or input is not WebM file. 35 // Returns 1 on success and 0 on failure or input is not WebM file.
37 // TODO(vigneshv): Refactor this function into two smaller functions specific 36 // TODO(vigneshv): Refactor this function into two smaller functions specific
38 // to their task. 37 // to their task.
39 int file_is_webm(struct WebmInputContext *webm_ctx, 38 int file_is_webm(struct WebmInputContext *webm_ctx,
40 struct VpxInputContext *vpx_ctx); 39 struct VpxInputContext *vpx_ctx);
41 40
(...skipping 22 matching lines...) Expand all
64 struct VpxInputContext *vpx_ctx); 63 struct VpxInputContext *vpx_ctx);
65 64
66 // Resets the WebMInputContext. 65 // Resets the WebMInputContext.
67 void webm_free(struct WebmInputContext *webm_ctx); 66 void webm_free(struct WebmInputContext *webm_ctx);
68 67
69 #ifdef __cplusplus 68 #ifdef __cplusplus
70 } // extern "C" 69 } // extern "C"
71 #endif 70 #endif
72 71
73 #endif // WEBMDEC_H_ 72 #endif // WEBMDEC_H_
OLDNEW
« no previous file with comments | « source/libvpx/vpxstats.c ('k') | source/libvpx/webmdec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698