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

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: Rebased (changed machines) Address most comments. Added TODO for Opus buffering question. 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
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"
(...skipping 12 matching lines...) Expand all
23 kCodecVorbis, 23 kCodecVorbis,
24 // ChromiumOS and ChromeOS specific codecs. 24 // ChromiumOS and ChromeOS specific codecs.
25 kCodecFLAC, 25 kCodecFLAC,
26 // ChromeOS specific codecs. 26 // ChromeOS specific codecs.
27 kCodecAMR_NB, 27 kCodecAMR_NB,
28 kCodecAMR_WB, 28 kCodecAMR_WB,
29 kCodecPCM_MULAW, 29 kCodecPCM_MULAW,
30 kCodecGSM_MS, 30 kCodecGSM_MS,
31 kCodecPCM_S16BE, 31 kCodecPCM_S16BE,
32 kCodecPCM_S24BE, 32 kCodecPCM_S24BE,
33 // Additional codecs for all platforms.
scherkus (not reviewing) 2012/12/14 21:13:34 nit: this comment will likely become invalid at so
Tom Finegan 2012/12/14 23:19:52 Done.
34 kCodecOpus,
33 // DO NOT ADD RANDOM AUDIO CODECS! 35 // DO NOT ADD RANDOM AUDIO CODECS!
34 // 36 //
35 // The only acceptable time to add a new codec is if there is production code 37 // The only acceptable time to add a new codec is if there is production code
36 // that uses said codec in the same CL. 38 // that uses said codec in the same CL.
37 39
38 kAudioCodecMax = kCodecPCM_S24BE // Must equal the last "real" codec above. 40 kAudioCodecMax = kCodecOpus // Must equal the last "real" codec above.
39 }; 41 };
40 42
41 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of 43 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of
42 // |bits_per_channel|, we should switch over since bits are generally confusing 44 // |bits_per_channel|, we should switch over since bits are generally confusing
43 // to work with. 45 // to work with.
44 class MEDIA_EXPORT AudioDecoderConfig { 46 class MEDIA_EXPORT AudioDecoderConfig {
45 public: 47 public:
46 // Constructs an uninitialized object. Clients should call Initialize() with 48 // Constructs an uninitialized object. Clients should call Initialize() with
47 // appropriate values before using. 49 // appropriate values before using.
48 AudioDecoderConfig(); 50 AudioDecoderConfig();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 size_t extra_data_size_; 103 size_t extra_data_size_;
102 104
103 bool is_encrypted_; 105 bool is_encrypted_;
104 106
105 DISALLOW_COPY_AND_ASSIGN(AudioDecoderConfig); 107 DISALLOW_COPY_AND_ASSIGN(AudioDecoderConfig);
106 }; 108 };
107 109
108 } // namespace media 110 } // namespace media
109 111
110 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ 112 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
OLDNEW
« no previous file with comments | « media/DEPS ('k') | media/base/media_switches.h » ('j') | media/base/media_switches.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698