[Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame

media/cast/audio_receiver/audio_decoder_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/stl_util.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/sys_byteorder.h"
 #include "base/time/time.h"
 #include "media/cast/audio_receiver/audio_decoder.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/test/utility/audio_utility.h"
 #include "media/cast/test/utility/standalone_cast_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/opus/src/include/opus.h"
@@ skipping 46 matching lines @@
                                           GetParam().num_channels,
                                           OPUS_APPLICATION_AUDIO));
       CHECK_EQ(OPUS_OK,
                opus_encoder_ctl(opus_encoder, OPUS_SET_BITRATE(OPUS_AUTO)));
     }
 
     total_audio_feed_in_ = base::TimeDelta();
     total_audio_decoded_ = base::TimeDelta();
   }
 
-  // Called from the unit test thread to create another EncodedAudioFrame and
-  // push it into the decoding pipeline.
+  // Called from the unit test thread to create another EncodedFrame and push it
+  // into the decoding pipeline.
   void FeedMoreAudio(const base::TimeDelta& duration,
                      int num_dropped_frames) {
-    // Prepare a simulated EncodedAudioFrame to feed into the AudioDecoder.
-    scoped_ptr<transport::EncodedAudioFrame> encoded_frame(
-        new transport::EncodedAudioFrame());
-    encoded_frame->codec = GetParam().codec;
+    // Prepare a simulated EncodedFrame to feed into the AudioDecoder.
+    scoped_ptr<transport::EncodedFrame> encoded_frame(
+        new transport::EncodedFrame());
     encoded_frame->frame_id = last_frame_id_ + 1 + num_dropped_frames;
+    encoded_frame->base_frame_id = encoded_frame->frame_id;
     last_frame_id_ = encoded_frame->frame_id;
 
     const scoped_ptr<AudioBus> audio_bus(
         audio_bus_factory_->NextAudioBus(duration).Pass());
 
     // Encode |audio_bus| into |encoded_frame->data|.
     const int num_elements = audio_bus->channels() * audio_bus->frames();
     std::vector<int16> interleaved(num_elements);
     audio_bus->ToInterleaved(
         audio_bus->frames(), sizeof(int16), &interleaved.front());
     if (GetParam().codec == transport::kPcm16) {
       encoded_frame->data.resize(num_elements * sizeof(int16));
       int16* const pcm_data =
-          reinterpret_cast<int16*>(string_as_array(&encoded_frame->data));
+          reinterpret_cast<int16*>(encoded_frame->mutable_bytes());
       for (size_t i = 0; i < interleaved.size(); ++i)
         pcm_data[i] = static_cast<int16>(base::HostToNet16(interleaved[i]));
     } else if (GetParam().codec == transport::kOpus) {
       OpusEncoder* const opus_encoder =
           reinterpret_cast<OpusEncoder*>(opus_encoder_memory_.get());
       const int kOpusEncodeBufferSize = 4000;
       encoded_frame->data.resize(kOpusEncodeBufferSize);
       const int payload_size =
           opus_encode(opus_encoder,
                       &interleaved.front(),
                       audio_bus->frames(),
-                      reinterpret_cast<unsigned char*>(
-                          string_as_array(&encoded_frame->data)),
+                      encoded_frame->mutable_bytes(),
                       encoded_frame->data.size());
       CHECK_GT(payload_size, 1);
       encoded_frame->data.resize(payload_size);
     } else {
       ASSERT_TRUE(false);  // Not reached.
     }
 
     {
       base::AutoLock auto_lock(lock_);
       total_audio_feed_in_ += duration;
@@ skipping 115 matching lines @@
 INSTANTIATE_TEST_CASE_P(AudioDecoderTestScenarios,
                         AudioDecoderTest,
                         ::testing::Values(
                              TestScenario(transport::kPcm16, 1, 8000),
                              TestScenario(transport::kPcm16, 2, 48000),
                              TestScenario(transport::kOpus, 1, 8000),
                              TestScenario(transport::kOpus, 2, 48000)));
 
 }  // namespace cast
 }  // namespace media