| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 PPAPI_SHARED_IMPL_MEDIA_STREAM_FRAME_H_ | 5 #ifndef PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_H_ |
| 6 #define PPAPI_SHARED_IMPL_MEDIA_STREAM_FRAME_H_ | 6 #define PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_H_ |
| 7 | 7 |
| 8 #include "ppapi/c/ppb_audio_frame.h" | 8 #include "ppapi/c/ppb_audio_frame.h" |
| 9 #include "ppapi/c/ppb_video_frame.h" | 9 #include "ppapi/c/ppb_video_frame.h" |
| 10 | 10 |
| 11 namespace ppapi { | 11 namespace ppapi { |
| 12 | 12 |
| 13 union MediaStreamFrame { | 13 union MediaStreamBuffer { |
| 14 enum Type { | 14 enum Type { |
| 15 TYPE_UNKNOWN = 0, | 15 TYPE_UNKNOWN = 0, |
| 16 TYPE_AUDIO = 1, | 16 TYPE_AUDIO = 1, |
| 17 TYPE_VIDEO = 2, | 17 TYPE_VIDEO = 2, |
| 18 }; | 18 }; |
| 19 | 19 |
| 20 struct Header { | 20 struct Header { |
| 21 Type type; | 21 Type type; |
| 22 uint32_t size; | 22 uint32_t size; |
| 23 }; | 23 }; |
| (...skipping 28 matching lines...) Expand all Loading... |
| 52 PP_COMPILE_ASSERT_SIZE_IN_BYTES(Audio, 40); | 52 PP_COMPILE_ASSERT_SIZE_IN_BYTES(Audio, 40); |
| 53 PP_COMPILE_ASSERT_SIZE_IN_BYTES(Video, 40); | 53 PP_COMPILE_ASSERT_SIZE_IN_BYTES(Video, 40); |
| 54 | 54 |
| 55 Header header; | 55 Header header; |
| 56 Video video; | 56 Video video; |
| 57 Audio audio; | 57 Audio audio; |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 } // namespace ppapi | 60 } // namespace ppapi |
| 61 | 61 |
| 62 #endif // PPAPI_SHARED_IMPL_MEDIA_STREAM_FRAME_H_ | 62 #endif // PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_H_ |
| OLD | NEW |