diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 00000000..949faf64 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,13 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base", + ":timezone(Asia/Tokyo)", + ":combinePatchMinorReleases", + ":prHourlyLimitNone", + ":prConcurrentLimit10", + "group:recommended", + "group:allNonMajor", + "schedule:weekly" + ] +} \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a5f7f9a..c2235a78 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,11 +16,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'adopt' + distribution: 'temurin' java-version: '11' cache: 'gradle' - name: Copy gradle.properties diff --git a/CHANGES.md b/CHANGES.md index fa2c94ef..ae57a1e1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,12 +11,41 @@ ## develop +## 2023.1.0 + +- [UPDATE] システム条件を更新する + - Android Studio 2022.1.1 以降 + - WebRTC SFU Sora 2022.2.0 以降 + - @miosakuma +- [UPDATE] Kotlin のバージョンを 1.8.10 に上げる + - @miosakuma +- [UPDATE] Gradle を 7.6.1 に上げる + - @miosakuma +- [UPDATE] 依存ライブラリーのバージョンを上げる + - org.jetbrains.dokka:dokka-gradle-plugin を 1.8.10 に上げる + - com.android.tools.build:gradle を 7.4.2 に上げる + - com.github.ben-manes:gradle-versions-plugin を 0.46.0 に上げる + - org.jlleitschuh.gradle:ktlint-gradle を 11.3.1 に上げる + - com.google.code.gson:gson を 2.10.1 に上げる + - androidx.test:core を 1.5.0 に上げる + - org.robolectric:robolectric を 4.9.2 に上げる +- [UPDATE] libwebrtc を 112.5615.1.0 に上げる + - @miosakuma +- [UPDATE] 映像コーデックに `AV1` を追加する + - @miosakuma +- [ADD] `SoraMediaOption` に `audioStreamingLanguageCode` を追加する + - @miosakuma +- [FIX] テストコード内に廃止された role が残っていたため最新化する + - @miosakuma +- [FIX] `PeerConnection.ContinualGatheringPolicy.GATHER_CONTINUALLY` は Sora がネットワーク変更に対応しておらず不要な設定であるため削除する + - @miosakuma + ## 2022.4.0 -- [CHANGE] type: offer の mid を必須にする +- [CHANGE] `type: offer` の `mid` を必須にする - この修正の結果、 type: offer に mid が含まれない場合は、エラーになります - @enm10k -- [UPDATE] libwebrtc を 105.5195.0.0 に上げる +- [UPDATE] `libwebrtc` を 105.5195.0.0 に上げる - @miosakuma - [UPDATE] `compileSdkVersion` を 32 に上げる - @miosakuma @@ -24,7 +53,7 @@ - @miosakuma - [UPDATE] `Kotlin` のバージョンを 1.7.10 に上げる - @miosakuma -- [UPDATE] Gradle を 7.5.1 に上げる +- [UPDATE] `Gradle` を 7.5.1 に上げる - @miosakuma - [UPDATE] 依存ライブラリーのバージョンを上げる - `com.android.tools.build:gradle` を 7.2.2 に上げる diff --git a/README.md b/README.md index 87070dd6..25e06106 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Sora Android SDK [![Release](https://jitpack.io/v/shiguredo/sora-android-sdk.svg)](https://jitpack.io/#shiguredo/sora-android-sdk) -[![libwebrtc](https://img.shields.io/badge/libwebrtc-105.5195-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/5195) +[![libwebrtc](https://img.shields.io/badge/libwebrtc-112.5615-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/5615) [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/shiguredo/sora-android-sdk.svg)](https://github.com/shiguredo/sora-android-sdk.svg) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) @@ -21,8 +21,8 @@ Please read https://github.com/shiguredo/oss before use. ## システム条件 - Android 5 以降 (エミュレーターでの動作は保証しません) -- Android Studio 2021.2.1 以降 -- WebRTC SFU Sora 2022.1.1 以降 +- Android Studio 2022.1.1 以降 +- WebRTC SFU Sora 2022.2.0 以降 ## サンプル @@ -39,7 +39,7 @@ Please read https://github.com/shiguredo/oss before use. ``` Copyright 2017, Lyo Kato (Original Author) -Copyright 2017-2022, Shiguredo Inc. +Copyright 2017-2023, Shiguredo Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/build.gradle b/build.gradle index d1256298..df62adc1 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,10 @@ apply plugin: "org.ajoberstar.grgit" apply plugin: 'org.jetbrains.dokka' buildscript { - ext.kotlin_version = '1.7.10' - ext.libwebrtc_version = '105.5195.0.0' + ext.kotlin_version = '1.8.10' + ext.libwebrtc_version = '112.5615.1.0' - ext.dokka_version = '1.7.10' + ext.dokka_version = '1.8.10' repositories { google() @@ -15,14 +15,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" classpath 'org.ajoberstar.grgit:grgit-gradle:5.0.0' classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}" - classpath "com.github.ben-manes:gradle-versions-plugin:0.42.0" - classpath "org.jlleitschuh.gradle:ktlint-gradle:10.3.0" + classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0" + classpath "org.jlleitschuh.gradle:ktlint-gradle:11.3.1" } } diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md deleted file mode 100644 index 9b2e9534..00000000 --- a/docs/CONTRIBUTING.md +++ /dev/null @@ -1,36 +0,0 @@ -# Sora Android SDK Issues 利用ガイドライン - -## Initial Note - -Sora Android SDK is open source by Apache License V2 and reports via Issues are -welcome. - -Support for Sora Android SDK by Shiguredo Inc. are limited -**ONLY in JAPANESE** through GitHub issues and there is no guarantee such -as response time or resolution. - -## はじめに - -Sora Android SDK は Apache License v2 で公開され、Issues による報告を歓迎します。 - -時雨堂による Sora Android SDK サポートは、GitHub Issues を通じた日本語のみに限り、 -また有償サポートは提供しておりません。 - -## Issue を上げる前の確認事項 - -1. まず [Sora Android SDK のドキュメント](https://sora.shiguredo.jp/android-sdk-doc/index.html) - を御覧いただき、セットアップ方法、利用方法を確認してください。 -2. Sora Android SDK の最新版での動作を確認してください。 -3. [クィックスタートアプリケーション](https://github.com/shiguredo/sora-android-sdk-quickstart/) - が動作するか確認してください -4. [サンプル集](https://github.com/shiguredo/sora-android-sdk-samples/) に - 似た動作をするサンプルがある場合、その動作を確認してください。 - -## Issue を上げる - -GitHub Issues にはテンプレートを設定しています。 -テンプレートに従って、必要な情報を記入してください。 - -またテンプレートの項目以外でも、設定を○○に変えた場合には期待した動作を -するなど、問題の絞り込みにつながる情報は歓迎します。 -また、実現したいこと(ユースケース)があると、ワークアラウンドの提示が可能なことがあります。 diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md deleted file mode 100644 index a888b459..00000000 --- a/docs/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,68 +0,0 @@ - - -## サマリ - - - -## 環境 - -- Android 端末の Android バージョン: -- Android 端末の型番: -- WebRTC SFU Sora バージョン: -- Sora Android SDK の AAR バージョン: -- Android Studio バージョン: -- その他、関連する環境情報: - -## 期待する動作、現象 - - - -## 実際の動作、現象 - - - -## 再現手順 - - - -## 実現したいこと - - - -## その他 - - - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c0..943f0cbf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661e..50832291 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,105 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/sora-android-sdk/build.gradle b/sora-android-sdk/build.gradle index f896c6d2..8ad4ea47 100644 --- a/sora-android-sdk/build.gradle +++ b/sora-android-sdk/build.gradle @@ -86,7 +86,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}" // required by "signaling" part - implementation 'com.google.code.gson:gson:2.9.1' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.squareup.okhttp3:okhttp:4.10.0' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4' @@ -96,8 +96,8 @@ dependencies { implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0' testImplementation 'junit:junit:4.13.2' - testImplementation 'androidx.test:core:1.4.0' - testImplementation('org.robolectric:robolectric:4.8.1') { + testImplementation 'androidx.test:core:1.5.0' + testImplementation('org.robolectric:robolectric:4.9.2') { exclude group: 'com.google.auto.service', module: 'auto-service' } testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${kotlin_version}" diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/camera/CameraCapturerFactory.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/camera/CameraCapturerFactory.kt index 368e92b4..2f19a129 100644 --- a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/camera/CameraCapturerFactory.kt +++ b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/camera/CameraCapturerFactory.kt @@ -11,7 +11,7 @@ import org.webrtc.CameraVideoCapturer /** * カメラからの映像を取得するための `CameraVideoCapturer` のファクトリクラスです. * - * Camera1, Camera2 を統一的に扱うことが出来ます. + * Camera1, Camera2 を統一的に扱うことができます. * * cf. * - `org.webrtc.CameraVideoCapturer` diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/SoraMediaChannel.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/SoraMediaChannel.kt index 270d9641..18da9d5d 100644 --- a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/SoraMediaChannel.kt +++ b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/SoraMediaChannel.kt @@ -44,7 +44,7 @@ import kotlin.concurrent.schedule * Sora への接続を行うクラスです. * * [SignalingChannel] と [PeerChannel] の管理、協調動作制御を行っています. - * このクラスを利用することでシグナリングの詳細が隠蔽され、単一の [Listener] でイベントを受けることが出来ます. + * このクラスを利用することでシグナリングの詳細が隠蔽され、単一の [Listener] でイベントを受けることができます. * * シグナリングの手順とデータに関しては下記の Sora のドキュメントを参照ください. * - [WebSocket 経由のシグナリング](https://sora.shiguredo.jp/doc/SIGNALING) @@ -311,12 +311,12 @@ class SoraMediaChannel @JvmOverloads constructor( fun onPeerConnectionStatsReady(mediaChannel: SoraMediaChannel, statsReport: RTCStatsReport) {} /** - * サイマルキャスト配信のエンコーダ設定を変更するためのコールバック. + * サイマルキャスト配信のエンコーダー設定を変更するためのコールバック. * * 引数の encodings は Sora が送ってきた設定を反映した RtpParameters.Encoding のリストです. * デフォルトの実装ではなにも行いません. * このコールバックを実装し、引数のオブジェクトを変更することで、アプリケーションの要件に従った - * 設定をエンコーダにわたすことができます. + * 設定をエンコーダーにわたすことができます. * * cf. Web 標準の対応 API は次のとおりです. libwebrtc の native(C++) と android の実装は * 異なりますので注意してください. @@ -634,36 +634,37 @@ class SoraMediaChannel @JvmOverloads constructor( SoraLogger.d( TAG, """connect: SoraMediaOption - |requiredRole = ${mediaOption.requiredRole} - |upstreamIsRequired = ${mediaOption.upstreamIsRequired} - |downstreamIsRequired = ${mediaOption.downstreamIsRequired} - |multistreamEnabled = ${mediaOption.multistreamEnabled} - |audioIsRequired = ${mediaOption.audioIsRequired} - |audioUpstreamEnabled = ${mediaOption.audioUpstreamEnabled} - |audioDownstreamEnabled = ${mediaOption.audioDownstreamEnabled} - |audioCodec = ${mediaOption.audioCodec} - |audioBitRate = ${mediaOption.audioBitrate} - |audioSource = ${mediaOption.audioOption.audioSource} - |useStereoInput = ${mediaOption.audioOption.useStereoInput} - |useStereoOutput = ${mediaOption.audioOption.useStereoOutput} - |videoIsRequired = ${mediaOption.videoIsRequired} - |videoUpstreamEnabled = ${mediaOption.videoUpstreamEnabled} - |videoUpstreamContext = ${mediaOption.videoUpstreamContext} - |videoDownstreamEnabled = ${mediaOption.videoDownstreamEnabled} - |videoDownstreamContext = ${mediaOption.videoDownstreamContext} - |videoEncoderFactory = ${mediaOption.videoEncoderFactory} - |videoDecoderFactory = ${mediaOption.videoDecoderFactory} - |videoCodec = ${mediaOption.videoCodec} - |videoBitRate = ${mediaOption.videoBitrate} - |videoCapturer = ${mediaOption.videoCapturer} - |simulcastEnabled = ${mediaOption.simulcastEnabled} - |simulcastRid = ${mediaOption.simulcastRid} - |spotlightEnabled = ${mediaOption.spotlightEnabled} - |spotlightNumber = ${mediaOption.spotlightOption?.spotlightNumber} - |signalingMetadata = ${this.signalingMetadata} - |clientId = ${this.clientId} - |bundleId = ${this.bundleId} - |signalingNotifyMetadata = ${this.signalingNotifyMetadata} + |requiredRole = ${mediaOption.requiredRole} + |upstreamIsRequired = ${mediaOption.upstreamIsRequired} + |downstreamIsRequired = ${mediaOption.downstreamIsRequired} + |multistreamEnabled = ${mediaOption.multistreamEnabled} + |audioIsRequired = ${mediaOption.audioIsRequired} + |audioUpstreamEnabled = ${mediaOption.audioUpstreamEnabled} + |audioDownstreamEnabled = ${mediaOption.audioDownstreamEnabled} + |audioCodec = ${mediaOption.audioCodec} + |audioBitRate = ${mediaOption.audioBitrate} + |audioSource = ${mediaOption.audioOption.audioSource} + |useStereoInput = ${mediaOption.audioOption.useStereoInput} + |useStereoOutput = ${mediaOption.audioOption.useStereoOutput} + |videoIsRequired = ${mediaOption.videoIsRequired} + |videoUpstreamEnabled = ${mediaOption.videoUpstreamEnabled} + |videoUpstreamContext = ${mediaOption.videoUpstreamContext} + |videoDownstreamEnabled = ${mediaOption.videoDownstreamEnabled} + |videoDownstreamContext = ${mediaOption.videoDownstreamContext} + |videoEncoderFactory = ${mediaOption.videoEncoderFactory} + |videoDecoderFactory = ${mediaOption.videoDecoderFactory} + |videoCodec = ${mediaOption.videoCodec} + |videoBitRate = ${mediaOption.videoBitrate} + |videoCapturer = ${mediaOption.videoCapturer} + |simulcastEnabled = ${mediaOption.simulcastEnabled} + |simulcastRid = ${mediaOption.simulcastRid} + |spotlightEnabled = ${mediaOption.spotlightEnabled} + |spotlightNumber = ${mediaOption.spotlightOption?.spotlightNumber} + |audioStreamingLanguageCode = ${mediaOption.audioStreamingLanguageCode} + |signalingMetadata = ${this.signalingMetadata} + |clientId = ${this.clientId} + |bundleId = ${this.bundleId} + |signalingNotifyMetadata = ${this.signalingNotifyMetadata} """.trimMargin() ) diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraChannelRole.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraChannelRole.kt index c2c82001..0c79bfe0 100644 --- a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraChannelRole.kt +++ b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraChannelRole.kt @@ -1,7 +1,5 @@ package jp.shiguredo.sora.sdk.channel.option -import java.util.Locale - /** * チャネルの役割を示します. */ @@ -17,5 +15,5 @@ enum class SoraChannelRole { SENDRECV; internal val signaling: String - get() = this.toString().toLowerCase(Locale.getDefault()) + get() = this.toString().lowercase() } diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraMediaOption.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraMediaOption.kt index 50e4e17e..2738bdac 100644 --- a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraMediaOption.kt +++ b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraMediaOption.kt @@ -234,7 +234,12 @@ class SoraMediaOption { var hardwareVideoEncoderResolutionAdjustment = SoraVideoOption.ResolutionAdjustment.MULTIPLE_OF_16 /** - * プロキシ + * プロキシ. */ var proxy: SoraProxyOption = SoraProxyOption() + + /** + * Sora の音声ストリーミング機能利用時に指定する言語コード. + */ + var audioStreamingLanguageCode: String? = null } diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraVideoOption.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraVideoOption.kt index e9d2c45b..ad868fe8 100644 --- a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraVideoOption.kt +++ b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraVideoOption.kt @@ -16,7 +16,9 @@ class SoraVideoOption { /** VP8 */ VP8, /** VP9 */ - VP9 + VP9, + /** AV1 */ + AV1 } /** diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/rtc/PeerNetworkConfig.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/rtc/PeerNetworkConfig.kt index acb30d77..0b5dc15b 100644 --- a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/rtc/PeerNetworkConfig.kt +++ b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/rtc/PeerNetworkConfig.kt @@ -21,7 +21,6 @@ class PeerNetworkConfig( conf.bundlePolicy = PeerConnection.BundlePolicy.MAXBUNDLE conf.rtcpMuxPolicy = PeerConnection.RtcpMuxPolicy.REQUIRE - conf.continualGatheringPolicy = PeerConnection.ContinualGatheringPolicy.GATHER_CONTINUALLY conf.keyType = PeerConnection.KeyType.ECDSA val cryptoOptions = CryptoOptions.builder() .setEnableGcmCryptoSuites(true) diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/Catalog.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/Catalog.kt index 10cad892..1a2c9331 100644 --- a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/Catalog.kt +++ b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/Catalog.kt @@ -46,6 +46,8 @@ data class ConnectMessage( @SerializedName("ignore_disconnect_websocket") val ignoreDisconnectWebsocket: Boolean? = null, @SerializedName("data_channels") val dataChannels: List>? = null, + @SerializedName("audio_streaming_language_code") + val audioStreamingLanguageCode: String? = null, @SerializedName("redirect") var redirect: Boolean? = null ) diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/MessageConverter.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/MessageConverter.kt index 00cd08fb..05713a40 100644 --- a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/MessageConverter.kt +++ b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/MessageConverter.kt @@ -54,6 +54,7 @@ class MessageConverter { clientId = clientId, bundleId = bundleId, signalingNotifyMetadata = signalingNotifyMetadata, + audioStreamingLanguageCode = mediaOption.audioStreamingLanguageCode, ) if (mediaOption.upstreamIsRequired) { diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/codec/SimulcastVideoEncoderFactoryWrapper.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/codec/SimulcastVideoEncoderFactoryWrapper.kt index ea97e37a..f3b76038 100644 --- a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/codec/SimulcastVideoEncoderFactoryWrapper.kt +++ b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/codec/SimulcastVideoEncoderFactoryWrapper.kt @@ -22,10 +22,10 @@ internal class SimulcastVideoEncoderFactoryWrapper( resolutionAdjustment: SoraVideoOption.ResolutionAdjustment, ) : VideoEncoderFactory { - // ストリーム単位のエンコーダをラップした上で以下を行うクラス。 + // ストリーム単位のエンコーダーをラップした上で以下を行うクラス。 // - スレッドをひとつ起動する // - initEncode の width/height と frame buffer のそれが一致しない場合は事前にスケールする - // - 内部のエンコーダをつねにそのスレッド上で呼び出す + // - 内部のエンコーダーをつねにそのスレッド上で呼び出す private class StreamEncoderWrapper( private val encoder: VideoEncoder, ) : VideoEncoder { diff --git a/sora-android-sdk/src/test/kotlin/jp/shiguredo/sora/sdk/ConnectClientIdTest.kt b/sora-android-sdk/src/test/kotlin/jp/shiguredo/sora/sdk/ConnectClientIdTest.kt index 14833957..558c8124 100644 --- a/sora-android-sdk/src/test/kotlin/jp/shiguredo/sora/sdk/ConnectClientIdTest.kt +++ b/sora-android-sdk/src/test/kotlin/jp/shiguredo/sora/sdk/ConnectClientIdTest.kt @@ -25,7 +25,7 @@ class ConnectClientIdTest { private fun roundtrip(clientId: String?): Map<*, *> { val original = ConnectMessage( - role = "upstream", + role = "sendonly", channelId = "sora", sdp = "", clientId = clientId diff --git a/sora-android-sdk/src/test/kotlin/jp/shiguredo/sora/sdk/ConnectMetadataJsonTest.kt b/sora-android-sdk/src/test/kotlin/jp/shiguredo/sora/sdk/ConnectMetadataJsonTest.kt index a5147ba9..0f997bf6 100644 --- a/sora-android-sdk/src/test/kotlin/jp/shiguredo/sora/sdk/ConnectMetadataJsonTest.kt +++ b/sora-android-sdk/src/test/kotlin/jp/shiguredo/sora/sdk/ConnectMetadataJsonTest.kt @@ -84,7 +84,7 @@ class ConnectMetadataJsonTest { private fun roundtrip(metadata: Any?): ConnectMessage { val original = ConnectMessage( - role = "upstream", + role = "sendonly", channelId = "sora", sdp = "", metadata = metadata