Skip to content

Commit b735c51

Browse files
longsleeplongsleep
committed
Merge branch 'release-0.24'
2 parents 616fe61 + 5dbff2b commit b735c51

24 files changed

+1371
-142
lines changed

‎Godeps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ github.com/longsleep/pkac 0.0.1
66
github.com/satori/go.uuid afe1e2ddf0f05b7c29d388a3f8e76cb15c2231ca
77
github.com/strukturag/goacceptlanguageparser goacceptlanguageparser_v100
88
github.com/strukturag/httputils httputils_v012
9-
github.com/strukturag/phoenix phoenix_v0131
9+
github.com/strukturag/phoenix phoenix_v0133
1010
github.com/strukturag/sloth v0.9.2
11-
code.google.com/p/goconf/... a4db5c465ed1
11+
github.com/dlintw/goconf dcc070983490608a14480e3bf943bad464785df5

‎debian/changelog‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
spreed-webrtc-server (0.24.11) trusty; urgency=medium
2+
3+
* Stop waiting on video early if first video track is enabled but muted.
4+
* Use sh shebang instead of bash to be less Linux specific (#244).
5+
* Updated deps to no longer user code.google.com.
6+
* Fix wrong type for syscall.Setrlimit on FreeBSD (#244) Values are uint64 on Unix but FreeBSD uses int64 for legacy reasons.
7+
* Updated WebRTC adapter to 0.2.10
8+
* Added support to prefer VP9 video codec (works with Chrome >= 48) as experimental setting.
9+
* Only prefer VP9 when experiments are actually enabled.
10+
* Removed local getUserMedia conversion code and use the one provided by the adapter, fixing screen sharing for Chrome >= 49.
11+
* Firefox 44 has fixed gUM permission indicator, so limiting workaround to 43 and lower.
12+
* Restrict VP9 experiment to Chrome >= 48.
13+
14+
-- Simon Eisenmann <[email protected]> Thu, 18 Feb 2016 11:05:49 +0100
15+
116
spreed-webrtc-server (0.24.10) trusty; urgency=medium
217

318
* Avoid to break when there is no mediaDevices.

‎spreed-webrtc-server‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
exec ./bin/spreed-webrtc-server $*

‎src/app/spreed-webrtc-server/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,13 +367,13 @@ func runner(runtime phoenix.Runtime) error {
367367
// Try to increase number of file open files. This only works as root.
368368
maxfd, err := runtime.GetInt("http", "maxfd")
369369
if err == nil {
370-
rLimit.Max = uint64(maxfd)
371-
rLimit.Cur = uint64(maxfd)
370+
rLimit.Max = rlimitType(maxfd)
371+
rLimit.Cur = rlimitType(maxfd)
372372
err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
373373
if err != nil {
374374
log.Println("Error setting max open files", err)
375375
} else {
376-
log.Printf("Set max open files successfully to %d\n", uint64(maxfd))
376+
log.Printf("Set max open files successfully to %d\n", rlimitType(maxfd))
377377
}
378378
}
379379

‎src/app/spreed-webrtc-server/types_freebsd.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// +build freebsd
2+
3+
package main
4+
5+
// Rlimit values are int64 in FreeBSD.
6+
// https://golang.org/src/syscall/ztypes_freebsd_amd64.go
7+
// Intentionally signed, because of legacy code that uses -1 for
8+
// RLIM_INFINITY.
9+
func rlimitType(value int) int64 {
10+
return int64(value)
11+
}

‎src/app/spreed-webrtc-server/types_unix.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// +build !freebsd
2+
3+
package main
4+
5+
// On Unix, rLimit values are uint64.
6+
func rlimitType(value int) uint64 {
7+
return uint64(value)
8+
}

‎src/i18n/messages-de.po‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Spreed WebRTC 1.0\n"
1010
"Report-Msgid-Bugs-To: [email protected]\n"
11-
"POT-Creation-Date: 2015-07-29 11:32+0200\n"
12-
"PO-Revision-Date: 2015-07-29 11:40+0100\n"
11+
"POT-Creation-Date: 2016-02-17 14:15+0100\n"
12+
"PO-Revision-Date: 2016-02-17 14:16+0100\n"
1313
"Last-Translator: Simon Eisenmann <[email protected]>\n"
1414
"Language-Team: struktur AG <[email protected]>\n"
1515
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=utf-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
19-
"Generated-By: Babel 0.9.6\n"
19+
"Generated-By: Babel 1.3\n"
2020

2121
msgid "Standard view"
2222
msgstr "Standardansicht"
@@ -435,6 +435,9 @@ msgstr "Für hohe Auflösung optimieren"
435435
msgid "Reduce video noise"
436436
msgstr "Rauschen reduzieren"
437437

438+
msgid "Prefer VP9 video codec"
439+
msgstr "VP9 Videocodec bevorzugen"
440+
438441
msgid "Enable experiments"
439442
msgstr "Experimente aktivieren"
440443

‎src/i18n/messages-ja.po‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Spreed WebRTC 1.0\n"
1010
"Report-Msgid-Bugs-To: [email protected]\n"
11-
"POT-Creation-Date: 2015-07-29 11:32+0200\n"
11+
"POT-Creation-Date: 2016-02-17 14:15+0100\n"
1212
"PO-Revision-Date: 2014-04-23 22:25+0100\n"
1313
"Last-Translator: Curt Frisemo <[email protected]>\n"
1414
"Language-Team: Curt Frisemo <[email protected]>\n"
1515
"Plural-Forms: nplurals=1; plural=0\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=utf-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
19-
"Generated-By: Babel 0.9.6\n"
19+
"Generated-By: Babel 1.3\n"
2020

2121
msgid "Standard view"
2222
msgstr ""
@@ -428,6 +428,9 @@ msgstr ""
428428
msgid "Reduce video noise"
429429
msgstr ""
430430

431+
msgid "Prefer VP9 video codec"
432+
msgstr ""
433+
431434
msgid "Enable experiments"
432435
msgstr ""
433436

‎src/i18n/messages-ko.po‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Spreed WebRTC 1.0\n"
1010
"Report-Msgid-Bugs-To: [email protected]\n"
11-
"POT-Creation-Date: 2015-07-29 11:32+0200\n"
11+
"POT-Creation-Date: 2016-02-17 14:15+0100\n"
1212
"PO-Revision-Date: 2014-04-13 20:30+0900\n"
1313
"Last-Translator: Curt Frisemo <[email protected]>\n"
1414
"Language-Team: Curt Frisemo <[email protected]>\n"
1515
"Plural-Forms: nplurals=1; plural=0\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=utf-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
19-
"Generated-By: Babel 0.9.6\n"
19+
"Generated-By: Babel 1.3\n"
2020

2121
msgid "Standard view"
2222
msgstr ""
@@ -428,6 +428,9 @@ msgstr ""
428428
msgid "Reduce video noise"
429429
msgstr ""
430430

431+
msgid "Prefer VP9 video codec"
432+
msgstr ""
433+
431434
msgid "Enable experiments"
432435
msgstr ""
433436

‎src/i18n/messages-zh-cn.po‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Spreed WebRTC 1.0\n"
1010
"Report-Msgid-Bugs-To: [email protected]\n"
11-
"POT-Creation-Date: 2015-07-29 11:32+0200\n"
11+
"POT-Creation-Date: 2016-02-17 14:15+0100\n"
1212
"PO-Revision-Date: 2014-05-21 09:54+0800\n"
1313
"Last-Translator: Michael P.\n"
1414
"Language-Team: Curt Frisemo <[email protected]>\n"
1515
"Plural-Forms: nplurals=1; plural=0\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=utf-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
19-
"Generated-By: Babel 0.9.6\n"
19+
"Generated-By: Babel 1.3\n"
2020

2121
msgid "Standard view"
2222
msgstr ""
@@ -428,6 +428,9 @@ msgstr ""
428428
msgid "Reduce video noise"
429429
msgstr ""
430430

431+
msgid "Prefer VP9 video codec"
432+
msgstr ""
433+
431434
msgid "Enable experiments"
432435
msgstr ""
433436

0 commit comments

Comments
 (0)