Cast: Make vp8 3-buffer mode work

media/cast/sender/video_encoder_impl_unittest.cc

 // Copyright 2014 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 <vector>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/video_frame.h"
@@ skipping 18 matching lines @@
   void SetExpectedResult(uint32 expected_frame_id,
                          uint32 expected_last_referenced_frame_id,
                          const base::TimeTicks& expected_capture_time) {
     expected_frame_id_ = expected_frame_id;
     expected_last_referenced_frame_id_ = expected_last_referenced_frame_id;
     expected_capture_time_ = expected_capture_time;
   }
 
   void DeliverEncodedVideoFrame(
       scoped_ptr<EncodedFrame> encoded_frame) {
-    if (expected_frame_id_ == expected_last_referenced_frame_id_) {
-      EXPECT_EQ(EncodedFrame::KEY, encoded_frame->dependency);
-    } else {
+    if (expected_frame_id_ != expected_last_referenced_frame_id_) {

[miu, 2014/09/02 19:22:03]

If this assumption is no longer true, should we be introducing a new
EncodedFrame enum?

[hubbe, 2014/09/02 21:39:48]

I think I'm going to try to make the dependency into a bool again. (In a
separate CL.)

       EXPECT_EQ(EncodedFrame::DEPENDENT,
                 encoded_frame->dependency);
     }
     EXPECT_EQ(expected_frame_id_, encoded_frame->frame_id);
     EXPECT_EQ(expected_last_referenced_frame_id_,
-              encoded_frame->referenced_frame_id);
+              encoded_frame->referenced_frame_id)
+        << "frame id: " << expected_frame_id_;
     EXPECT_EQ(expected_capture_time_, encoded_frame->reference_time);
   }
 
  protected:
   virtual ~TestVideoEncoderCallback() {}
 
  private:
   friend class base::RefCountedThreadSafe<TestVideoEncoderCallback>;
 
   uint32 expected_frame_id_;
@@ skipping 193 matching lines @@
   for (int i = 5; i < 17; ++i) {
     test_video_encoder_callback_->SetExpectedResult(i, 4, capture_time);
     EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
         video_frame_, capture_time, frame_encoded_callback));
     task_runner_->RunTasks();
   }
 }
 
 }  // namespace cast
 }  // namespace media