Linux: make it possible to compile against libav when use_system_ffmpeg==1

media/filters/audio_file_reader.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/audio_file_reader.h"
 
 #include "base/logging.h"
 #include "base/time.h"
 #include "media/base/audio_bus.h"
 #include "media/ffmpeg/ffmpeg_common.h"
@@ skipping 162 matching lines @@
         continue;
 
       // Determine the number of sample-frames we just decoded.  Check overflow.
       int frames_read = av_frame->nb_samples;
       if (frames_read < 0) {
         continue_decoding = false;
         break;
       }
 
       if (av_frame->sample_rate != sample_rate_ ||
+#ifdef CHROMIUM_NO_AVFRAME_CHANNELS

[DaleCurtis, 2013/04/17 22:14:23]

Instead of doing this, just do one #ifdef above the block and set frame_channels
as I mentioned in my initial comment. Then you don't have a double #if section.

[Paweł Hajdan Jr., 2013/04/18 17:27:10]

Done.

+          av_get_channel_layout_nb_channels(
+              av_frame->channel_layout) != channels_ ||
+#else
           av_frame->channels != channels_ ||
+#endif
           av_frame->format != av_sample_format_) {
         DLOG(ERROR) << "Unsupported midstream configuration change!"
                     << " Sample Rate: " << av_frame->sample_rate << " vs "
                     << sample_rate_
+#ifdef CHROMIUM_NO_AVFRAME_CHANNELS
+                    << ", Channels: " << av_get_channel_layout_nb_channels(
+                                             av_frame->channel_layout) << " vs "
+#else
                     << ", Channels: " << av_frame->channels << " vs "
+#endif
                     << channels_
                     << ", Sample Format: " << av_frame->format << " vs "
                     << av_sample_format_;
 
         // This is an unrecoverable error, so bail out.
         continue_decoding = false;
         break;
       }
 
       // Truncate, if necessary, if the destination isn't big enough.
@@ skipping 31 matching lines @@
   // Zero any remaining frames.
   audio_bus->ZeroFramesPartial(
       current_frame, audio_bus->frames() - current_frame);
 
   // Returns the actual number of sample-frames decoded.
   // Ideally this represents the "true" exact length of the file.
   return current_frame;
 }
 
 }  // namespace media