OLD | NEW |
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 | 10 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 int width, int height, int border); | 66 int width, int height, int border); |
67 int vp8_yv12_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, | 67 int vp8_yv12_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, |
68 int width, int height, int border); | 68 int width, int height, int border); |
69 int vp8_yv12_de_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf); | 69 int vp8_yv12_de_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf); |
70 | 70 |
71 int vp9_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, | 71 int vp9_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, |
72 int width, int height, int ss_x, int ss_y, | 72 int width, int height, int ss_x, int ss_y, |
73 #if CONFIG_VP9_HIGHBITDEPTH | 73 #if CONFIG_VP9_HIGHBITDEPTH |
74 int use_highbitdepth, | 74 int use_highbitdepth, |
75 #endif | 75 #endif |
76 int border); | 76 int border, int byte_alignment); |
77 | 77 |
78 // Updates the yv12 buffer config with the frame buffer. If cb is not | 78 // Updates the yv12 buffer config with the frame buffer. |byte_alignment| must |
| 79 // be a power of 2, from 32 to 1024. 0 sets legacy alignment. If cb is not |
79 // NULL, then libvpx is using the frame buffer callbacks to handle memory. | 80 // NULL, then libvpx is using the frame buffer callbacks to handle memory. |
80 // If cb is not NULL, libvpx will call cb with minimum size in bytes needed | 81 // If cb is not NULL, libvpx will call cb with minimum size in bytes needed |
81 // to decode the current frame. If cb is NULL, libvpx will allocate memory | 82 // to decode the current frame. If cb is NULL, libvpx will allocate memory |
82 // internally to decode the current frame. Returns 0 on success. Returns < 0 | 83 // internally to decode the current frame. Returns 0 on success. Returns < 0 |
83 // on failure. | 84 // on failure. |
84 int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, | 85 int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, |
85 int width, int height, int ss_x, int ss_y, | 86 int width, int height, int ss_x, int ss_y, |
86 #if CONFIG_VP9_HIGHBITDEPTH | 87 #if CONFIG_VP9_HIGHBITDEPTH |
87 int use_highbitdepth, | 88 int use_highbitdepth, |
88 #endif | 89 #endif |
89 int border, | 90 int border, |
| 91 int byte_alignment, |
90 vpx_codec_frame_buffer_t *fb, | 92 vpx_codec_frame_buffer_t *fb, |
91 vpx_get_frame_buffer_cb_fn_t cb, | 93 vpx_get_frame_buffer_cb_fn_t cb, |
92 void *cb_priv); | 94 void *cb_priv); |
93 int vp9_free_frame_buffer(YV12_BUFFER_CONFIG *ybf); | 95 int vp9_free_frame_buffer(YV12_BUFFER_CONFIG *ybf); |
94 | 96 |
95 #ifdef __cplusplus | 97 #ifdef __cplusplus |
96 } | 98 } |
97 #endif | 99 #endif |
98 | 100 |
99 #endif // VPX_SCALE_YV12CONFIG_H_ | 101 #endif // VPX_SCALE_YV12CONFIG_H_ |
OLD | NEW |