Title: [165176] trunk/Source/WebCore
- Revision
- 165176
- Author
- [email protected]
- Date
- 2014-03-06 00:55:09 -0800 (Thu, 06 Mar 2014)
Log Message
Unreviewed, rolling out r165175.
http://trac.webkit.org/changeset/165175
https://bugs.webkit.org/show_bug.cgi?id=129788
Linking failures on GTK, EFL due to missing gstreamer-tag-1.0
dependency (Requested by zdobersek on #webkit).
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
(WebCore::TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165175 => 165176)
--- trunk/Source/WebCore/ChangeLog 2014-03-06 08:02:53 UTC (rev 165175)
+++ trunk/Source/WebCore/ChangeLog 2014-03-06 08:55:09 UTC (rev 165176)
@@ -1,3 +1,15 @@
+2014-03-06 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r165175.
+ http://trac.webkit.org/changeset/165175
+ https://bugs.webkit.org/show_bug.cgi?id=129788
+
+ Linking failures on GTK, EFL due to missing gstreamer-tag-1.0
+ dependency (Requested by zdobersek on #webkit).
+
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
+ (WebCore::TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged):
+
2014-03-05 Brendan Long <[email protected]>
[GStreamer] human readable language code for tracks
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp (165175 => 165176)
--- trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2014-03-06 08:02:53 UTC (rev 165175)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2014-03-06 08:55:09 UTC (rev 165176)
@@ -34,9 +34,7 @@
#include "TrackPrivateBase.h"
#include <glib-object.h>
#include <gst/gst.h>
-#include <gst/tag/tag.h>
#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/text/CString.h>
GST_DEBUG_CATEGORY_EXTERN(webkit_media_player_debug);
#define GST_CAT_DEFAULT webkit_media_player_debug
@@ -161,9 +159,6 @@
return;
TrackPrivateBaseClient* client = m_owner->client();
- if (!client)
- return;
-
GRefPtr<GstTagList> tags;
{
MutexLocker lock(m_tagMutex);
@@ -172,18 +167,11 @@
if (!tags)
return;
- if (getTag(tags.get(), GST_TAG_TITLE, m_label))
+ if (getTag(tags.get(), GST_TAG_TITLE, m_label) && client)
client->labelChanged(m_owner, m_label);
- String language;
- if (getTag(tags.get(), GST_TAG_LANGUAGE_CODE, language)) {
- language = gst_tag_get_language_code_iso_639_1(language.utf8().data());
- INFO_MEDIA_MESSAGE("Converted track %d's language code to %s.", m_index, language.utf8().data());
- if (language != m_language) {
- m_language = language;
- client->languageChanged(m_owner, m_language);
- }
- }
+ if (getTag(tags.get(), GST_TAG_LANGUAGE_CODE, m_language) && client)
+ client->languageChanged(m_owner, m_language);
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
