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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h

Issue 26956002: Plumb support for audio sample formats. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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
« content/renderer/pepper/content_decryptor_delegate.cc ('K') | « media/cdm/ppapi/cdm_wrapper.cc ('k') | media/cdm/ppapi/ffmpeg_cdm_audio_decoder.cc » ('j') | media/cdm/ppapi/ffmpeg_cdm_audio_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h
diff --git a/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h b/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h
index 50fe4d455a67af44becaba3b4a0fd0c9c2db1897..6e170ad4a82addab7d19fb59e0446c32a966ce4b 100644
--- a/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h
+++ b/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h
@@ -68,7 +68,6 @@ class FFmpegCdmAudioDecoder {
scoped_ptr_malloc<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
// Audio format.
- int bits_per_channel_;
int samples_per_second_;
int channels_;
@@ -80,10 +79,6 @@ class FFmpegCdmAudioDecoder {
int bytes_per_frame_;
base::TimeDelta last_input_timestamp_;
- // We may need to convert the audio data coming out of FFmpeg from planar
- // float to integer.
- scoped_ptr<AudioBus> converter_bus_;
-
// Number of output sample bytes to drop before generating output buffers.
// This is required for handling negative timestamps when decoding Vorbis
// audio, for example.
« content/renderer/pepper/content_decryptor_delegate.cc ('K') | « media/cdm/ppapi/cdm_wrapper.cc ('k') | media/cdm/ppapi/ffmpeg_cdm_audio_decoder.cc » ('j') | media/cdm/ppapi/ffmpeg_cdm_audio_decoder.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698