Control combined_audio_video_bwe with config bool.

webrtc/audio_receive_stream.h

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 41 matching lines @@
     // Identifier for an A/V synchronization group. Empty string to disable.
     // TODO(pbos): Synchronize streams in a sync group, not just one video
     // stream to one audio stream. Tracked by issue webrtc:4762.
     std::string sync_group;
 
     // Decoders for every payload that we can receive. Call owns the
     // AudioDecoder instances once the Config is submitted to
     // Call::CreateReceiveStream().
     // TODO(solenberg): Use unique_ptr<> once our std lib fully supports C++11.
     std::map<uint8_t, AudioDecoder*> decoder_map;
+
+    // TODO(pbos): Remove config option once combined A/V BWE is always on.
+    bool combined_audio_video_bwe = true;

[mflodman, 2015/07/24 12:28:22]

I'd prefer to set this to false until we have verified combined a/v BWE.

[stefan-webrtc, 2015/07/24 12:35:10]

Good point, I agree.

   };
 
   virtual Stats GetStats() const = 0;
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_AUDIO_RECEIVE_STREAM_H_