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

Unified Diff: media/filters/audio_file_reader.h

Issue 12224114: Guard against midstream audio configuration changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
« no previous file with comments | « no previous file | media/filters/audio_file_reader.cc » ('j') | media/filters/audio_file_reader.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_file_reader.h
diff --git a/media/filters/audio_file_reader.h b/media/filters/audio_file_reader.h
index c9996f391b4b553a1eb770de117233e72bf31fd0..e345dc05808f0ea9051414d71595efb79b2766bf 100644
--- a/media/filters/audio_file_reader.h
+++ b/media/filters/audio_file_reader.h
@@ -43,8 +43,8 @@ class MEDIA_EXPORT AudioFileReader {
int Read(AudioBus* audio_bus);
// These methods can be called once Open() has been called.
- int channels() const;
- int sample_rate() const;
+ int channels() const { return channels_; }
+ int sample_rate() const { return sample_rate_; }
// Please note that duration() and number_of_frames() attempt to be accurate,
// but are only estimates. For some encoded formats, the actual duration
@@ -58,6 +58,11 @@ class MEDIA_EXPORT AudioFileReader {
AVCodecContext* codec_context_;
int stream_index_;
FFmpegURLProtocol* protocol_;
+ int channels_;
+ int sample_rate_;
+
+ // AVSampleFormat initially requested; not Chrome's SampleFormat.
+ int av_sample_format_;
DISALLOW_COPY_AND_ASSIGN(AudioFileReader);
};
« no previous file with comments | « no previous file | media/filters/audio_file_reader.cc » ('j') | media/filters/audio_file_reader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698