Merge branch 'release/2021.1'

Author: voluntas

.github/workflows/build.yml

@@ -59,8 +59,14 @@ jobs:
           name: windows.env
           path: windows.env
   build-macos:
-    name: Build momo for macOS
-    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - arm64
+          - x86_64
+    name: Build momo for macOS_${{ matrix.arch }}
+    runs-on: macos-11.0
     steps:
       - uses: actions/checkout@v2
       - name: Get Versions
@@ -74,17 +80,17 @@ jobs:
         with:
           path: _cache/boost
           key: macos-boost-${{ steps.versions.outputs.boost_version }}.tar.gz.v2
-      - run: ./build.sh --package macos
+      - run: ./build.sh --package macos_${{ matrix.arch }}
         working-directory: build
         timeout-minutes: 120
       - name: Output package name
         shell: bash
         run: |
           source VERSION
           MACOS_VERSION=`sw_vers -productVersion | cut -d '.' -f-2`
-          echo "PACKAGE_NAME=momo-${MOMO_VERSION}_macos-${MACOS_VERSION}.tar.gz" >> macos.env
-          echo "CONTENT_TYPE=application/gzip" >> macos.env
-          echo "::set-output name=name::momo-${MOMO_VERSION}_macos-${MACOS_VERSION}.tar.gz"
+          echo "PACKAGE_NAME=momo-${MOMO_VERSION}_macos-${MACOS_VERSION}_${{ matrix.arch }}.tar.gz" >> macos_${{ matrix.arch }}.env
+          echo "CONTENT_TYPE=application/gzip" >> macos_${{ matrix.arch }}.env
+          echo "::set-output name=name::momo-${MOMO_VERSION}_macos-${MACOS_VERSION}_${{ matrix.arch }}.tar.gz"
         id: package_name
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
@@ -94,8 +100,8 @@ jobs:
       - name: Upload Environment
         uses: actions/upload-artifact@v1
         with:
-          name: macos.env
-          path: macos.env
+          name: macos_${{ matrix.arch }}.env
+          path: macos_${{ matrix.arch }}.env
   build-linux:
     strategy:
       fail-fast: false
@@ -181,7 +187,8 @@ jobs:
       matrix:
         name:
           - windows
-          - macos
+          - macos_arm64
+          - macos_x86_64
           - raspberry-pi-os_armv6
           - raspberry-pi-os_armv7
           - raspberry-pi-os_armv8

.github/workflows/daily_build.yml

@@ -31,8 +31,14 @@ jobs:
         working-directory: build
         timeout-minutes: 120
   build-macos:
-    name: Build momo for macOS
-    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - arm64
+          - x86_64
+    name: Build momo for macOS_${{ matrix.arch }}
+    runs-on: macos-11.0
     steps:
       - uses: actions/checkout@v2
       - name: Get Versions
@@ -46,7 +52,7 @@ jobs:
         with:
           path: _cache/boost
           key: macos-boost-${{ steps.versions.outputs.boost_version }}.tar.gz.v2
-      - run: ./build.sh macos
+      - run: ./build.sh macos_${{ matrix.arch }}
         working-directory: build
         timeout-minutes: 120
   build-linux:

.gitignore

@@ -44,8 +44,8 @@ webrtc_logs_0
 /build/windows/_source
 /build/windows/_build
 /build/windows/_install
-/build/macos/_source
-/build/macos/_build
-/build/macos/_install
+/build/macos_*/_source
+/build/macos_*/_build
+/build/macos_*/_install
 
 /src/hwenc_jetson/Nv*

CHANGES.md

@@ -11,6 +11,21 @@
 
 ## develop
 
+## 2021.1
+
+- [UPDATE] cmake を 3.19.3 に上げる
+    - @voluntas
+- [UPDATE] GitHub Actions の macOS ビルドを macos-11.0 に変更する
+    - @voluntas
+- [UPDATE] Boost 1.75.0 に上げる
+    - @voluntas
+- [UPDATE] nlohmann/json を Boost.JSON に変更
+    - @melpon
+- [ADD] サイマルキャストの active と adaptivePtime に対応
+    - @melpon
+- [ADD] Apple Silicon 対応
+    - @hakobera
+
 ## 2020.11
 
 - [UPDATE] cmake を 3.19.2 に上げる

CMakeLists.txt

