Changeset 214043 in webkit

Timestamp:

Mar 16, 2017 8:23:00 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

LibWebRTC outgoing source should be thread safe refcounted
​https://bugs.webkit.org/show_bug.cgi?id=169726

Patch by Youenn Fablet <​youenn@apple.com> on 2017-03-16
Reviewed by Alex Christensen.

Preventive fix.
Also fixing the size of the buffer for the audio source as its reserved size is byte count.

• platform/mediastream/mac/RealtimeOutgoingAudioSource.h:
• platform/mediastream/mac/RealtimeOutgoingVideoSource.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/mac/RealtimeOutgoingAudioSource.h (modified) (3 diffs)
• platform/mediastream/mac/RealtimeOutgoingVideoSource.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-16  Youenn Fablet  <youenn@apple.com>
+
+        LibWebRTC outgoing source should be thread safe refcounted
+        https://bugs.webkit.org/show_bug.cgi?id=169726
+
+        Reviewed by Alex Christensen.
+
+        Preventive fix.
+        Also fixing the size of the buffer for the audio source as its reserved size is byte count.
+
+        * platform/mediastream/mac/RealtimeOutgoingAudioSource.h:
+        * platform/mediastream/mac/RealtimeOutgoingVideoSource.h:
+
 2017-03-16  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h

@@ -35 +35 @@
 #include "RealtimeMediaSource.h"
 #include <webrtc/api/mediastreaminterface.h>
+#include <wtf/ThreadSafeRefCounted.h>
 
 namespace webrtc {
@@ -43 +44 @@
 namespace WebCore {
 
-class RealtimeOutgoingAudioSource final : public RefCounted<RealtimeOutgoingAudioSource>, public webrtc::AudioSourceInterface, private RealtimeMediaSource::Observer {
+class RealtimeOutgoingAudioSource final : public ThreadSafeRefCounted<RealtimeOutgoingAudioSource>, public webrtc::AudioSourceInterface, private RealtimeMediaSource::Observer {
 public:
     static Ref<RealtimeOutgoingAudioSource> create(Ref<RealtimeMediaSource>&& audioSource) { return adoptRef(*new RealtimeOutgoingAudioSource(WTFMove(audioSource))); }
@@ -77 +78 @@
     CAAudioStreamDescription m_outputStreamDescription;
 
-    Vector<uint16_t> m_audioBuffer;
+    Vector<uint8_t> m_audioBuffer;
     uint64_t m_startFrame { 0 };
     bool m_muted { false };

trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.h

@@ -37 +37 @@
 #include <webrtc/common_video/include/i420_buffer_pool.h>
 #include <webrtc/media/base/videosinkinterface.h>
+#include <wtf/ThreadSafeRefCounted.h>
 
 namespace WebCore {
 
-class RealtimeOutgoingVideoSource final : public RefCounted<RealtimeOutgoingVideoSource>, public webrtc::VideoTrackSourceInterface, private RealtimeMediaSource::Observer {
+class RealtimeOutgoingVideoSource final : public ThreadSafeRefCounted<RealtimeOutgoingVideoSource>, public webrtc::VideoTrackSourceInterface, private RealtimeMediaSource::Observer {
 public:
     static Ref<RealtimeOutgoingVideoSource> create(Ref<RealtimeMediaSource>&& videoSource) { return adoptRef(*new RealtimeOutgoingVideoSource(WTFMove(videoSource))); }