Summary: | Implement incoming webrtc data based on tracks | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | youenn fablet <youennf> | ||||||||||
Component: | WebCore Misc. | Assignee: | youenn fablet <youennf> | ||||||||||
Status: | RESOLVED FIXED | ||||||||||||
Severity: | Normal | CC: | achristensen, commit-queue, eric.carlson | ||||||||||
Priority: | P2 | ||||||||||||
Version: | WebKit Nightly Build | ||||||||||||
Hardware: | Unspecified | ||||||||||||
OS: | Unspecified | ||||||||||||
Attachments: |
|
Description
youenn fablet
2017-03-17 16:03:48 PDT
Created attachment 304833 [details]
Patch
Comment on attachment 304833 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304833&action=review > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:245 > + for (size_t cptr = 0; cptr < m_pendingReceivers.size(); ++cptr) { > + if (m_pendingReceivers[cptr]->track()->source().type() == RealtimeMediaSource::Type::Video) { > + Ref<RTCRtpReceiver> receiver = m_pendingReceivers[cptr].copyRef(); > + m_pendingReceivers.remove(cptr); > + Ref<RealtimeIncomingVideoSource> source = static_cast<RealtimeIncomingVideoSource&>(receiver->track()->source()); > + return { WTFMove(receiver), WTFMove(source) }; > + } > + } It is worth adding a comment about why "trackId" isn't used in this case and filing a bug to fix it when possible. > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:261 > + for (size_t cptr = 0; cptr < m_pendingReceivers.size(); ++cptr) { > + if (m_pendingReceivers[cptr]->track()->source().type() == RealtimeMediaSource::Type::Audio) { > + Ref<RTCRtpReceiver> receiver = m_pendingReceivers[cptr].copyRef(); > + m_pendingReceivers.remove(cptr); > + Ref<RealtimeIncomingAudioSource> source = static_cast<RealtimeIncomingAudioSource&>(receiver->track()->source()); > + return { WTFMove(receiver), WTFMove(source) }; > + } > + } Ditto. Created attachment 304838 [details]
Patch for landing
Comment on attachment 304838 [details] Patch for landing Rejecting attachment 304838 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 304838, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: file Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.h patching file LayoutTests/ChangeLog Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file LayoutTests/ChangeLog.rej patching file LayoutTests/webrtc/video-with-receiver-expected.txt patching file LayoutTests/webrtc/video-with-receiver.html patching file LayoutTests/webrtc/video.html Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/3352837 Created attachment 304841 [details]
Patch for landing
Created attachment 304843 [details]
Patch for landing
Comment on attachment 304843 [details] Patch for landing Clearing flags on attachment: 304843 Committed r214132: <http://trac.webkit.org/changeset/214132> All reviewed patches have been landed. Closing bug. |