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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Created 5 years, 3 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
« webrtc/video/encoded_frame_callback_adapter.cc ('K') | « webrtc/video_engine/vie_channel.h ('k') | webrtc/video_frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_engine/vie_encoder.cc
diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc
index cc4783f55bc4c0e20b34fefbe2ae5c289b1ad1ed..1cae8d7ca53c1bd16ce2a8663dc02e894f4583a8 100644
--- a/webrtc/video_engine/vie_encoder.cc
+++ b/webrtc/video_engine/vie_encoder.cc
@@ -594,10 +594,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,
« webrtc/video/encoded_frame_callback_adapter.cc ('K') | « webrtc/video_engine/vie_channel.h ('k') | webrtc/video_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698