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

media/cast/video_sender/fake_software_video_encoder.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 "media/cast/video_sender/fake_software_video_encoder.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "media/cast/transport/cast_transport_config.h"
 
 #ifndef OFFICIAL_BUILD
 
 namespace media {
 namespace cast {
 
 FakeSoftwareVideoEncoder::FakeSoftwareVideoEncoder()
     : next_frame_is_key_(true),
       frame_id_(0),
       frame_id_to_reference_(0) {
 }
 
 FakeSoftwareVideoEncoder::~FakeSoftwareVideoEncoder() {}
 
 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;
 }
 
 void FakeSoftwareVideoEncoder::UpdateRates(uint32 new_bitrate) {
   // TODO(hclam): Implement bitrate control.
 }
 
 void FakeSoftwareVideoEncoder::GenerateKeyFrame() {
   next_frame_is_key_ = true;
 }
 
 void FakeSoftwareVideoEncoder::LatestFrameIdToReference(uint32 frame_id) {
   frame_id_to_reference_ = frame_id;
 }
 
 }  // namespace cast
 }  // namespace media
 
 #endif