Diff
Modified: trunk/ChangeLog (183387 => 183388)
--- trunk/ChangeLog 2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/ChangeLog 2015-04-27 06:47:26 UTC (rev 183388)
@@ -1,3 +1,13 @@
+2015-04-24 Philippe Normand <[email protected]>
+
+ [JHBuild] Move to upstream OpenWebRTC
+ https://bugs.webkit.org/show_bug.cgi?id=144145
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/FindOpenWebRTC.cmake: Check the presence of the
+ owr-gst library.
+
2015-04-26 Yusuke Suzuki <[email protected]>
[ES6] Implement ES6 template literals
Modified: trunk/Source/WebCore/ChangeLog (183387 => 183388)
--- trunk/Source/WebCore/ChangeLog 2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Source/WebCore/ChangeLog 2015-04-27 06:47:26 UTC (rev 183388)
@@ -1,3 +1,13 @@
+2015-04-24 Philippe Normand <[email protected]>
+
+ [JHBuild] Move to upstream OpenWebRTC
+ https://bugs.webkit.org/show_bug.cgi?id=144145
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp:
+ (WebCore::initializeOpenWebRTC): Update with new owr_init API.
+
2015-04-17 Carlos Garcia Campos <[email protected]>
[SOUP] Add initial implementation of NetworkProcess disk cache
Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp (183387 => 183388)
--- trunk/Source/WebCore/platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp 2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp 2015-04-27 06:47:26 UTC (rev 183388)
@@ -44,7 +44,7 @@
void initializeOpenWebRTC()
{
- owr_init_with_main_context(g_main_context_default());
+ owr_init(g_main_context_default());
}
}
Modified: trunk/Source/cmake/FindOpenWebRTC.cmake (183387 => 183388)
--- trunk/Source/cmake/FindOpenWebRTC.cmake 2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Source/cmake/FindOpenWebRTC.cmake 2015-04-27 06:47:26 UTC (rev 183388)
@@ -30,7 +30,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig)
-pkg_check_modules(OPENWEBRTC openwebrtc-0.1)
+pkg_check_modules(OPENWEBRTC openwebrtc-0.1 openwebrtc-gst-0.1)
set(VERSION_OK TRUE)
if (OPENWEBRTC_VERSION)
Modified: trunk/Tools/ChangeLog (183387 => 183388)
--- trunk/Tools/ChangeLog 2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Tools/ChangeLog 2015-04-27 06:47:26 UTC (rev 183388)
@@ -1,3 +1,17 @@
+2015-04-24 Philippe Normand <[email protected]>
+
+ [JHBuild] Move to upstream OpenWebRTC
+ https://bugs.webkit.org/show_bug.cgi?id=144145
+
+ Reviewed by Carlos Garcia Campos.
+
+ * efl/jhbuild.modules: Switch to upstream OpenWebRTC repository
+ and add a new simple patch to gst-plugins-base, required for
+ OpenWebRTC build.
+ * efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch: Added.
+ * gtk/jhbuild.modules: Ditto.
+ * gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch: Added.
+
2015-04-26 Yusuke Suzuki <[email protected]>
[ES6] Implement ES6 template literals
Modified: trunk/Tools/efl/jhbuild.modules (183387 => 183388)
--- trunk/Tools/efl/jhbuild.modules 2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Tools/efl/jhbuild.modules 2015-04-27 06:47:26 UTC (rev 183388)
@@ -256,6 +256,7 @@
repo="gstreamer"
hash="sha256:49cd9e8f23c416b1607b43837a09833fa03e0106929d81ead2ddfde6c0ade44b"
md5sum="0c42eca8f9e4efd56d2ce8e9249ce4a1">
+ <patch file="gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch" strip="1"/>
</branch>
</autotools>
@@ -343,14 +344,14 @@
</branch>
</autotools>
- <autotools id="openwebrtc" autogenargs="--enable-bridge=no">
+ <autotools id="openwebrtc" autogenargs="--enable-bridge=no --enable-owr-gst=yes">
<dependencies>
<dep package="gst-plugins-openwebrtc"/>
<dep package="libnice"/>
</dependencies>
- <branch repo="github.com" module="WebRTCinWebKit/openwebrtc/archive/1598e6f612d257196db70d0cf930ede94f83497a.tar.gz" checkoutdir="openwebrtc" version="configurable-sinks"
- hash="sha256:584922ffd4cef9f991e6035bb6d87f6b09ded23e245d1ff15db3c0af9cddcf29"
- md5sum="1598e6f612d257196db70d0cf930ede94f83497a.tar.gz" size="243435">
+ <branch repo="github.com" module="EricssonResearch/openwebrtc/archive/13516c7f79a0c48bb411464f7613d4b426c70f5b.tar.gz" checkoutdir="openwebrtc" version="13516c7f79a0c48bb411464f7613d4b426c70f5b"
+ hash="sha256:c849d36d97c17a198a5d9c180f13f14c7897c9236e2384ea11029e23b09b59ac"
+ md5sum="13516c7f79a0c48bb411464f7613d4b426c70f5b.tar.gz" size="258936">
</branch>
</autotools>
Added: trunk/Tools/efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch (0 => 183388)
--- trunk/Tools/efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch (rev 0)
+++ trunk/Tools/efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch 2015-04-27 06:47:26 UTC (rev 183388)
@@ -0,0 +1,45 @@
+From dfc34c58411f50b37b2e1300560ae8a0b6a9a7d4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
+Date: Tue, 7 Apr 2015 16:43:59 +0100
+Subject: [PATCH] rtp: rtcpbuffer: fix typo in enum
+
+and in docs. Spotted by Rob Swain.
+---
+ gst-libs/gst/rtp/gstrtcpbuffer.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/gst-libs/gst/rtp/gstrtcpbuffer.h b/gst-libs/gst/rtp/gstrtcpbuffer.h
+index b5ff4a1..47378cf 100644
+--- a/gst-libs/gst/rtp/gstrtcpbuffer.h
++++ b/gst-libs/gst/rtp/gstrtcpbuffer.h
+@@ -59,6 +59,9 @@ typedef enum
+ GST_RTCP_TYPE_PSFB = 206
+ } GstRTCPType;
+
++/* FIXME 2.0: backwards compatibility define for enum typo */
++#define GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ
++
+ /**
+ * GstRTCPFBType:
+ * @GST_RTCP_FB_TYPE_INVALID: Invalid type
+@@ -66,7 +69,7 @@ typedef enum
+ * @GST_RTCP_RTPFB_TYPE_TMMBR: Temporary Maximum Media Stream Bit Rate Request
+ * @GST_RTCP_RTPFB_TYPE_TMMBN: Temporary Maximum Media Stream Bit Rate
+ * Notification
+- * @GST_RTCP_RTPFB_TYPE_RTCP_SR_SEQ: Request an SR packet for early
++ * @GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ: Request an SR packet for early
+ * synchronization
+ * @GST_RTCP_PSFB_TYPE_PLI: Picture Loss Indication
+ * @GST_RTCP_PSFB_TYPE_SLI: Slice Loss Indication
+@@ -89,7 +92,7 @@ typedef enum
+ GST_RTCP_RTPFB_TYPE_TMMBR = 3,
+ GST_RTCP_RTPFB_TYPE_TMMBN = 4,
+ /* RTPFB types assigned in RFC 6051 */
+- GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ = 5,
++ GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ = 5,
+ /* PSFB types */
+ GST_RTCP_PSFB_TYPE_PLI = 1,
+ GST_RTCP_PSFB_TYPE_SLI = 2,
+--
+2.1.4
+
Modified: trunk/Tools/gtk/jhbuild.modules (183387 => 183388)
--- trunk/Tools/gtk/jhbuild.modules 2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Tools/gtk/jhbuild.modules 2015-04-27 06:47:26 UTC (rev 183388)
@@ -292,6 +292,7 @@
repo="gstreamer"
hash="sha256:49cd9e8f23c416b1607b43837a09833fa03e0106929d81ead2ddfde6c0ade44b"
md5sum="0c42eca8f9e4efd56d2ce8e9249ce4a1">
+ <patch file="gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch" strip="1"/>
</branch>
</autotools>
@@ -381,12 +382,12 @@
<branch repo="freedesktop-git" module="libnice/libnice.git" tag="0.1.10" checkoutdir="libnice"/>
</autotools>
- <autotools id="openwebrtc" autogenargs="--enable-bridge=no">
+ <autotools id="openwebrtc" autogenargs="--enable-bridge=no --enable-owr-gst=yes">
<dependencies>
<dep package="gst-plugins-openwebrtc"/>
<dep package="libnice"/>
</dependencies>
- <branch repo="github.com" module="WebRTCinWebKit/openwebrtc.git" checkoutdir="openwebrtc" tag="1598e6f612d257196db70d0cf930ede94f83497a"/>
+ <branch repo="github.com" module="EricssonResearch/openwebrtc.git" checkoutdir="openwebrtc" tag="13516c7f79a0c48bb411464f7613d4b426c70f5b"/>
</autotools>
</moduleset>
Added: trunk/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch (0 => 183388)
--- trunk/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch (rev 0)
+++ trunk/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch 2015-04-27 06:47:26 UTC (rev 183388)
@@ -0,0 +1,45 @@
+From dfc34c58411f50b37b2e1300560ae8a0b6a9a7d4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
+Date: Tue, 7 Apr 2015 16:43:59 +0100
+Subject: [PATCH] rtp: rtcpbuffer: fix typo in enum
+
+and in docs. Spotted by Rob Swain.
+---
+ gst-libs/gst/rtp/gstrtcpbuffer.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/gst-libs/gst/rtp/gstrtcpbuffer.h b/gst-libs/gst/rtp/gstrtcpbuffer.h
+index b5ff4a1..47378cf 100644
+--- a/gst-libs/gst/rtp/gstrtcpbuffer.h
++++ b/gst-libs/gst/rtp/gstrtcpbuffer.h
+@@ -59,6 +59,9 @@ typedef enum
+ GST_RTCP_TYPE_PSFB = 206
+ } GstRTCPType;
+
++/* FIXME 2.0: backwards compatibility define for enum typo */
++#define GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ
++
+ /**
+ * GstRTCPFBType:
+ * @GST_RTCP_FB_TYPE_INVALID: Invalid type
+@@ -66,7 +69,7 @@ typedef enum
+ * @GST_RTCP_RTPFB_TYPE_TMMBR: Temporary Maximum Media Stream Bit Rate Request
+ * @GST_RTCP_RTPFB_TYPE_TMMBN: Temporary Maximum Media Stream Bit Rate
+ * Notification
+- * @GST_RTCP_RTPFB_TYPE_RTCP_SR_SEQ: Request an SR packet for early
++ * @GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ: Request an SR packet for early
+ * synchronization
+ * @GST_RTCP_PSFB_TYPE_PLI: Picture Loss Indication
+ * @GST_RTCP_PSFB_TYPE_SLI: Slice Loss Indication
+@@ -89,7 +92,7 @@ typedef enum
+ GST_RTCP_RTPFB_TYPE_TMMBR = 3,
+ GST_RTCP_RTPFB_TYPE_TMMBN = 4,
+ /* RTPFB types assigned in RFC 6051 */
+- GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ = 5,
++ GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ = 5,
+ /* PSFB types */
+ GST_RTCP_PSFB_TYPE_PLI = 1,
+ GST_RTCP_PSFB_TYPE_SLI = 2,
+--
+2.1.4
+
