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

Unified Diff: media/mp4/aac.h

Issue 10795050: Fix MediaSource code so it can handle HE-AAC content that uses implicit signalling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added implicit SBR test Created 8 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 side-by-side diff with in-line comments
Download patch
Index: media/mp4/aac.h
diff --git a/media/mp4/aac.h b/media/mp4/aac.h
index 7a2a3f8914ac176983cc73dd39471b5cd5ee71dc..8ab21296368a9a412cbcd482efb34be449240513 100644
--- a/media/mp4/aac.h
+++ b/media/mp4/aac.h
@@ -32,7 +32,12 @@ class MEDIA_EXPORT AAC {
// configurations.
bool Parse(const std::vector<uint8>& data);
- uint32 frequency() const;
+ // Gets the output sample rate for the AAC stream.
+ // |sbr_in_mimetype| should be set to true if the SBR mode is
+ // signalled in the mimetype. (ie mp4a.40.5 in the codecs parameter).
+ // Returns the samples_per_second value that should used in an
+ // AudioDecoderConfig.
+ int GetOutputSamplesPerSecond(bool sbr_in_mimetype) const;
ChannelLayout channel_layout() const;
// This function converts a raw AAC frame into an AAC frame with an ADTS
@@ -56,7 +61,8 @@ class MEDIA_EXPORT AAC {
// can be used by Chromium. They are based on the AAC specific
// configuration but can be overridden by extensions in elementary
// stream descriptor.
- uint32 frequency_;
+ int frequency_;
+ int extension_frequency_;
ChannelLayout channel_layout_;
};

Powered by Google App Engine
This is Rietveld 408576698