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

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

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing includes Created 6 years, 5 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
« no previous file with comments | « media/cast/sender/fake_software_video_encoder.h ('k') | media/cast/sender/rtp_timestamp_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/sender/fake_software_video_encoder.cc
diff --git a/media/cast/video_sender/fake_software_video_encoder.cc b/media/cast/sender/fake_software_video_encoder.cc
similarity index 82%
rename from media/cast/video_sender/fake_software_video_encoder.cc
rename to media/cast/sender/fake_software_video_encoder.cc
index e7bd9508a67c8d76aa63b578db113c06f110ab36..bd96f78c89f2bcf6e4ccf202fb884f5d57b9a342 100644
--- a/media/cast/video_sender/fake_software_video_encoder.cc
+++ b/media/cast/sender/fake_software_video_encoder.cc
@@ -2,11 +2,11 @@
// 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 "media/cast/sender/fake_software_video_encoder.h"
#include "base/json/json_writer.h"
#include "base/values.h"
-#include "media/cast/transport/cast_transport_config.h"
+#include "media/cast/net/cast_transport_config.h"
#ifndef OFFICIAL_BUILD
@@ -28,20 +28,20 @@ void FakeSoftwareVideoEncoder::Initialize() {}
bool FakeSoftwareVideoEncoder::Encode(
const scoped_refptr<media::VideoFrame>& video_frame,
- transport::EncodedFrame* encoded_image) {
+ EncodedFrame* encoded_image) {
encoded_image->frame_id = frame_id_++;
if (next_frame_is_key_) {
- encoded_image->dependency = transport::EncodedFrame::KEY;
+ encoded_image->dependency = 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->dependency = EncodedFrame::DEPENDENT;
encoded_image->referenced_frame_id = encoded_image->frame_id - 1;
}
base::DictionaryValue values;
values.SetBoolean("key",
- encoded_image->dependency == transport::EncodedFrame::KEY);
+ encoded_image->dependency == EncodedFrame::KEY);
values.SetInteger("ref", encoded_image->referenced_frame_id);
values.SetInteger("id", encoded_image->frame_id);
values.SetInteger("size", frame_size_);
« no previous file with comments | « media/cast/sender/fake_software_video_encoder.h ('k') | media/cast/sender/rtp_timestamp_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698