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

Side by Side Diff: media/mojo/interfaces/media_types.mojom

Issue 881603002: Adding an ALAC enum to AudioDecoderConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation error 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 | « media/ffmpeg/ffmpeg_common.cc ('k') | media/mojo/services/media_type_converters.cc » ('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 module mojo; 5 module mojo;
6 6
7 import "mojo/services/geometry/public/interfaces/geometry.mojom"; 7 import "mojo/services/geometry/public/interfaces/geometry.mojom";
8 8
9 // See media/base/buffering_state.h for descriptions. 9 // See media/base/buffering_state.h for descriptions.
10 // Kept in sync with media::BufferingState via static_asserts. 10 // Kept in sync with media::BufferingState via static_asserts.
(...skipping 13 matching lines...) Expand all
24 FLAC = 5, 24 FLAC = 5,
25 AMR_NB = 6, 25 AMR_NB = 6,
26 AMR_WB = 7, 26 AMR_WB = 7,
27 PCM_MULAW = 8, 27 PCM_MULAW = 8,
28 GSM_MS = 9, 28 GSM_MS = 9,
29 PCM_S16BE = 10, 29 PCM_S16BE = 10,
30 PCM_S24BE = 11, 30 PCM_S24BE = 11,
31 Opus = 12, 31 Opus = 12,
32 // EAC3 = 13, 32 // EAC3 = 13,
33 PCM_ALAW = 14, 33 PCM_ALAW = 14,
34 MAX = PCM_ALAW, 34 ALAC = 15,
35 MAX = ALAC,
35 }; 36 };
36 37
37 // See media/base/channel_layout.h for descriptions. 38 // See media/base/channel_layout.h for descriptions.
38 // Kept in sync with media::ChannelLayout via static_asserts. 39 // Kept in sync with media::ChannelLayout via static_asserts.
39 // TODO(tim): The bindings generators will always prepend the enum name, should 40 // TODO(tim): The bindings generators will always prepend the enum name, should
40 // mojom therefore allow enum values starting with numbers? 41 // mojom therefore allow enum values starting with numbers?
41 enum ChannelLayout { 42 enum ChannelLayout {
42 k_NONE = 0, 43 k_NONE = 0,
43 k_UNSUPPORTED = 1, 44 k_UNSUPPORTED = 1,
44 k_MONO = 2, 45 k_MONO = 2,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // See media/base/sample_format.h for descriptions. 78 // See media/base/sample_format.h for descriptions.
78 // Kept in sync with media::SampleFormat via static_asserts. 79 // Kept in sync with media::SampleFormat via static_asserts.
79 enum SampleFormat { 80 enum SampleFormat {
80 UNKNOWN = 0, 81 UNKNOWN = 0,
81 U8, 82 U8,
82 S16, 83 S16,
83 S32, 84 S32,
84 F32, 85 F32,
85 PlanarS16, 86 PlanarS16,
86 PlanarF32, 87 PlanarF32,
87 Max = PlanarF32, 88 PlanarS32,
89 Max = PlanarS32,
88 }; 90 };
89 91
90 // See media/base/video_frame.h for descriptions. 92 // See media/base/video_frame.h for descriptions.
91 // Kept in sync with media::VideoFrame::Format via static_asserts. 93 // Kept in sync with media::VideoFrame::Format via static_asserts.
92 enum VideoFormat { 94 enum VideoFormat {
93 UNKNOWN = 0, 95 UNKNOWN = 0,
94 YV12, 96 YV12,
95 YV16, 97 YV16,
96 I420, 98 I420,
97 YV12A, 99 YV12A,
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 // DecryptConfig for a encrypted buffer. NULL if the buffer is not encrypted. 210 // DecryptConfig for a encrypted buffer. NULL if the buffer is not encrypted.
209 DecryptConfig? decrypt_config; 211 DecryptConfig? decrypt_config;
210 212
211 // These fields indicate the amount of data to discard after decoding. 213 // These fields indicate the amount of data to discard after decoding.
212 int64 front_discard_usec; 214 int64 front_discard_usec;
213 int64 back_discard_usec; 215 int64 back_discard_usec;
214 216
215 // Indicates this buffer is part of a splice around |splice_timestamp_usec|. 217 // Indicates this buffer is part of a splice around |splice_timestamp_usec|.
216 int64 splice_timestamp_usec; 218 int64 splice_timestamp_usec;
217 }; 219 };
OLDNEW
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/mojo/services/media_type_converters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698