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

Side by Side Diff: source/libvpx/vpx/vpx_frame_buffer.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/vp9/vp9dx.mk ('k') | source/libvpx/vpxenc.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) 2014 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2014 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
11 #ifndef VPX_VPX_FRAME_BUFFER_H_ 11 #ifndef VPX_VPX_FRAME_BUFFER_H_
12 #define VPX_VPX_FRAME_BUFFER_H_ 12 #define VPX_VPX_FRAME_BUFFER_H_
13 13
14 /*!\file 14 /*!\file
15 * \brief Describes the decoder external frame buffer interface. 15 * \brief Describes the decoder external frame buffer interface.
16 */ 16 */
17 17
18 #ifdef __cplusplus 18 #ifdef __cplusplus
19 extern "C" { 19 extern "C" {
20 #endif 20 #endif
21 21
22 #include "./vpx_integer.h" 22 #include "./vpx_integer.h"
23 23
24 /*!\brief The maximum number of work buffers used by libvpx. 24 /*!\brief The maximum number of work buffers used by libvpx.
25 * Support maximum 4 threads to decode video in parallel.
26 * Each thread will use one work buffer.
27 * TODO(hkuang): Add support to set number of worker threads dynamically.
28 */ 25 */
29 #define VPX_MAXIMUM_WORK_BUFFERS 8 26 #define VPX_MAXIMUM_WORK_BUFFERS 1
30 27
31 /*!\brief The maximum number of reference buffers that a VP9 encoder may use. 28 /*!\brief The maximum number of reference buffers that a VP9 encoder may use.
32 */ 29 */
33 #define VP9_MAXIMUM_REF_BUFFERS 8 30 #define VP9_MAXIMUM_REF_BUFFERS 8
34 31
35 /*!\brief External frame buffer 32 /*!\brief External frame buffer
36 * 33 *
37 * This structure holds allocated frame buffers used by the decoder. 34 * This structure holds allocated frame buffers used by the decoder.
38 */ 35 */
39 typedef struct vpx_codec_frame_buffer { 36 typedef struct vpx_codec_frame_buffer {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 * \param[in] fb Pointer to vpx_codec_frame_buffer_t 71 * \param[in] fb Pointer to vpx_codec_frame_buffer_t
75 */ 72 */
76 typedef int (*vpx_release_frame_buffer_cb_fn_t)( 73 typedef int (*vpx_release_frame_buffer_cb_fn_t)(
77 void *priv, vpx_codec_frame_buffer_t *fb); 74 void *priv, vpx_codec_frame_buffer_t *fb);
78 75
79 #ifdef __cplusplus 76 #ifdef __cplusplus
80 } // extern "C" 77 } // extern "C"
81 #endif 78 #endif
82 79
83 #endif // VPX_VPX_FRAME_BUFFER_H_ 80 #endif // VPX_VPX_FRAME_BUFFER_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp9/vp9dx.mk ('k') | source/libvpx/vpxenc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698