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

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: buildfix Created 4 years, 11 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/base/android/demuxer_stream_player_params.cc ('k') | media/base/audio_decoder_config.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 (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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 18 matching lines...) Expand all
29 kCodecPCM = 3, 29 kCodecPCM = 3,
30 kCodecVorbis = 4, 30 kCodecVorbis = 4,
31 kCodecFLAC = 5, 31 kCodecFLAC = 5,
32 kCodecAMR_NB = 6, 32 kCodecAMR_NB = 6,
33 kCodecAMR_WB = 7, 33 kCodecAMR_WB = 7,
34 kCodecPCM_MULAW = 8, 34 kCodecPCM_MULAW = 8,
35 kCodecGSM_MS = 9, 35 kCodecGSM_MS = 9,
36 kCodecPCM_S16BE = 10, 36 kCodecPCM_S16BE = 10,
37 kCodecPCM_S24BE = 11, 37 kCodecPCM_S24BE = 11,
38 kCodecOpus = 12, 38 kCodecOpus = 12,
39 // kCodecEAC3 = 13, 39 kCodecEAC3 = 13,
40 kCodecPCM_ALAW = 14, 40 kCodecPCM_ALAW = 14,
41 kCodecALAC = 15, 41 kCodecALAC = 15,
42 kCodecAC3 = 16,
42 // DO NOT ADD RANDOM AUDIO CODECS! 43 // DO NOT ADD RANDOM AUDIO CODECS!
43 // 44 //
44 // The only acceptable time to add a new codec is if there is production code 45 // The only acceptable time to add a new codec is if there is production code
45 // that uses said codec in the same CL. 46 // that uses said codec in the same CL.
46 47
47 // Must always be equal to the largest entry ever logged. 48 // Must always be equal to the largest entry ever logged.
48 kAudioCodecMax = kCodecALAC, 49 kAudioCodecMax = kCodecAC3,
49 }; 50 };
50 51
51 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of 52 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of
52 // |bits_per_channel|, we should switch over since bits are generally confusing 53 // |bits_per_channel|, we should switch over since bits are generally confusing
53 // to work with. 54 // to work with.
54 class MEDIA_EXPORT AudioDecoderConfig { 55 class MEDIA_EXPORT AudioDecoderConfig {
55 public: 56 public:
56 // Constructs an uninitialized object. Clients should call Initialize() with 57 // Constructs an uninitialized object. Clients should call Initialize() with
57 // appropriate values before using. 58 // appropriate values before using.
58 AudioDecoderConfig(); 59 AudioDecoderConfig();
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 int codec_delay_; 131 int codec_delay_;
131 132
132 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler 133 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
133 // generated copy constructor and assignment operator. Since the extra data is 134 // generated copy constructor and assignment operator. Since the extra data is
134 // typically small, the performance impact is minimal. 135 // typically small, the performance impact is minimal.
135 }; 136 };
136 137
137 } // namespace media 138 } // namespace media
138 139
139 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ 140 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
OLDNEW
« no previous file with comments | « media/base/android/demuxer_stream_player_params.cc ('k') | media/base/audio_decoder_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698