17 lines
1.0 KiB
Diff
17 lines
1.0 KiB
Diff
|
diff -up firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
|
||
|
|
diff -up firefox-68.0/media/webrtc/trunk/Makefile.old firefox-68.0/media/webrtc/trunk/Makefile
|
||
|
|
diff -up firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc.old firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
|
||
|
|
--- firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc.old 2019-07-10 20:10:04.420328534 +0200
|
||
|
|
+++ firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc 2019-07-10 20:13:48.766658793 +0200
|
||
|
|
@@ -62,6 +62,10 @@ typedef void* SockOptArg;
|
||
|
|
|
||
|
|
#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__)
|
||
|
|
|
||
|
|
+#ifndef SIOCGSTAMP
|
||
|
|
+#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
int64_t GetSocketRecvTimestamp(int socket) {
|
||
|
|
struct timeval tv_ioctl;
|
||
|
|
int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl);
|