Title: [211026] trunk/Source/WebCore
- Revision
- 211026
- Author
- [email protected]
- Date
- 2017-01-22 00:29:30 -0800 (Sun, 22 Jan 2017)
Log Message
[GStreamer] Clear out m_appsinkCaps in AppendPipeline::appsinkCapsChanged() before using outPtr()
https://bugs.webkit.org/show_bug.cgi?id=167165
Reviewed by Carlos Garcia Campos.
* platform/graphics/gstreamer/mse/AppendPipeline.cpp:
(WebCore::AppendPipeline::appsinkCapsChanged): Replace the gst_caps_replace() call
with a simple comparison and, in case the current appsink caps differ from the caps
on the sink's pad, move the reference to the latter into the m_appsinkCaps member
variable. This removes the use of GRefPtr<>::outPtr() which asserted in debug
configurations in the case of m_appsinkCaps not being null.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (211025 => 211026)
--- trunk/Source/WebCore/ChangeLog 2017-01-22 06:44:49 UTC (rev 211025)
+++ trunk/Source/WebCore/ChangeLog 2017-01-22 08:29:30 UTC (rev 211026)
@@ -1,3 +1,17 @@
+2017-01-22 Zan Dobersek <[email protected]>
+
+ [GStreamer] Clear out m_appsinkCaps in AppendPipeline::appsinkCapsChanged() before using outPtr()
+ https://bugs.webkit.org/show_bug.cgi?id=167165
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/graphics/gstreamer/mse/AppendPipeline.cpp:
+ (WebCore::AppendPipeline::appsinkCapsChanged): Replace the gst_caps_replace() call
+ with a simple comparison and, in case the current appsink caps differ from the caps
+ on the sink's pad, move the reference to the latter into the m_appsinkCaps member
+ variable. This removes the use of GRefPtr<>::outPtr() which asserted in debug
+ configurations in the case of m_appsinkCaps not being null.
+
2017-01-21 Chris Dumez <[email protected]>
_javascript_ for-of does not work on a lot of collection types (e.g. HTMLCollection)
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp (211025 => 211026)
--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp 2017-01-22 06:44:49 UTC (rev 211025)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp 2017-01-22 08:29:30 UTC (rev 211026)
@@ -602,7 +602,8 @@
// This means that we're right after a new track has appeared. Otherwise, it's a caps change inside the same track.
bool previousCapsWereNull = !m_appsinkCaps;
- if (gst_caps_replace(&m_appsinkCaps.outPtr(), caps.get())) {
+ if (m_appsinkCaps != caps) {
+ m_appsinkCaps = WTFMove(caps);
if (m_playerPrivate && previousCapsWereNull)
m_playerPrivate->trackDetected(this, m_oldTrack, m_track);
didReceiveInitializationSegment();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
