diff --git a/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar b/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar index 8374704d0a549bb34fd047dca068b5c3ffe47065..b587e12fd89fd9eb3525a9c6d71d0d52cc8bcad1 100755 Binary files a/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar and b/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar differ diff --git a/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar b/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar index 1ad95440e057ff4d5af7e24b5808654f9d69237d..9f0cc3cc60a8c300583f99ff673d492ff45c4321 100755 Binary files a/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar and b/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar differ diff --git a/bbb-screenshare/app/jws/lib/ffmpeg-macosx-x86_64.jar b/bbb-screenshare/app/jws/lib/ffmpeg-macosx-x86_64.jar index 6fe57fa216ebf72c069eb4a83841ad7b13d6afff..737d3cf8b802b717e2f23e0bf4a25a0948fdabac 100755 Binary files a/bbb-screenshare/app/jws/lib/ffmpeg-macosx-x86_64.jar and b/bbb-screenshare/app/jws/lib/ffmpeg-macosx-x86_64.jar differ diff --git a/bbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar b/bbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar index d8be9afb6cb734a103b2b2e2807e5d52df8ae73d..a64f96c88ec202a62a565b55009ae36fef33d36c 100755 Binary files a/bbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar and b/bbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar differ diff --git a/bbb-screenshare/app/jws/lib/ffmpeg-windows-x86_64.jar b/bbb-screenshare/app/jws/lib/ffmpeg-windows-x86_64.jar index bf8e5df0c37832c7c02f3acc4798ac76a5fe6682..4f389ecfd5acf07d0f12952f7e28320c7ba1b563 100755 Binary files a/bbb-screenshare/app/jws/lib/ffmpeg-windows-x86_64.jar and b/bbb-screenshare/app/jws/lib/ffmpeg-windows-x86_64.jar differ diff --git a/bbb-screenshare/app/jws/lib/ffmpeg.jar b/bbb-screenshare/app/jws/lib/ffmpeg.jar index fce064c3c427d1340121bcc912de6a33b8261e91..46904a58693b5faee5affa03326417cf3729d126 100755 Binary files a/bbb-screenshare/app/jws/lib/ffmpeg.jar and b/bbb-screenshare/app/jws/lib/ffmpeg.jar differ diff --git a/bbb-screenshare/app/jws/lib/javacpp.jar b/bbb-screenshare/app/jws/lib/javacpp.jar index d6e28280256a3d710b0c4dc9b657d0343246ead5..485a3a4c534fe5017cfa82c8d226b3ede1e681eb 100755 Binary files a/bbb-screenshare/app/jws/lib/javacpp.jar and b/bbb-screenshare/app/jws/lib/javacpp.jar differ diff --git a/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar b/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar index 379df4d046fd8f1175ec43bf966e9249544099b8..afd515c94e649c8034b4a4dd52a82a4aaa6a1cc6 100755 Binary files a/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar and b/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar differ diff --git a/bbb-screenshare/app/screenshare.jnlp b/bbb-screenshare/app/screenshare.jnlp new file mode 100755 index 0000000000000000000000000000000000000000..821ff81b5a232883c9b55ebaa3f5b346787cf85f --- /dev/null +++ b/bbb-screenshare/app/screenshare.jnlp @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jnlp spec="1.0+" codebase="$$jnlpUrl/lib" href=""> +<!-- + Keep href empty. Otherwise this jnlp file will always be cached. + http://www.coderanch.com/t/284889/JSP/java/Caching-JNLP +--> + <information> + <title>BigBlueButton Screen Share</title> + <vendor>BigBlueButton</vendor> + </information> + + <resources> + <j2se version="1.7+" href="http://java.sun.com/products/autodl/j2se"/> + <jar href="javacv-screenshare-0.0.1.jar" main="true" /> + <jar href="ffmpeg.jar" /> + </resources> + + <resources os="Windows" arch="amd64"> + <nativelib href="ffmpeg-windows-x86_64.jar"/> + </resources> + + <resources os="Windows" arch="x86"> + <nativelib href="$$jnlpUrl/lib/ffmpeg-windows-x86.jar"/> + </resources> + + <resources os="Linux" arch="x86_64 amd64"> + <nativelib href="ffmpeg-linux-x86_64.jar"/> + </resources> + + <resources os="Linux" arch="x86 i386 i486 i586 i686"> + <nativelib href="ffmpeg-linux-x86.jar"/> + </resources> + + <resources os="Mac OS X"> + <nativelib href="ffmpeg-macosx-x86_64.jar"/> + </resources> + + <application-desc + name="Desktop Sharing Demo Application" + main-class="org.bigbluebutton.screenshare.client.DeskshareMain"> + <argument>$$publishUrl</argument> + <argument>$$serverUrl</argument> + <argument>$$meetingId</argument> + <argument>$$streamId</argument> + <argument>$$fullScreen</argument> + <argument>$$codecOptions</argument> + <argument>$$errorMessage</argument> + </application-desc> + <security><all-permissions/></security> + <update check="always" policy="always"/> +</jnlp> diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/ffmpeg-3.0.2-1.2-linux-x86.jar b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/ffmpeg-3.0.2-1.2-linux-x86.jar new file mode 100755 index 0000000000000000000000000000000000000000..2723f63d9fa1bc8a69b9e382bd7ab0453fe1e6f1 Binary files /dev/null and b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/ffmpeg-3.0.2-1.2-linux-x86.jar differ diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/sign-jar.sh index 12ec3252b0ca53219e13e0f526ab79dbe31cbbc7..59be2d1e86ccfec85cfdb5282e561f2fa7d8f44f 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/sign-jar.sh @@ -1,7 +1,8 @@ -FFMPEG=ffmpeg-2.8.5-1.2-SNAPSHOT-linux-x86.jar -cp ffmpeg-2.8.5-1.2-SNAPSHOT-linux-x86.jar build/libs/ffmpeg-linux-x86-0.0.1.jar +FFMPEG=ffmpeg-3.0.2-1.2-linux-x86.jar +cp $FFMPEG build/libs/ffmpeg-linux-x86-0.0.1.jar mkdir workdir rm -rf src rm -rf workdir +cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../unsigned-jars/ffmpeg-linux-x86-unsigned.jar ant sign-jar cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../../app/jws/lib/ffmpeg-linux-x86.jar diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/ffmpeg-3.0.2-1.2-linux-x86_64.jar b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/ffmpeg-3.0.2-1.2-linux-x86_64.jar new file mode 100755 index 0000000000000000000000000000000000000000..9a297603b34daecad9b3be79db133f176db15d87 Binary files /dev/null and b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/ffmpeg-3.0.2-1.2-linux-x86_64.jar differ diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/sign-jar.sh index 8313a5ae3634be2ea6b6012a5c6496d676632837..2d21a8335b86a0a8dce91640201093f4acf6a31b 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/sign-jar.sh @@ -1,6 +1,7 @@ -FFMPEG=ffmpeg-2.8.5-1.2-SNAPSHOT-linux-x86_64.jar +FFMPEG=ffmpeg-3.0.2-1.2-linux-x86_64.jar mkdir workdir rm -rf workdir cp $FFMPEG build/libs/ffmpeg-linux-x86_64-0.0.1.jar +cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../unsigned-jars/ffmpeg-linux-x86_64-unsigned.jar ant sign-jar cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../../app/jws/lib/ffmpeg-linux-x86_64.jar diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/ffmpeg-3.0.2-1.2-macosx-x86_64.jar b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/ffmpeg-3.0.2-1.2-macosx-x86_64.jar index 86fb07dcdaa7c33dd045861f7d13f22cccc7ce1b..693d9cc193c333ef769201081972e40e80fd9c8b 100755 Binary files a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/ffmpeg-3.0.2-1.2-macosx-x86_64.jar and b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/ffmpeg-3.0.2-1.2-macosx-x86_64.jar differ diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/sign-jar.sh index 49d325f3b2fb7392d6f0dc3890f6d4f79ea3eb34..7fa6179e5c63385f66059a23b594bfba16f759de 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/sign-jar.sh @@ -9,5 +9,8 @@ cp org/bytedeco/javacpp/macosx-x86_64/* ../src/main/resources cd .. rm -rf workdir gradle jar +cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../unsigned-jars/ffmpeg-macosx-x86_64-unsigned.jar ant sign-jar cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../../app/jws/lib/ffmpeg-macosx-x86_64.jar +rm -rf src + diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/sign-jar.sh index 975509ea94d74b6a938606de0efd4fefa29818e3..f44433caf7d89bf243257cf1cf883fe04b736349 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/sign-jar.sh @@ -1,16 +1,17 @@ FFMPEG=ffmpeg-3.0.2-1.2-windows-x86.jar -#mkdir workdir -#cp $FFMPEG workdir/ffmpeg-windows-x86.jar -#rm -rf src -#mkdir -p src/main/resources -#mkdir -p src/main/java -#cd workdir -#jar xvf ffmpeg-windows-x86.jar -#cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources -#cd .. -#rm -rf workdir -#gradle jar -cp $FFMPEG build/libs/ffmpeg-windows-x86-0.0.1.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-windows-x86.jar +rm -rf src +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-windows-x86.jar +cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources +cd .. +rm -rf workdir +gradle jar +cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../unsigned-jars/ffmpeg-windows-x86-unsigned.jar ant sign-jar cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../app/jws/lib/ffmpeg-windows-x86.jar +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/sign-jar.sh index 4cbda1bc1deec358eb921b6a22809799fe15e8cc..ac1216e7671a65a5d900b6c8c8dfced3990cf6b8 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/sign-jar.sh @@ -10,6 +10,7 @@ cp org/bytedeco/javacpp/windows-x86_64/*.dll ../src/main/resources cd .. rm -rf workdir gradle jar +cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../unsigned-jars/ffmpeg-windows-x86_64-unsigned.jar ant sign-jar cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../../app/jws/lib/ffmpeg-windows-x86_64.jar rm -rf src diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86-unsigned.jar b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86-unsigned.jar new file mode 100755 index 0000000000000000000000000000000000000000..2723f63d9fa1bc8a69b9e382bd7ab0453fe1e6f1 Binary files /dev/null and b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86-unsigned.jar differ diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86_64-unsigned.jar b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86_64-unsigned.jar new file mode 100644 index 0000000000000000000000000000000000000000..9a297603b34daecad9b3be79db133f176db15d87 Binary files /dev/null and b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86_64-unsigned.jar differ diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-macosx-x86_64-unsigned.jar b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-macosx-x86_64-unsigned.jar new file mode 100644 index 0000000000000000000000000000000000000000..74f878fda77cf794f0c199debce2e96a33a30854 Binary files /dev/null and b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-macosx-x86_64-unsigned.jar differ diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-windows-x86-unsigned.jar b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-windows-x86-unsigned.jar new file mode 100644 index 0000000000000000000000000000000000000000..19cfc70697a7eb50e5c8180c46cb0e16f394b6c9 Binary files /dev/null and b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-windows-x86-unsigned.jar differ diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-windows-x86_64-unsigned.jar b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-windows-x86_64-unsigned.jar new file mode 100644 index 0000000000000000000000000000000000000000..ba865288775a0bbd8d37b146427fd69d58c2fbde Binary files /dev/null and b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-windows-x86_64-unsigned.jar differ diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/javacpp-1.2.jar b/bbb-screenshare/jws/native-libs/unsigned-jars/javacpp-1.2.jar index a7d44149683c0e581cdc634d38b97661a2cea356..08a00f392125619a81721758e919af3319acef2a 100755 Binary files a/bbb-screenshare/jws/native-libs/unsigned-jars/javacpp-1.2.jar and b/bbb-screenshare/jws/native-libs/unsigned-jars/javacpp-1.2.jar differ