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

Side by Side Diff: ppapi/shared_impl/media_stream_buffer.h

Issue 156863005: [PPAPI][MediaStream] Rename AudioFrame to AudioBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@frame_to_buffer
Patch Set: Update Created 6 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 | « ppapi/proxy/media_stream_audio_track_resource.cc ('k') | ppapi/shared_impl/resource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_BUFFER_H_ 5 #ifndef PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_H_
6 #define PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_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_buffer.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 MediaStreamBuffer { 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 };
24 24
25 struct Audio { 25 struct Audio {
26 Header header; 26 Header header;
27 PP_TimeDelta timestamp; 27 PP_TimeDelta timestamp;
28 PP_AudioFrame_SampleRate sample_rate; 28 PP_AudioBuffer_SampleRate sample_rate;
29 uint32_t number_of_channels; 29 uint32_t number_of_channels;
30 uint32_t number_of_samples; 30 uint32_t number_of_samples;
31 uint32_t data_size; 31 uint32_t data_size;
32 // Uses 8 bytes to make sure the Audio struct has consistent size between 32 // Uses 8 bytes to make sure the Audio struct has consistent size between
33 // NaCl code and renderer code. 33 // NaCl code and renderer code.
34 uint8_t data[8]; 34 uint8_t data[8];
35 }; 35 };
36 36
37 struct Video { 37 struct Video {
38 Header header; 38 Header header;
(...skipping 14 matching lines...) Expand all
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_BUFFER_H_ 62 #endif // PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/media_stream_audio_track_resource.cc ('k') | ppapi/shared_impl/resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698