Change SetOutputScaling to set a single level, not left/right levels.

talk/media/webrtc/webrtcvoiceengine_unittest.cc

 /*
  * libjingle
  * Copyright 2008 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 2879 matching lines @@
   EXPECT_TRUE(channel_->SetSendParameters(send_parameters_));
   cricket::StreamParams stream;
   stream.ssrcs.push_back(kSsrc2);
   EXPECT_TRUE(channel_->AddRecvStream(stream));
   cricket::WebRtcVoiceMediaChannel* media_channel =
       static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
   EXPECT_LT(media_channel->voe_channel(),
             media_channel->GetReceiveChannelId(kSsrc2));
 }
 
-TEST_F(WebRtcVoiceEngineTestFake, SetOutputScaling) {
+TEST_F(WebRtcVoiceEngineTestFake, SetOutputVolume) {
   EXPECT_TRUE(SetupEngine());
-  float scale, left, right;
-  EXPECT_TRUE(channel_->SetOutputScaling(0, 1, 2));
+  float scale;
+  EXPECT_TRUE(channel_->SetOutputVolume(0, 2));
   int channel_id = voe_.GetLastChannel();
   EXPECT_EQ(0, voe_.GetChannelOutputVolumeScaling(channel_id, scale));
-  EXPECT_EQ(0, voe_.GetOutputVolumePan(channel_id, left, right));
-  EXPECT_DOUBLE_EQ(1, left * scale);
-  EXPECT_DOUBLE_EQ(2, right * scale);
+  EXPECT_DOUBLE_EQ(2, scale);
 
-  EXPECT_FALSE(channel_->SetOutputScaling(kSsrc2, 1, 2));
+  EXPECT_FALSE(channel_->SetOutputVolume(kSsrc2, 0.5));
   cricket::StreamParams stream;
   stream.ssrcs.push_back(kSsrc2);
   EXPECT_TRUE(channel_->AddRecvStream(stream));
 
-  EXPECT_TRUE(channel_->SetOutputScaling(kSsrc2, 2, 1));
+  EXPECT_TRUE(channel_->SetOutputVolume(kSsrc2, 3));
   channel_id = voe_.GetLastChannel();
   EXPECT_EQ(0, voe_.GetChannelOutputVolumeScaling(channel_id, scale));
-  EXPECT_EQ(0, voe_.GetOutputVolumePan(channel_id, left, right));
-  EXPECT_DOUBLE_EQ(2, left * scale);
-  EXPECT_DOUBLE_EQ(1, right * scale);
+  EXPECT_DOUBLE_EQ(3, scale);
 }
 
 TEST_F(WebRtcVoiceEngineTestFake, SetsSyncGroupFromSyncLabel) {
   const uint32_t kAudioSsrc = 123;
   const std::string kSyncLabel = "AvSyncLabel";
 
   EXPECT_TRUE(SetupEngine());
   cricket::StreamParams sp = cricket::StreamParams::CreateLegacy(kAudioSsrc);
   sp.sync_label = kSyncLabel;
   // Creating two channels to make sure that sync label is set properly for both
@@ skipping 368 matching lines @@
   cricket::WebRtcVoiceEngine engine;
   EXPECT_TRUE(engine.Init(rtc::Thread::Current()));
   rtc::scoped_ptr<webrtc::Call> call(
       webrtc::Call::Create(webrtc::Call::Config()));
   cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::AudioOptions(),
                                            call.get());
   cricket::AudioRecvParameters parameters;
   parameters.codecs = engine.codecs();
   EXPECT_TRUE(channel.SetRecvParameters(parameters));
 }