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

media/cast/video_sender/fake_software_video_encoder.cc

Index: media/cast/video_sender/fake_software_video_encoder.cc
diff --git a/media/cast/video_sender/fake_software_video_encoder.cc b/media/cast/video_sender/fake_software_video_encoder.cc
index 0df0d6e6429d2f213806f96e90fbfc1ee743b772..b101cd66cd2b0dbd7ab408aec4e2bae0d8ac9c1c 100644
--- a/media/cast/video_sender/fake_software_video_encoder.cc
+++ b/media/cast/video_sender/fake_software_video_encoder.cc
@@ -25,18 +25,23 @@ void FakeSoftwareVideoEncoder::Initialize() {}
 
 bool FakeSoftwareVideoEncoder::Encode(
     const scoped_refptr<media::VideoFrame>& video_frame,
-    transport::EncodedVideoFrame* encoded_image) {
-  encoded_image->codec = transport::kFakeSoftwareVideo;
-  encoded_image->key_frame = next_frame_is_key_;
-  next_frame_is_key_ = false;
+    transport::EncodedFrame* encoded_image) {
   encoded_image->frame_id = frame_id_++;
-  encoded_image->last_referenced_frame_id = frame_id_to_reference_;
+  if (next_frame_is_key_) {
+    encoded_image->relationship = transport::EncodedFrame::KEY;
+    encoded_image->referenced_frame_id = encoded_image->frame_id;
+    next_frame_is_key_ = false;
+  } else {
+    encoded_image->relationship = transport::EncodedFrame::DEPENDENT;
+    encoded_image->referenced_frame_id = frame_id_to_reference_;

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

This makes this codec behave like 3-buffer mode.
We probably want it to behave like !3-buffer mode, in which case this should be
encoded_image->framd_id -1.

+  }
 
   base::DictionaryValue values;
-  values.Set("key", base::Value::CreateBooleanValue(encoded_image->key_frame));
+  values.Set("key", base::Value::CreateBooleanValue(
+      encoded_image->relationship == transport::EncodedFrame::KEY));
   values.Set("id", base::Value::CreateIntegerValue(encoded_image->frame_id));
   values.Set("ref", base::Value::CreateIntegerValue(
-      encoded_image->last_referenced_frame_id));
+      encoded_image->referenced_frame_id));
   base::JSONWriter::Write(&values, &encoded_image->data);
   return true;
 }