OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef MEDIA_BASE_VIDEO_FRAME_H_ | 5 #ifndef MEDIA_BASE_VIDEO_FRAME_H_ |
6 #define MEDIA_BASE_VIDEO_FRAME_H_ | 6 #define MEDIA_BASE_VIDEO_FRAME_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
258 | 258 |
259 // Returns the number of bytes per row and number of rows for a given plane. | 259 // Returns the number of bytes per row and number of rows for a given plane. |
260 // | 260 // |
261 // As opposed to stride(), row_bytes() refers to the bytes representing | 261 // As opposed to stride(), row_bytes() refers to the bytes representing |
262 // frame data scanlines (coded_size.width() pixels, without stride padding). | 262 // frame data scanlines (coded_size.width() pixels, without stride padding). |
263 int row_bytes(size_t plane) const; | 263 int row_bytes(size_t plane) const; |
264 int rows(size_t plane) const; | 264 int rows(size_t plane) const; |
265 | 265 |
266 // Returns pointer to the buffer for a given plane. The memory is owned by | 266 // Returns pointer to the buffer for a given plane. The memory is owned by |
267 // VideoFrame object and must not be freed by the caller. | 267 // VideoFrame object and must not be freed by the caller. |
268 uint8* data(size_t plane) const; | 268 const uint8* data(size_t plane) const; |
269 uint8* data(size_t plane); | |
scherkus (not reviewing)
2014/10/20 19:30:36
do we need both the const and non-const versions?
magjed_chromium
2014/10/22 15:16:39
Everything will compile and work using the old dec
| |
270 | |
271 // Returns pointer to the visible region specified by visible_rect(). The | |
272 // memory is owned by VideoFrame object and must not be freed by the caller. | |
273 const uint8* visible_data(size_t plane) const; | |
scherkus (not reviewing)
2014/10/20 19:30:36
ditto
magjed_chromium
2014/10/22 15:16:39
See above.
| |
274 uint8* visible_data(size_t plane); | |
269 | 275 |
270 // Returns the mailbox holder of the native texture wrapped by this frame. | 276 // Returns the mailbox holder of the native texture wrapped by this frame. |
271 // Only valid to call if this is a NATIVE_TEXTURE frame. Before using the | 277 // Only valid to call if this is a NATIVE_TEXTURE frame. Before using the |
272 // mailbox, the caller must wait for the included sync point. | 278 // mailbox, the caller must wait for the included sync point. |
273 const gpu::MailboxHolder* mailbox_holder() const; | 279 const gpu::MailboxHolder* mailbox_holder() const; |
274 | 280 |
275 // Returns the shared-memory handle, if present | 281 // Returns the shared-memory handle, if present |
276 base::SharedMemoryHandle shared_memory_handle() const; | 282 base::SharedMemoryHandle shared_memory_handle() const; |
277 | 283 |
278 #if defined(OS_POSIX) | 284 #if defined(OS_POSIX) |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
389 uint32 release_sync_point_; | 395 uint32 release_sync_point_; |
390 | 396 |
391 const bool end_of_stream_; | 397 const bool end_of_stream_; |
392 | 398 |
393 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoFrame); | 399 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoFrame); |
394 }; | 400 }; |
395 | 401 |
396 } // namespace media | 402 } // namespace media |
397 | 403 |
398 #endif // MEDIA_BASE_VIDEO_FRAME_H_ | 404 #endif // MEDIA_BASE_VIDEO_FRAME_H_ |
OLD | NEW |