trunk/src/media/cast/video_receiver/video_receiver.h - Issue 129113003: Revert 243647 "Cast:Adding cast_transport_config and cleaning up"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 129113003: Revert 243647 "Cast:Adding cast_transport_config and cleaning up" (Closed) Base URL: svn://svn.chromium.org/chrome/

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 | « trunk/src/media/cast/video_receiver/video_decoder_unittest.cc ('k') | trunk/src/media/cast/video_receiver/video_receiver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/media/cast/video_receiver/video_receiver.h

===================================================================

--- trunk/src/media/cast/video_receiver/video_receiver.h (revision 243647)

+++ trunk/src/media/cast/video_receiver/video_receiver.h (working copy)

@@ -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_;