Make AudioParameters a class instead of a struct

media/ffmpeg/ffmpeg_common.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/ffmpeg/ffmpeg_common.h"
 
 #include "base/logging.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/video_decoder_config.h"
 
@@ skipping 280 matching lines @@
   switch (layout) {
     case AV_CH_LAYOUT_MONO:
       return CHANNEL_LAYOUT_MONO;
     case AV_CH_LAYOUT_STEREO:
       return CHANNEL_LAYOUT_STEREO;
     case AV_CH_LAYOUT_2_1:
       return CHANNEL_LAYOUT_2_1;
     case AV_CH_LAYOUT_SURROUND:
       return CHANNEL_LAYOUT_SURROUND;
     case AV_CH_LAYOUT_4POINT0:
-      return CHANNEL_LAYOUT_4POINT0;
+      return CHANNEL_LAYOUT_4_0;
     case AV_CH_LAYOUT_2_2:
       return CHANNEL_LAYOUT_2_2;
     case AV_CH_LAYOUT_QUAD:
       return CHANNEL_LAYOUT_QUAD;
     case AV_CH_LAYOUT_5POINT0:
-      return CHANNEL_LAYOUT_5POINT0;
+      return CHANNEL_LAYOUT_5_0;
     case AV_CH_LAYOUT_5POINT1:
-      return CHANNEL_LAYOUT_5POINT1;
+      return CHANNEL_LAYOUT_5_1;
     case AV_CH_LAYOUT_5POINT0_BACK:
-      return CHANNEL_LAYOUT_5POINT0_BACK;
+      return CHANNEL_LAYOUT_5_0_BACK;
     case AV_CH_LAYOUT_5POINT1_BACK:
-      return CHANNEL_LAYOUT_5POINT1_BACK;
+      return CHANNEL_LAYOUT_5_1_BACK;
     case AV_CH_LAYOUT_7POINT0:
-      return CHANNEL_LAYOUT_7POINT0;
+      return CHANNEL_LAYOUT_7_0;
     case AV_CH_LAYOUT_7POINT1:
-      return CHANNEL_LAYOUT_7POINT1;
+      return CHANNEL_LAYOUT_7_1;
     case AV_CH_LAYOUT_7POINT1_WIDE:
-      return CHANNEL_LAYOUT_7POINT1_WIDE;
+      return CHANNEL_LAYOUT_7_1_WIDE;
     case AV_CH_LAYOUT_STEREO_DOWNMIX:
       return CHANNEL_LAYOUT_STEREO_DOWNMIX;
     default:
       // FFmpeg channel_layout is 0 for .wav and .mp3.  We know mono and stereo
       // from the number of channels, otherwise report errors.
       if (channels == 1)
         return CHANNEL_LAYOUT_MONO;
       if (channels == 2)
         return CHANNEL_LAYOUT_STEREO;
       DVLOG(1) << "Unsupported channel layout: " << layout;
@@ skipping 53 matching lines @@
         avcodec_close(stream->codec);
       }
     }
   }
 
   // Then finally cleanup the format context.
   avformat_close_input(&format_context);
 }
 
 }  // namespace media