webrtc/video_engine/vie_encoder.cc - Issue 1371043003: Unify FrameType and VideoFrameType.

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: webrtc/video_engine/vie_encoder.cc

Issue 1371043003: Unify FrameType and VideoFrameType. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase Created 5 years, 2 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:

Index: webrtc/video_engine/vie_encoder.cc

diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc

index 45e9612358a1bfc580940c081223041144b2317f..4d41e0e1ae8247ead2388a3b28cd14643df4699f 100644

--- a/webrtc/video_engine/vie_encoder.cc

+++ b/webrtc/video_engine/vie_encoder.cc

@@ -558,10 +558,11 @@ int32_t ViEEncoder::SendData(

stats_proxy_->OnSendEncodedImage(encoded_image, rtp_video_hdr);

return send_payload_router_->RoutePayload(

- VCMEncodedFrame::ConvertFrameType(encoded_image._frameType), payload_type,

- encoded_image._timeStamp, encoded_image.capture_time_ms_,

- encoded_image._buffer, encoded_image._length, &fragmentation_header,

- rtp_video_hdr) ? 0 : -1;

+ encoded_image._frameType, payload_type, encoded_image._timeStamp,

+ encoded_image.capture_time_ms_, encoded_image._buffer,

+ encoded_image._length, &fragmentation_header, rtp_video_hdr)

+ ? 0

+ : -1;

}

int32_t ViEEncoder::SendStatistics(const uint32_t bit_rate,

« no previous file with comments | « webrtc/video_engine/vie_channel.h ('k') | webrtc/video_frame.h » ('j') | no next file with comments »