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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1376673004: Add a PacketOptions struct to webrtc::Transport. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comment added 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:
View unified diff | Download patch
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.h ('k') | talk/media/webrtc/webrtcvoiceengine.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 1640 matching lines...) Expand 10 before | Expand all | Expand 10 after
1651 if (kv.second != nullptr 1651 if (kv.second != nullptr
1652 && !kv.second->IsScreencast() 1652 && !kv.second->IsScreencast()
1653 && kv.second->video_adapter() != nullptr) { 1653 && kv.second->video_adapter() != nullptr) {
1654 kv.second->video_adapter()->OnCpuResolutionRequest( 1654 kv.second->video_adapter()->OnCpuResolutionRequest(
1655 load == kOveruse ? CoordinatedVideoAdapter::DOWNGRADE 1655 load == kOveruse ? CoordinatedVideoAdapter::DOWNGRADE
1656 : CoordinatedVideoAdapter::UPGRADE); 1656 : CoordinatedVideoAdapter::UPGRADE);
1657 } 1657 }
1658 } 1658 }
1659 } 1659 }
1660 1660
1661 bool WebRtcVideoChannel2::SendRtp(const uint8_t* data, size_t len) { 1661 bool WebRtcVideoChannel2::SendRtp(const uint8_t* data,
1662 size_t len,
1663 const webrtc::PacketOptions& options) {
1662 rtc::Buffer packet(data, len, kMaxRtpPacketLen); 1664 rtc::Buffer packet(data, len, kMaxRtpPacketLen);
1663 return MediaChannel::SendPacket(&packet); 1665 return MediaChannel::SendPacket(&packet);
1664 } 1666 }
1665 1667
1666 bool WebRtcVideoChannel2::SendRtcp(const uint8_t* data, size_t len) { 1668 bool WebRtcVideoChannel2::SendRtcp(const uint8_t* data, size_t len) {
1667 rtc::Buffer packet(data, len, kMaxRtpPacketLen); 1669 rtc::Buffer packet(data, len, kMaxRtpPacketLen);
1668 return MediaChannel::SendRtcp(&packet); 1670 return MediaChannel::SendRtcp(&packet);
1669 } 1671 }
1670 1672
1671 void WebRtcVideoChannel2::StartAllSendStreams() { 1673 void WebRtcVideoChannel2::StartAllSendStreams() {
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after
2736 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2738 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2737 } 2739 }
2738 } 2740 }
2739 2741
2740 return video_codecs; 2742 return video_codecs;
2741 } 2743 }
2742 2744
2743 } // namespace cricket 2745 } // namespace cricket
2744 2746
2745 #endif // HAVE_WEBRTC_VIDEO 2747 #endif // HAVE_WEBRTC_VIDEO
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.h ('k') | talk/media/webrtc/webrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698