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

Unified Diff: media/cast/video_receiver/video_receiver.h

Issue 126843003: Revert of Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/video_receiver/video_decoder_unittest.cc ('k') | media/cast/video_receiver/video_receiver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_receiver/video_receiver.h
diff --git a/media/cast/video_receiver/video_receiver.h b/media/cast/video_receiver/video_receiver.h
index bb7b3a7a1c8d13fb4099f63fada1efefc55dcd54..404f9f66411c66963555a990006cb94ff69b947a 100644
--- a/media/cast/video_receiver/video_receiver.h
+++ b/media/cast/video_receiver/video_receiver.h
@@ -61,7 +61,7 @@
const RtpCastHeader& rtp_header);
void DecodeVideoFrameThread(
- scoped_ptr<transport::EncodedVideoFrame> encoded_frame,
+ scoped_ptr<EncodedVideoFrame> encoded_frame,
const base::TimeTicks render_time,
const VideoFrameDecodedCallback& frame_decoded_callback);
@@ -72,16 +72,15 @@
void CastFeedback(const RtcpCastMessage& cast_message);
void DecodeVideoFrame(const VideoFrameDecodedCallback& callback,
- scoped_ptr<transport::EncodedVideoFrame> encoded_frame,
+ scoped_ptr<EncodedVideoFrame> encoded_frame,
const base::TimeTicks& render_time);
- bool DecryptVideoFrame(scoped_ptr<transport::EncodedVideoFrame>* video_frame);
+ bool DecryptVideoFrame(scoped_ptr<EncodedVideoFrame>* video_frame);
- bool PullEncodedVideoFrame(
- uint32 rtp_timestamp,
- bool next_frame,
- scoped_ptr<transport::EncodedVideoFrame>* encoded_frame,
- base::TimeTicks* render_time);
+ bool PullEncodedVideoFrame(uint32 rtp_timestamp,
+ bool next_frame,
+ scoped_ptr<EncodedVideoFrame>* encoded_frame,
+ base::TimeTicks* render_time);
void PlayoutTimeout();
@@ -105,7 +104,7 @@
scoped_ptr<VideoDecoder> video_decoder_;
scoped_refptr<CastEnvironment> cast_environment_;
scoped_ptr<Framer> framer_;
- const transport::VideoCodec codec_;
+ const VideoCodec codec_;
base::TimeDelta target_delay_delta_;
base::TimeDelta frame_delay_;
scoped_ptr<LocalRtpVideoData> incoming_payload_callback_;
« no previous file with comments | « media/cast/video_receiver/video_decoder_unittest.cc ('k') | media/cast/video_receiver/video_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698