diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-21 00:31:27 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-21 00:31:27 +0000 |
| commit | 034cc134ec96cab8adcf1c1dafa95b10c449c94d (patch) | |
| tree | 962675f868833a1b38d54a16f7aa85fe44ab9872 /media/mp4/aac.h | |
| parent | 891e1af1bbfe34c7b336ceac982df62c5625cc6e (diff) | |
| download | chromium_src-034cc134ec96cab8adcf1c1dafa95b10c449c94d.zip chromium_src-034cc134ec96cab8adcf1c1dafa95b10c449c94d.tar.gz chromium_src-034cc134ec96cab8adcf1c1dafa95b10c449c94d.tar.bz2 | |
Fix MediaSource code so it can handle HE-AAC content that uses implicit signalling.
BUG=135674
TEST=Manual testing with the content in the bug.
Review URL: https://chromiumcodereview.appspot.com/10795050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4/aac.h')
| -rw-r--r-- | media/mp4/aac.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/media/mp4/aac.h b/media/mp4/aac.h index 7a2a3f8..73464ee 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_; }; |