Changeset 278341 in webkit

Timestamp:

Jun 2, 2021, 1:01:46 AM (5 years ago)

Author:

youenn@apple.com

Message:

Improve AudioMediaStreamTrackRendererUnit logging to know which source is being played
​https://bugs.webkit.org/show_bug.cgi?id=226466

Reviewed by Eric Carlson.

Log AudioSampleDataSource identifier when using it with the render unit.
Set AudioSampleDataSource identifier to its MediaStreamTrack/RealtimeMediaSource identifier.
This allows identifying which tracks are being played.

No change of behavior.

• platform/mediastream/AudioTrackPrivateMediaStream.cpp:

(WebCore::AudioTrackPrivateMediaStream::createRenderer):
(WebCore::AudioTrackPrivateMediaStream::setLogger): Deleted.

• platform/mediastream/AudioTrackPrivateMediaStream.h:
• platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:

(WebCore::AudioMediaStreamTrackRendererCocoa::pushSamples):

• platform/mediastream/cocoa/AudioMediaStreamTrackRendererUnit.cpp:

(WebCore::AudioMediaStreamTrackRendererUnit::addSource):
(WebCore::AudioMediaStreamTrackRendererUnit::removeSource):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/AudioTrackPrivateMediaStream.cpp (modified) (2 diffs)
• platform/mediastream/AudioTrackPrivateMediaStream.h (modified) (1 diff)
• platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp (modified) (1 diff)
• platform/mediastream/cocoa/AudioMediaStreamTrackRendererUnit.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-02  Youenn Fablet  <youenn@apple.com>
+
+        Improve AudioMediaStreamTrackRendererUnit logging to know which source is being played
+        https://bugs.webkit.org/show_bug.cgi?id=226466
+
+        Reviewed by Eric Carlson.
+
+        Log AudioSampleDataSource identifier when using it with the render unit.
+        Set AudioSampleDataSource identifier to its MediaStreamTrack/RealtimeMediaSource identifier.
+        This allows identifying which tracks are being played.
+
+        No change of behavior.
+
+        * platform/mediastream/AudioTrackPrivateMediaStream.cpp:
+        (WebCore::AudioTrackPrivateMediaStream::createRenderer):
+        (WebCore::AudioTrackPrivateMediaStream::setLogger): Deleted.
+        * platform/mediastream/AudioTrackPrivateMediaStream.h:
+        * platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:
+        (WebCore::AudioMediaStreamTrackRendererCocoa::pushSamples):
+        * platform/mediastream/cocoa/AudioMediaStreamTrackRendererUnit.cpp:
+        (WebCore::AudioMediaStreamTrackRendererUnit::addSource):
+        (WebCore::AudioMediaStreamTrackRendererUnit::removeSource):
+
 2021-06-01  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.cpp

@@ -54 +54 @@
     if (!renderer)
         return nullptr;
+#if !RELEASE_LOG_DISABLED
+    auto& track = stream.m_streamTrack.get();
+    renderer->setLogger(track.logger(), track.logIdentifier());
+#endif
     renderer->setCrashCallback([stream = makeWeakPtr(stream)] {
         if (stream)
@@ -60 +64 @@
     return renderer;
 }
-
-#if !RELEASE_LOG_DISABLED
-void AudioTrackPrivateMediaStream::setLogger(const Logger& logger, const void* identifier)
-{
-    TrackPrivateBase::setLogger(logger, identifier);
-    if (m_renderer)
-        m_renderer->setLogger(logger, identifier);
-}
-#endif
 
 void AudioTrackPrivateMediaStream::clear()

trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h

@@ -66 +66 @@
 
 #if !RELEASE_LOG_DISABLED
-    void setLogger(const Logger&, const void*) final;
     const char* logClassName() const final { return "AudioTrackPrivateMediaStream"; }
 #endif

trunk/Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp

@@ -114 +114 @@
                 return;
 
+#if !RELEASE_LOG_DISABLED
+            newSource->setLogger(logger(), logIdentifier());
+#endif
             if (oldSource)
                 AudioMediaStreamTrackRendererUnit::singleton().removeSource(*oldSource);

trunk/Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererUnit.cpp

@@ -82 +82 @@
 void AudioMediaStreamTrackRendererUnit::addSource(Ref<AudioSampleDataSource>&& source)
 {
-    RELEASE_LOG(WebRTC, "AudioMediaStreamTrackRendererUnit::addSource");
+#if !RELEASE_LOG_DISABLED
+    source->logger().logAlways(LogWebRTC, "AudioMediaStreamTrackRendererUnit::addSource ", source->logIdentifier());
+#endif
     ASSERT(isMainThread());
 
@@ -101 +103 @@
 void AudioMediaStreamTrackRendererUnit::removeSource(AudioSampleDataSource& source)
 {
-    RELEASE_LOG(WebRTC, "AudioMediaStreamTrackRendererUnit::removeSource");
+#if !RELEASE_LOG_DISABLED
+    source.logger().logAlways(LogWebRTC, "AudioMediaStreamTrackRendererUnit::removeSource ", source.logIdentifier());
+#endif
     ASSERT(isMainThread());