Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

Unified Diff: media/cast/video_sender/fake_software_video_encoder.cc

Issue 288103002: [Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3afd858e2cc559acf1a1fb720889510408175fb7..01a3ccef51ab210ffffcb738f984c9417202c599 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 = encoded_image->frame_id - 1;
+ if (next_frame_is_key_) {
+ encoded_image->dependency = transport::EncodedFrame::KEY;
+ encoded_image->referenced_frame_id = encoded_image->frame_id;
+ next_frame_is_key_ = false;
+ } else {
+ encoded_image->dependency = transport::EncodedFrame::DEPENDENT;
+ encoded_image->referenced_frame_id = encoded_image->frame_id - 1;
+ }
base::DictionaryValue values;
- values.Set("key", base::Value::CreateBooleanValue(encoded_image->key_frame));
+ values.Set("key", base::Value::CreateBooleanValue(
+ encoded_image->dependency == 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;
}
« no previous file with comments | « media/cast/video_sender/fake_software_video_encoder.h ('k') | media/cast/video_sender/software_video_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698