@@ -19,7 +19,6 @@ set(USE_LINUX_PULSE_AUDIO OFF CACHE BOOL "Linux で ALSA の代わりに PulseAu
 set(USE_SCREEN_CAPTURER OFF CACHE BOOL "スクリーンキャプチャラを利用するかどうか")
 set(BOOST_ROOT_DIR "" CACHE PATH "Boost のインストール先ディレクトリ\n空文字だった場合はデフォルト検索パスの Boost を利用する")
 set(SDL2_ROOT_DIR "" CACHE PATH "SDL2 のインストール先ディレクトリ\n空文字だった場合はデフォルト検索パスの SDL2 を利用する")
-set(JSON_ROOT_DIR "" CACHE PATH "nlohmann/json のインストール先ディレクトリ")
 set(CLI11_ROOT_DIR "" CACHE PATH "CLI11 のインストール先ディレクトリ")
 set(NVCODEC_ROOT_DIR "" CACHE PATH "NVIDIA VIDEO CODEC SDK のインストール先ディレクトリ")
 set(WEBRTC_INCLUDE_DIR "" CACHE PATH "WebRTC のインクルードディレクトリ")
@@ -46,17 +45,35 @@ if(MOMO_PACKAGE_NAME STREQUAL "windows")
   set(USE_SCREEN_CAPTURER ON)
   set(BOOST_ROOT_DIR ${_INSTALL_DIR}/boost)
   set(SDL2_ROOT_DIR ${_INSTALL_DIR}/SDL2)
-  set(JSON_ROOT_DIR ${_INSTALL_DIR}/json)
   set(CLI11_ROOT_DIR ${_INSTALL_DIR}/CLI11)
   set(WEBRTC_INCLUDE_DIR ${_INSTALL_DIR}/webrtc/include)
   set(WEBRTC_LIBRARY_DIR ${_INSTALL_DIR}/webrtc/release)
 
   list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${SDL2_ROOT_DIR}/cmake)
   list(APPEND CMAKE_PREFIX_PATH ${BOOST_ROOT_DIR} ${SDL2_ROOT_DIR})
 
-elseif(MOMO_PACKAGE_NAME STREQUAL "macos")
+elseif(MOMO_PACKAGE_NAME STREQUAL "macos_arm64")
 
-  set(_INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/macos/_install)
+  set(_INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/macos_arm64/_install)
+
+  set(TARGET_OS "macos")
+  set(TARGET_ARCH "arm64")
+  set(USE_H264 ON)
+  set(USE_SDL2 ON)
+  set(USE_SCREEN_CAPTURER ON)
+  set(BOOST_ROOT_DIR ${_INSTALL_DIR}/boost)
+  set(SDL2_ROOT_DIR ${_INSTALL_DIR}/SDL2)
+  set(CLI11_ROOT_DIR ${_INSTALL_DIR}/CLI11)
+  set(WEBRTC_INCLUDE_DIR ${_INSTALL_DIR}/webrtc/include)
+  set(WEBRTC_LIBRARY_DIR ${_INSTALL_DIR}/webrtc/lib)
+  set(CLANG_ROOT ${_INSTALL_DIR}/llvm/clang)
+
+  set(USE_LIBCXX ON)
+  set(LIBCXX_INCLUDE_DIR ${_INSTALL_DIR}/llvm/libcxx/include)
+
+elseif(MOMO_PACKAGE_NAME STREQUAL "macos_x86_64")
+
+  set(_INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/macos_x86_64/_install)
 
   set(TARGET_OS "macos")
   set(TARGET_ARCH "x86_64")
@@ -65,7 +82,6 @@ elseif(MOMO_PACKAGE_NAME STREQUAL "macos")
   set(USE_SCREEN_CAPTURER ON)
   set(BOOST_ROOT_DIR ${_INSTALL_DIR}/boost)
   set(SDL2_ROOT_DIR ${_INSTALL_DIR}/SDL2)
-  set(JSON_ROOT_DIR ${_INSTALL_DIR}/json)
   set(CLI11_ROOT_DIR ${_INSTALL_DIR}/CLI11)
   set(WEBRTC_INCLUDE_DIR ${_INSTALL_DIR}/webrtc/include)
   set(WEBRTC_LIBRARY_DIR ${_INSTALL_DIR}/webrtc/lib)
