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

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

Issue 812643005: Re-add AC3/EAC3 audio demuxing support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added browser tests for AC3/EAC3 Created 5 years, 9 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
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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 16 matching lines...) Expand all
27 kCodecPCM = 3, 27 kCodecPCM = 3,
28 kCodecVorbis = 4, 28 kCodecVorbis = 4,
29 kCodecFLAC = 5, 29 kCodecFLAC = 5,
30 kCodecAMR_NB = 6, 30 kCodecAMR_NB = 6,
31 kCodecAMR_WB = 7, 31 kCodecAMR_WB = 7,
32 kCodecPCM_MULAW = 8, 32 kCodecPCM_MULAW = 8,
33 kCodecGSM_MS = 9, 33 kCodecGSM_MS = 9,
34 kCodecPCM_S16BE = 10, 34 kCodecPCM_S16BE = 10,
35 kCodecPCM_S24BE = 11, 35 kCodecPCM_S24BE = 11,
36 kCodecOpus = 12, 36 kCodecOpus = 12,
37 // kCodecEAC3 = 13, 37 kCodecEAC3 = 13,
38 kCodecPCM_ALAW = 14, 38 kCodecPCM_ALAW = 14,
39 kCodecALAC = 15, 39 kCodecALAC = 15,
40 kCodecAC3 = 16,
40 // DO NOT ADD RANDOM AUDIO CODECS! 41 // DO NOT ADD RANDOM AUDIO CODECS!
41 // 42 //
42 // The only acceptable time to add a new codec is if there is production code 43 // The only acceptable time to add a new codec is if there is production code
43 // that uses said codec in the same CL. 44 // that uses said codec in the same CL.
44 45
45 // Must always be equal to the largest entry ever logged. 46 // Must always be equal to the largest entry ever logged.
46 kAudioCodecMax = kCodecALAC, 47 kAudioCodecMax = kCodecAC3,
47 }; 48 };
48 49
49 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of 50 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of
50 // |bits_per_channel|, we should switch over since bits are generally confusing 51 // |bits_per_channel|, we should switch over since bits are generally confusing
51 // to work with. 52 // to work with.
52 class MEDIA_EXPORT AudioDecoderConfig { 53 class MEDIA_EXPORT AudioDecoderConfig {
53 public: 54 public:
54 // Constructs an uninitialized object. Clients should call Initialize() with 55 // Constructs an uninitialized object. Clients should call Initialize() with
55 // appropriate values before using. 56 // appropriate values before using.
56 AudioDecoderConfig(); 57 AudioDecoderConfig();
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 int codec_delay_; 129 int codec_delay_;
129 130
130 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler 131 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
131 // generated copy constructor and assignment operator. Since the extra data is 132 // generated copy constructor and assignment operator. Since the extra data is
132 // typically small, the performance impact is minimal. 133 // typically small, the performance impact is minimal.
133 }; 134 };
134 135
135 } // namespace media 136 } // namespace media
136 137
137 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ 138 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698