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

Side by Side Diff: media/formats/mp4/aac.h

Issue 1235793005: Deprecate LogCB in favor of using MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and attempt to fix Android compilation Created 5 years, 5 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/formats/mp2t/mp2t_stream_parser_unittest.cc ('k') | media/formats/mp4/aac.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FORMATS_MP4_AAC_H_ 5 #ifndef MEDIA_FORMATS_MP4_AAC_H_
6 #define MEDIA_FORMATS_MP4_AAC_H_ 6 #define MEDIA_FORMATS_MP4_AAC_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 13 matching lines...) Expand all
24 // for more details. 24 // for more details.
25 class MEDIA_EXPORT AAC { 25 class MEDIA_EXPORT AAC {
26 public: 26 public:
27 AAC(); 27 AAC();
28 ~AAC(); 28 ~AAC();
29 29
30 // Parse the AAC config from the raw binary data embedded in esds box. 30 // Parse the AAC config from the raw binary data embedded in esds box.
31 // The function will parse the data and get the ElementaryStreamDescriptor, 31 // The function will parse the data and get the ElementaryStreamDescriptor,
32 // then it will parse the ElementaryStreamDescriptor to get audio stream 32 // then it will parse the ElementaryStreamDescriptor to get audio stream
33 // configurations. 33 // configurations.
34 bool Parse(const std::vector<uint8>& data, const LogCB& log_cb); 34 bool Parse(const std::vector<uint8>& data,
35 const scoped_refptr<MediaLog>& media_log);
35 36
36 // Gets the output sample rate for the AAC stream. 37 // Gets the output sample rate for the AAC stream.
37 // |sbr_in_mimetype| should be set to true if the SBR mode is 38 // |sbr_in_mimetype| should be set to true if the SBR mode is
38 // signalled in the mimetype. (ie mp4a.40.5 in the codecs parameter). 39 // signalled in the mimetype. (ie mp4a.40.5 in the codecs parameter).
39 // Returns the samples_per_second value that should used in an 40 // Returns the samples_per_second value that should used in an
40 // AudioDecoderConfig. 41 // AudioDecoderConfig.
41 int GetOutputSamplesPerSecond(bool sbr_in_mimetype) const; 42 int GetOutputSamplesPerSecond(bool sbr_in_mimetype) const;
42 43
43 // Gets the channel layout for the AAC stream. 44 // Gets the channel layout for the AAC stream.
44 // |sbr_in_mimetype| should be set to true if the SBR mode is 45 // |sbr_in_mimetype| should be set to true if the SBR mode is
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 int frequency_; 84 int frequency_;
84 int extension_frequency_; 85 int extension_frequency_;
85 ChannelLayout channel_layout_; 86 ChannelLayout channel_layout_;
86 }; 87 };
87 88
88 } // namespace mp4 89 } // namespace mp4
89 90
90 } // namespace media 91 } // namespace media
91 92
92 #endif // MEDIA_FORMATS_MP4_AAC_H_ 93 #endif // MEDIA_FORMATS_MP4_AAC_H_
OLDNEW
« no previous file with comments | « media/formats/mp2t/mp2t_stream_parser_unittest.cc ('k') | media/formats/mp4/aac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698