@@ -83,7 +99,6 @@ elseif(MOMO_PACKAGE_NAME STREQUAL "raspberry-pi-os_armv6")
   set(USE_MMAL_ENCODER ON)
   set(USE_H264 ON)
   set(BOOST_ROOT_DIR /root/boost)
-  set(JSON_ROOT_DIR /root/json)
   set(CLI11_ROOT_DIR /root/CLI11)
   set(WEBRTC_INCLUDE_DIR /root/webrtc/include)
   set(WEBRTC_LIBRARY_DIR /root/webrtc/lib)
@@ -106,7 +121,6 @@ elseif(MOMO_PACKAGE_NAME STREQUAL "raspberry-pi-os_armv7")
   set(USE_SDL2 ON)
   set(BOOST_ROOT_DIR /root/boost)
   set(SDL2_ROOT_DIR /root/SDL2)
-  set(JSON_ROOT_DIR /root/json)
   set(CLI11_ROOT_DIR /root/CLI11)
   set(WEBRTC_INCLUDE_DIR /root/webrtc/include)
   set(WEBRTC_LIBRARY_DIR /root/webrtc/lib)
@@ -125,7 +139,6 @@ elseif(MOMO_PACKAGE_NAME STREQUAL "raspberry-pi-os_armv8")
   set(TARGET_ARCH "arm")
   set(TARGET_ARCH_ARM "armv8")
   set(BOOST_ROOT_DIR /root/boost)
-  set(JSON_ROOT_DIR /root/json)
   set(CLI11_ROOT_DIR /root/CLI11)
   set(WEBRTC_INCLUDE_DIR /root/webrtc/include)
   set(WEBRTC_LIBRARY_DIR /root/webrtc/lib)
@@ -146,7 +159,6 @@ elseif(MOMO_PACKAGE_NAME STREQUAL "ubuntu-18.04_armv8_jetson_nano")
   set(USE_SDL2 ON)
   set(USE_LINUX_PULSE_AUDIO ON)
   set(BOOST_ROOT_DIR /root/boost)
-  set(JSON_ROOT_DIR /root/json)
   set(CLI11_ROOT_DIR /root/CLI11)
   set(SDL2_ROOT_DIR /root/SDL2)
   set(WEBRTC_INCLUDE_DIR /root/webrtc/include)
@@ -168,7 +180,6 @@ elseif(MOMO_PACKAGE_NAME STREQUAL "ubuntu-18.04_armv8_jetson_xavier")
   set(USE_SDL2 ON)
   set(USE_LINUX_PULSE_AUDIO ON)
   set(BOOST_ROOT_DIR /root/boost)
-  set(JSON_ROOT_DIR /root/json)
   set(CLI11_ROOT_DIR /root/CLI11)
   set(SDL2_ROOT_DIR /root/SDL2)
   set(WEBRTC_INCLUDE_DIR /root/webrtc/include)
@@ -189,7 +200,6 @@ elseif(MOMO_PACKAGE_NAME STREQUAL "ubuntu-18.04_x86_64")
   set(USE_NVCODEC_ENCODER ON)
   set(USE_SCREEN_CAPTURER ON)
   set(BOOST_ROOT_DIR /root/boost)
-  set(JSON_ROOT_DIR /root/json)
   set(CLI11_ROOT_DIR /root/CLI11)
   set(SDL2_ROOT_DIR /root/SDL2)
   set(WEBRTC_INCLUDE_DIR /root/webrtc/include)
@@ -212,7 +222,6 @@ elseif(MOMO_PACKAGE_NAME STREQUAL "ubuntu-20.04_x86_64")
   set(USE_NVCODEC_ENCODER ON)
   set(USE_SCREEN_CAPTURER ON)
   set(BOOST_ROOT_DIR /root/boost)
-  set(JSON_ROOT_DIR /root/json)
   set(CLI11_ROOT_DIR /root/CLI11)
   set(SDL2_ROOT_DIR /root/SDL2)
   set(WEBRTC_INCLUDE_DIR /root/webrtc/include)
@@ -272,6 +281,17 @@ if (TARGET_OS STREQUAL "linux")
   endif()
 endif()
 
+if (TARGET_OS STREQUAL "macos")
+  if (TARGET_ARCH STREQUAL "x86_64")
+    set(ARCH_NAME x86_64-apple-darwin)
+  else()
+    set(ARCH_NAME aarch64-apple-darwin)
+    set(CMAKE_SYSTEM_PROCESSOR arm64)
+  endif()
+
+  set(CMAKE_C_COMPILER_TARGET ${ARCH_NAME})
+  set(CMAKE_CXX_COMPILER_TARGET ${ARCH_NAME})
+endif()
 
 project(momo C CXX)
 
