Title: [241251] trunk/Source/WebCore
- Revision
- 241251
- Author
- [email protected]
- Date
- 2019-02-10 11:34:10 -0800 (Sun, 10 Feb 2019)
Log Message
Unreviewed, GTK Debug build fix after r241148.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::removeSamplesFromTrackBuffer):
SourceBuffer::logClassName and friends are declared for
!RELEASE_LOG_DISABLED builds so adapt calling sites accordingly.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (241250 => 241251)
--- trunk/Source/WebCore/ChangeLog 2019-02-10 18:03:52 UTC (rev 241250)
+++ trunk/Source/WebCore/ChangeLog 2019-02-10 19:34:10 UTC (rev 241251)
@@ -1,3 +1,12 @@
+2019-02-10 Philippe Normand <[email protected]>
+
+ Unreviewed, GTK Debug build fix after r241148.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::removeSamplesFromTrackBuffer):
+ SourceBuffer::logClassName and friends are declared for
+ !RELEASE_LOG_DISABLED builds so adapt calling sites accordingly.
+
2019-02-10 Zalan Bujtas <[email protected]>
[LFC][IFC] Add intrinsic width support for inline-block boxes
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (241250 => 241251)
--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2019-02-10 18:03:52 UTC (rev 241250)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2019-02-10 19:34:10 UTC (rev 241251)
@@ -735,7 +735,7 @@
static PlatformTimeRanges removeSamplesFromTrackBuffer(const DecodeOrderSampleMap::MapType& samples, SourceBuffer::TrackBuffer& trackBuffer, const SourceBuffer* buffer, const char* logPrefix)
{
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
MediaTime earliestSample = MediaTime::positiveInfiniteTime();
MediaTime latestSample = MediaTime::zeroTime();
size_t bytesRemoved = 0;
@@ -750,13 +750,13 @@
PlatformTimeRanges erasedRanges;
for (const auto& sampleIt : samples) {
const DecodeOrderSampleMap::KeyType& decodeKey = sampleIt.first;
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
size_t startBufferSize = trackBuffer.samples.sizeInBytes();
#endif
const RefPtr<MediaSample>& sample = sampleIt.second;
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
if (willLog)
logger.debug(buffer->logChannel(), logIdentifier, "removing sample ", *sampleIt.second);
#endif
@@ -771,7 +771,7 @@
auto endTime = startTime + sample->duration();
erasedRanges.add(startTime, endTime);
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
bytesRemoved += startBufferSize - trackBuffer.samples.sizeInBytes();
if (startTime < earliestSample)
earliestSample = startTime;
@@ -808,7 +808,7 @@
if (additionalErasedRanges.length())
erasedRanges.unionWith(additionalErasedRanges);
-#if !LOG_DISABLED
+#if !RELEASE_LOG_DISABLED
if (bytesRemoved && willLog)
logger.debug(buffer->logChannel(), logIdentifier, "removed ", bytesRemoved, ", start = ", earliestSample, ", end = ", latestSample);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
