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

media/cast/test/end2end_unittest.cc

Index: media/cast/test/end2end_unittest.cc
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index 6ee722e3f859bbc4c715b4c72d583a2a9671a995..309e4c997a0f907f82c823d576c6e78d713c0b25 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -18,7 +18,6 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_byteorder.h"
 #include "base/test/simple_test_tick_clock.h"
@@ -305,9 +304,7 @@ class TestReceiverAudioCallback
     EXPECT_TRUE(is_continuous);
   }
 
-  void CheckCodedAudioFrame(
-      scoped_ptr<transport::EncodedAudioFrame> audio_frame,
-      const base::TimeTicks& playout_time) {
+  void CheckCodedAudioFrame(scoped_ptr<transport::EncodedFrame> audio_frame) {
     ASSERT_TRUE(!!audio_frame);
     ASSERT_FALSE(expected_frames_.empty());
     const ExpectedAudioFrame& expected_audio_frame =
@@ -322,7 +319,7 @@ class TestReceiverAudioCallback
                   expected_audio_frame.audio_bus->frames(),
               num_elements);
     int16* const pcm_data =
-        reinterpret_cast<int16*>(string_as_array(&audio_frame->data));
+        reinterpret_cast<int16*>(audio_frame->mutable_bytes());

[hubbe, 2014/05/16 17:13:20]

Why not ->bytes() ?

[miu, 2014/05/16 21:28:46]

Is your question:

1. Why did I choose to call mutable_bytes() here instead of bytes()?
A: Because the int16's are being byte swapped on line 324, and stored back into
the array.

or

2. Why didn't I name the non-const accessor method bytes() in EncodedFrame?
A: Readability, mostly.  A habit from using proto bufs, I suppose.

     for (int i = 0; i < num_elements; ++i)
       pcm_data[i] = static_cast<int16>(base::NetToHost16(pcm_data[i]));
     scoped_ptr<AudioBus> audio_bus(
@@ -331,7 +328,7 @@ class TestReceiverAudioCallback
     audio_bus->FromInterleaved(pcm_data, audio_bus->frames(), sizeof(int16));
 
     // Delegate the checking from here...
-    CheckAudioFrame(audio_bus.Pass(), playout_time, true);
+    CheckAudioFrame(audio_bus.Pass(), audio_frame->reference_time, true);
   }
 
   int number_times_called() const { return num_called_; }