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

Side by Side 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: Comments. 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | media/filters/audio_file_reader.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_FILTERS_AUDIO_FILE_READER_H_ 5 #ifndef MEDIA_FILTERS_AUDIO_FILE_READER_H_
6 #define MEDIA_FILTERS_AUDIO_FILE_READER_H_ 6 #define MEDIA_FILTERS_AUDIO_FILE_READER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
(...skipping 25 matching lines...) Expand all
36 // After a call to Open(), attempts to fully fill |audio_bus| with decoded 36 // After a call to Open(), attempts to fully fill |audio_bus| with decoded
37 // audio data. Any unfilled frames will be zeroed out. 37 // audio data. Any unfilled frames will be zeroed out.
38 // |audio_data| must be of the same size as channels(). 38 // |audio_data| must be of the same size as channels().
39 // The audio data will be decoded as floating-point linear PCM with 39 // The audio data will be decoded as floating-point linear PCM with
40 // a nominal range of -1.0 -> +1.0. 40 // a nominal range of -1.0 -> +1.0.
41 // Returns the number of sample-frames actually read which will always be 41 // Returns the number of sample-frames actually read which will always be
42 // <= audio_bus->frames() 42 // <= audio_bus->frames()
43 int Read(AudioBus* audio_bus); 43 int Read(AudioBus* audio_bus);
44 44
45 // These methods can be called once Open() has been called. 45 // These methods can be called once Open() has been called.
46 int channels() const; 46 int channels() const { return channels_; }
47 int sample_rate() const; 47 int sample_rate() const { return sample_rate_; }
48 48
49 // Please note that duration() and number_of_frames() attempt to be accurate, 49 // Please note that duration() and number_of_frames() attempt to be accurate,
50 // but are only estimates. For some encoded formats, the actual duration 50 // but are only estimates. For some encoded formats, the actual duration
51 // of the file can only be determined once all the file data has been read. 51 // of the file can only be determined once all the file data has been read.
52 // The Read() method returns the actual number of sample-frames it has read. 52 // The Read() method returns the actual number of sample-frames it has read.
53 base::TimeDelta duration() const; 53 base::TimeDelta duration() const;
54 int64 number_of_frames() const; 54 int64 number_of_frames() const;
55 55
56 private: 56 private:
57 scoped_ptr<FFmpegGlue> glue_; 57 scoped_ptr<FFmpegGlue> glue_;
58 AVCodecContext* codec_context_; 58 AVCodecContext* codec_context_;
59 int stream_index_; 59 int stream_index_;
60 FFmpegURLProtocol* protocol_; 60 FFmpegURLProtocol* protocol_;
61 int channels_;
62 int sample_rate_;
63
64 // AVSampleFormat initially requested; not Chrome's SampleFormat.
65 int av_sample_format_;
61 66
62 DISALLOW_COPY_AND_ASSIGN(AudioFileReader); 67 DISALLOW_COPY_AND_ASSIGN(AudioFileReader);
63 }; 68 };
64 69
65 } // namespace media 70 } // namespace media
66 71
67 #endif // MEDIA_FILTERS_AUDIO_FILE_READER_H_ 72 #endif // MEDIA_FILTERS_AUDIO_FILE_READER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/audio_file_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698