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

Unified Diff: media/filters/audio_file_reader.cc

Issue 13991013: Linux: make it possible to compile against libav when use_system_ffmpeg==1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tabs Created 7 years, 8 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/ffmpeg_audio_decoder.cc » ('j') | media/media.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_file_reader.cc
diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc
index 32627b04b10ad558bab4b4facc386da0a3c4552d..79ca86a68157f54858fdbcd7ec21c831cee73ccf 100644
--- a/media/filters/audio_file_reader.cc
+++ b/media/filters/audio_file_reader.cc
@@ -180,12 +180,12 @@ int AudioFileReader::Read(AudioBus* audio_bus) {
}
if (av_frame->sample_rate != sample_rate_ ||
- av_frame->channels != channels_ ||
+ av_frame_get_channels(av_frame.get()) != channels_ ||
DaleCurtis 2013/04/15 23:12:53 Why? When use_system_ffmpeg is used the headers us
Paweł Hajdan Jr. 2013/04/15 23:51:49 libav's AVFrame doesn't have channels member.
DaleCurtis 2013/04/16 20:46:56 It doesn't appear to have an av_frame_get_channels
Paweł Hajdan Jr. 2013/04/16 20:59:36 Correct. I'm adding code that probes for presence
DaleCurtis 2013/04/16 21:25:56 Ugh, that's super gross. I didn't realize that's
Paweł Hajdan Jr. 2013/04/16 21:50:35 Note this is just for use_system_ffmpeg=1 case.
DaleCurtis 2013/04/17 21:17:09 I realize it's just for use_system and is a one of
Paweł Hajdan Jr. 2013/04/17 22:07:34 Done.
av_frame->format != av_sample_format_) {
DLOG(ERROR) << "Unsupported midstream configuration change!"
<< " Sample Rate: " << av_frame->sample_rate << " vs "
<< sample_rate_
- << ", Channels: " << av_frame->channels << " vs "
+ << ", Channels: " << av_frame_get_channels(av_frame.get()) << " vs "
<< channels_
<< ", Sample Format: " << av_frame->format << " vs "
<< av_sample_format_;
« no previous file with comments | « no previous file | media/filters/ffmpeg_audio_decoder.cc » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698