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

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

Issue 743483002: Emit Media Source codec names as media_log events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix missed call to ChunkDemuxer constructor. Created 6 years, 1 month 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 27 matching lines...) Expand all
38 kCodecPCM_ALAW = 14, 38 kCodecPCM_ALAW = 14,
39 // DO NOT ADD RANDOM AUDIO CODECS! 39 // DO NOT ADD RANDOM AUDIO CODECS!
40 // 40 //
41 // The only acceptable time to add a new codec is if there is production code 41 // The only acceptable time to add a new codec is if there is production code
42 // that uses said codec in the same CL. 42 // that uses said codec in the same CL.
43 43
44 // Must always be equal to the largest entry ever logged. 44 // Must always be equal to the largest entry ever logged.
45 kAudioCodecMax = kCodecPCM_ALAW, 45 kAudioCodecMax = kCodecPCM_ALAW,
46 }; 46 };
47 47
48 const char* AudioCodecName(AudioCodec audio_codec, SampleFormat sample_format);
DaleCurtis 2014/11/19 00:01:56 Instead of adding it like this, how about having a
watk 2014/11/19 19:18:09 Done.
49
48 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of 50 // TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of
49 // |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
50 // to work with. 52 // to work with.
51 class MEDIA_EXPORT AudioDecoderConfig { 53 class MEDIA_EXPORT AudioDecoderConfig {
52 public: 54 public:
53 // Constructs an uninitialized object. Clients should call Initialize() with 55 // Constructs an uninitialized object. Clients should call Initialize() with
54 // appropriate values before using. 56 // appropriate values before using.
55 AudioDecoderConfig(); 57 AudioDecoderConfig();
56 58
57 // Constructs an initialized object. It is acceptable to pass in NULL for 59 // Constructs an initialized object. It is acceptable to pass in NULL for
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 int codec_delay_; 127 int codec_delay_;
126 128
127 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler 129 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
128 // generated copy constructor and assignment operator. Since the extra data is 130 // generated copy constructor and assignment operator. Since the extra data is
129 // typically small, the performance impact is minimal. 131 // typically small, the performance impact is minimal.
130 }; 132 };
131 133
132 } // namespace media 134 } // namespace media
133 135
134 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_ 136 #endif // MEDIA_BASE_AUDIO_DECODER_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698