Title: [278341] trunk/Source/WebCore
- Revision
- 278341
- Author
- [email protected]
- Date
- 2021-06-02 01:01:46 -0700 (Wed, 02 Jun 2021)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (278340 => 278341)
--- trunk/Source/WebCore/ChangeLog 2021-06-02 06:45:51 UTC (rev 278340)
+++ trunk/Source/WebCore/ChangeLog 2021-06-02 08:01:46 UTC (rev 278341)
@@ -1,3 +1,26 @@
+2021-06-02 Youenn Fablet <[email protected]>
+
+ 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 <[email protected]>
Remove <wtf/Optional.h>
Modified: trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.cpp (278340 => 278341)
--- trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.cpp 2021-06-02 06:45:51 UTC (rev 278340)
+++ trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.cpp 2021-06-02 08:01:46 UTC (rev 278341)
@@ -53,6 +53,10 @@
auto renderer = AudioMediaStreamTrackRenderer::create();
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)
stream->createNewRenderer();
@@ -60,15 +64,6 @@
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()
{
if (m_isCleared)
Modified: trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h (278340 => 278341)
--- trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h 2021-06-02 06:45:51 UTC (rev 278340)
+++ trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h 2021-06-02 08:01:46 UTC (rev 278341)
@@ -65,7 +65,6 @@
bool muted() const { return m_muted; }
#if !RELEASE_LOG_DISABLED
- void setLogger(const Logger&, const void*) final;
const char* logClassName() const final { return "AudioTrackPrivateMediaStream"; }
#endif
Modified: trunk/Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp (278340 => 278341)
--- trunk/Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp 2021-06-02 06:45:51 UTC (rev 278340)
+++ trunk/Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp 2021-06-02 08:01:46 UTC (rev 278341)
@@ -113,6 +113,9 @@
if (!weakThis)
return;
+#if !RELEASE_LOG_DISABLED
+ newSource->setLogger(logger(), logIdentifier());
+#endif
if (oldSource)
AudioMediaStreamTrackRendererUnit::singleton().removeSource(*oldSource);
Modified: trunk/Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererUnit.cpp (278340 => 278341)
--- trunk/Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererUnit.cpp 2021-06-02 06:45:51 UTC (rev 278340)
+++ trunk/Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererUnit.cpp 2021-06-02 08:01:46 UTC (rev 278341)
@@ -81,7 +81,9 @@
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());
ASSERT(!m_sources.contains(source.get()));
@@ -100,7 +102,9 @@
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());
bool shouldStop = !m_sources.isEmpty();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
