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

Side by Side Diff: media/base/audio_decoder_config.h

Issue 11416367: Add Opus decode wrapper to media. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on updates to webkit/media/filter_helpers.cc Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « media/DEPS ('k') | media/base/media_switches.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 (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_AUDIO_DECODER_CONFIG_H_ 5 #ifndef MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
6 #define MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ 6 #define MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "media/base/channel_layout.h" 10 #include "media/base/channel_layout.h"
11 #include "media/base/media_export.h" 11 #include "media/base/media_export.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 enum AudioCodec { 15 enum AudioCodec {
16 // These values are histogrammed over time; do not change their ordinal 16 // These values are histogrammed over time; do not change their ordinal
17 // values. When deleting a codec replace it with a dummy value; when adding a 17 // values. When deleting a codec replace it with a dummy value; when adding a
18 // codec, do so at the bottom (and update kAudioCodecMax). 18 // codec, do so at the bottom (and update kAudioCodecMax).
19 kUnknownAudioCodec = 0, 19 kUnknownAudioCodec = 0,
20 kCodecAAC, 20 kCodecAAC,
21 kCodecMP3, 21 kCodecMP3,
22 kCodecPCM, 22 kCodecPCM,
23 kCodecVorbis, 23 kCodecVorbis,
24 // ChromiumOS and ChromeOS specific codecs.
25 kCodecFLAC, 24 kCodecFLAC,
26 // ChromeOS specific codecs.
27 kCodecAMR_NB, 25 kCodecAMR_NB,
28 kCodecAMR_WB, 26 kCodecAMR_WB,
29 kCodecPCM_MULAW, 27 kCodecPCM_MULAW,
30 kCodecGSM_MS, 28 kCodecGSM_MS,
31 kCodecPCM_S16BE, 29 kCodecPCM_S16BE,
32 kCodecPCM_S24BE, 30 kCodecPCM_S24BE,
31 kCodecOpus,
33 // DO NOT ADD RANDOM AUDIO CODECS! 32 // DO NOT ADD RANDOM AUDIO CODECS!
34 // 33 //
35 // The only acceptable time to add a new codec is if there is production code 34 // The only acceptable time to add a new codec is if there is production code
36 // that uses said codec in the same CL. 35 // that uses said codec in the same CL.
37 36
38 kAudioCodecMax = kCodecPCM_S24BE // Must equal the last "real" codec above. 37 kAudioCodecMax = kCodecOpus // Must equal the last "real" codec above.
39 }; 38 };
40 39
41 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of 40 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of
42 // |bits_per_channel|, we should switch over since bits are generally confusing 41 // |bits_per_channel|, we should switch over since bits are generally confusing
43 // to work with. 42 // to work with.
44 class MEDIA_EXPORT AudioDecoderConfig { 43 class MEDIA_EXPORT AudioDecoderConfig {
45 public: 44 public:
46 // Constructs an uninitialized object. Clients should call Initialize() with 45 // Constructs an uninitialized object. Clients should call Initialize() with
47 // appropriate values before using. 46 // appropriate values before using.
48 AudioDecoderConfig(); 47 AudioDecoderConfig();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 size_t extra_data_size_; 100 size_t extra_data_size_;
102 101
103 bool is_encrypted_; 102 bool is_encrypted_;
104 103
105 DISALLOW_COPY_AND_ASSIGN(AudioDecoderConfig); 104 DISALLOW_COPY_AND_ASSIGN(AudioDecoderConfig);
106 }; 105 };
107 106
108 } // namespace media 107 } // namespace media
109 108
110 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ 109 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
OLDNEW
« no previous file with comments | « media/DEPS ('k') | media/base/media_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698