Change NetEq::GetAudio to use AudioFrame

webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc

Index: webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
index 9c64e0fb4823ecf80a6d4f03e456e3111e369455..2ddd6307e2b37a18a08bca46547b346533e047a2 100644
--- a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
@@ -220,7 +220,6 @@ NetEqQualityTest::NetEqQualityTest(int block_duration_ms,
       out_sampling_khz_(out_sampling_khz),
       in_size_samples_(
           static_cast<size_t>(in_sampling_khz_ * block_duration_ms_)),
-      out_size_samples_(static_cast<size_t>(out_sampling_khz_ * kOutputSizeMs)),
       payload_size_bytes_(0),
       max_payload_bytes_(0),
       in_file_(new ResampleInputAudioFile(FLAGS_in_filename,
@@ -250,7 +249,6 @@ NetEqQualityTest::NetEqQualityTest(int block_duration_ms,
   max_payload_bytes_ = in_size_samples_ * channels_ * sizeof(int16_t);
   in_data_.reset(new int16_t[in_size_samples_ * channels_]);
   payload_.reset(new uint8_t[max_payload_bytes_]);
-  out_data_.reset(new int16_t[out_size_samples_ * channels_]);
 }
 
 NetEqQualityTest::~NetEqQualityTest() {
@@ -394,18 +392,18 @@ int NetEqQualityTest::Transmit() {
 }
 
 int NetEqQualityTest::DecodeBlock() {
-  size_t channels;
-  size_t samples;
-  int ret = neteq_->GetAudio(out_size_samples_ * channels_, &out_data_[0],
-                             &samples, &channels, NULL);
+  int ret = neteq_->GetAudio(&out_frame_, NULL);
 
   if (ret != NetEq::kOK) {
     return -1;
   } else {
-    assert(channels == channels_);
-    assert(samples == static_cast<size_t>(kOutputSizeMs * out_sampling_khz_));
-    RTC_CHECK(output_->WriteArray(out_data_.get(), samples * channels));
-    return static_cast<int>(samples);
+    RTC_DCHECK_EQ(out_frame_.num_channels_, channels_);
+    RTC_DCHECK_EQ(out_frame_.samples_per_channel_,
+                  static_cast<size_t>(kOutputSizeMs * out_sampling_khz_));
+    RTC_CHECK(output_->WriteArray(
+        out_frame_.data_,
+        out_frame_.samples_per_channel_ * out_frame_.num_channels_));
+    return static_cast<int>(out_frame_.samples_per_channel_);
   }
 }