summaryrefslogtreecommitdiffstats
path: root/media/base/audio_decoder_config.h
diff options
context:
space:
mode:
authordalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 22:32:14 +0000
committerdalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 22:32:14 +0000
commit859b463585079cc5c4f5b6ae97602988538aeeec (patch)
tree2d03dc61a3f77a4aa5a6b5f212c3e8691527dbd9 /media/base/audio_decoder_config.h
parent3e1c8fedc6c736caf16ad356d6e99768da49f47c (diff)
downloadchromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.zip
chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.tar.gz
chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.tar.bz2
Second attempt to land ffmpeg roll.
Attempt 2 at landing http://codereview.chromium.org/9317096/ Same as before except for fixes in checkperms/ However, fixes have landed elsewhere for: - mp3 decode issue. - FrameRateNoVsyncCanvasInternalTest.fishbowl/0 BUG=110776 TEST=unittests, layouttests, trybots, perf tests... Review URL: https://chromiumcodereview.appspot.com/9447029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/audio_decoder_config.h')
-rw-r--r--media/base/audio_decoder_config.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/base/audio_decoder_config.h b/media/base/audio_decoder_config.h
index 90f51c1..6e58c5b 100644
--- a/media/base/audio_decoder_config.h
+++ b/media/base/audio_decoder_config.h
@@ -35,6 +35,9 @@ enum AudioCodec {
kAudioCodecMax = kCodecPCM_MULAW // Must equal the last "real" codec above.
};
+// TODO(dalecurtis): FFmpeg API uses |bytes_per_channel| instead of
+// |bits_per_channel|, we should switch over since bits are generally confusing
+// to work with.
class MEDIA_EXPORT AudioDecoderConfig {
public:
// Constructs an uninitialized object. Clients should call Initialize() with