@@ -285,8 +305,7 @@ else()
 endif()
 
 find_package(WebRTC REQUIRED)
-find_package(Boost REQUIRED COMPONENTS filesystem)
-find_package(JSON REQUIRED)
+find_package(Boost REQUIRED COMPONENTS filesystem json)
 find_package(CLI11 REQUIRED)
 if (USE_SDL2)
   find_package(SDL2 REQUIRED)
@@ -338,7 +357,7 @@ target_link_libraries(momo
   PRIVATE
     WebRTC::WebRTC
     Boost::filesystem
-    JSON::JSON
+    Boost::json
     CLI11::CLI11
 )
 
@@ -492,7 +511,7 @@ elseif (TARGET_OS STREQUAL "macos")
       src/mac_helper/objc_codec_factory_helper.mm
   )
 
-  target_compile_options(momo PRIVATE -fconstant-string-class=NSConstantString)
+  target_compile_options(momo PRIVATE -fconstant-string-class=NSConstantString -mmacosx-version-min=11.0)
   target_link_options(momo PRIVATE -ObjC)
   set_target_properties(momo PROPERTIES CXX_VISIBILITY_PRESET hidden)
 

NOTICE

@@ -21,34 +21,6 @@ misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 ```
 
-# JSON for Modern C++
-
-https://github.com/nlohmann/json
-
-```
-MIT License
-
-Copyright (c) 2013-2018 Niels Lohmann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 # Boost C++ Libraries
 
 https://www.boost.org/LICENSE_1_0.txt

README.md

@@ -5,10 +5,11 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Actions Status](https://github.com/shiguredo/momo/workflows/daily-build-workflow/badge.svg)](https://github.com/shiguredo/momo/actions)
 
-## About Support
+## About Shiguredo's open source software
 
-We check PRs or Issues only when written in JAPANESE.
-In other languages, we won't be able to deal with them. Thank you for your understanding.
+We will not respond to PRs or issues that have not been discussed on Discord. Also, Discord is only available in Japanese.
+
+Please read https://github.com/shiguredo/oss before use.
 
 ## 時雨堂のオープンソースソフトウェアについて
 
@@ -89,7 +90,9 @@ https://github.com/shiguredo/momo/releases
     - [NVIDIA Jetson Nano](https://www.nvidia.com/ja-jp/autonomous-machines/embedded-systems/jetson-nano/)
     - [NVIDIA Jetson Xavier NX](https://www.nvidia.com/ja-jp/autonomous-machines/embedded-systems/jetson-xavier-nx/)
     - [NVIDIA Jetson AGX Xavier](https://www.nvidia.com/ja-jp/autonomous-machines/embedded-systems/jetson-agx-xavier/)
-- macOS 10.15 x86_64 以降
+- macOS 11 x86_64 以降
+    - 2021 年内に終了予定
+- macOS 11 arm64 以降
 - Windows 10.1809 x86_64 以降
 
 ### 以下はビルドが通ること以外は確認していません
@@ -133,7 +136,7 @@ Apache License 2.0
 
 ```
 Copyright 2015-2020, tnoho (Original Author)
-Copyright 2018-2020, Shiguredo Inc.
+Copyright 2018-2021, Shiguredo Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -197,7 +200,7 @@ limitations under the License.
     - MP4 形式での出力
     - WebM 形式での出力
 - 録画合成対応
-- Sora E2EE 対応
+- Sora モード利用時の E2EE 機能
 
 ## Momo についての電子書籍
 

VERSION

@@ -1,8 +1,7 @@
-MOMO_VERSION=2020.11
-WEBRTC_BUILD_VERSION=88.4324.3.0
-BOOST_VERSION=1.74.0
-JSON_VERSION=3.9.1
+MOMO_VERSION=2021.1
+WEBRTC_BUILD_VERSION=88.4324.3.1
+BOOST_VERSION=1.75.0
 CLI11_VERSION=1.9.1
-SDL2_VERSION=2.0.12
-CMAKE_VERSION=3.19.2
+SDL2_VERSION=2.0.14
+CMAKE_VERSION=3.19.3
 CUDA_VERSION=11.0.2-1