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

Unified Diff: media/filters/ffmpeg_audio_decoder.h

Issue 11280301: Roll FFMpeg for M26. Fix ffmpeg float audio decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix DCHECK. Roll DEPS for fix. Created 8 years 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/filters/ffmpeg_audio_decoder.h
diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h
index ce096ee996479d4ac45db0654199f6f6947a05bd..ebaa56364114871062ad536a0d07175c8d6609ee 100644
--- a/media/filters/ffmpeg_audio_decoder.h
+++ b/media/filters/ffmpeg_audio_decoder.h
@@ -20,6 +20,7 @@ class MessageLoopProxy;
namespace media {
+class AudioBus;
class AudioTimestampHelper;
class DataBuffer;
class DecoderBuffer;
@@ -91,6 +92,10 @@ class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
// them up and hand them out as we receive Read() calls.
std::list<QueuedAudioBuffer> queued_audio_;
+ // We may need to convert the audio data coming out of FFmpeg from planar
+ // float to integer.
+ scoped_ptr<AudioBus> converter_bus_;
+
DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
};

Powered by Google App Engine
This is Rietveld 408576698