Merge branch 'release/2021.3'

voluntas · voluntas · commit 1334a266022e · 2021-04-27T22:19:02.000+09:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,17 @@
 
 ## develop
 
+## 2021.3
+
+- [UPDATE] `libwebrtc` を `M90.4430@{#3}` に上げる
+    - @voluntas
+- [UPDATE] Boost 1.76.0 に上げる
+    - @voluntas
+- [UPDATE] cmake を 3.20.1 に上げる
+    - @voluntas
+- [FIX] サイマルキャストのエラー・メッセージで示されていたオプションが古かったので修正する
+    - @enm10k
+
 ## 2021.2.3
 
 - [UPDATE] cmake を 3.20.0 に上げる
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -552,7 +552,7 @@ elseif (TARGET_OS STREQUAL "linux")
       WEBRTC_POSIX
   )
   # Linux 系の場合はカスタムされた libc++ を使っているためオプション追加
-  target_compile_definitions(momo PRIVATE _LIBCPP_ABI_UNSTABLE)
+  target_compile_definitions(momo PRIVATE _LIBCPP_ABI_UNSTABLE _LIBCPP_DISABLE_AVAILABILITY)
 
   set_target_properties(momo PROPERTIES POSITION_INDEPENDENT_CODE ON)
   target_link_libraries(momo
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # WebRTC Native Client Momo
 
-[![libwebrtc](https://img.shields.io/badge/libwebrtc-m89.4389-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/4389)
+[![libwebrtc](https://img.shields.io/badge/libwebrtc-m90.4430-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/4430)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/shiguredo/momo.svg)](https://github.com/shiguredo/momo)
 [![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)
@@ -253,6 +253,6 @@ H.264 ハードウェアエンコーダ **のみ** を利用している Momo 
 - NVIDIA Jetson Nano のハードウェアエンコーダのライセンス費用は別途、団体との契約が必要
     - [NVIDIA Jetson Nano 搭載の H\.264/H\.265 ハードウェアエンコーダのライセンスについて](https://medium.com/@voluntas/nvidia-jetson-nano-%E6%90%AD%E8%BC%89%E3%81%AE-h-264-h-265-%E3%83%8F%E3%83%BC%E3%83%89%E3%82%A6%E3%82%A7%E3%82%A2%E3%82%A8%E3%83%B3%E3%82%B3%E3%83%BC%E3%83%80%E3%81%AE%E3%83%A9%E3%82%A4%E3%82%BB%E3%83%B3%E3%82%B9%E3%81%AB%E3%81%A4%E3%81%84%E3%81%A6-ca207af302ee)
 - Intel Quick Sync Video のハードウェアエンコーダライセンス費用は別途、団体との契約が必要
-    - [QuickSync \- H\.264 patent licensing fees](https://software.intel.com/en-us/forums/intel-media-sdk/topic/494720)
+    - [QuickSync \- H\.264 patent licensing fees \- Intel Community](https://community.intel.com/t5/Media-Intel-oneAPI-Video/QuickSync-H-264-patent-licensing-fees/td-p/921396)
 
 
diff --git a/VERSION b/VERSION
@@ -1,7 +1,7 @@
-MOMO_VERSION=2021.2.3
-WEBRTC_BUILD_VERSION=89.4389.7.0
-BOOST_VERSION=1.75.0
+MOMO_VERSION=2021.3
+WEBRTC_BUILD_VERSION=90.4430.3.1
+BOOST_VERSION=1.76.0
 CLI11_VERSION=1.9.1
 SDL2_VERSION=2.0.14
-CMAKE_VERSION=3.20.0
+CMAKE_VERSION=3.20.1
 CUDA_VERSION=11.0.2-1
diff --git a/build/raspberry-pi-os_armv6/Dockerfile b/build/raspberry-pi-os_armv6/Dockerfile
@@ -46,6 +46,7 @@ RUN \
   && ./b2 \
     cxxflags=' \
       -D_LIBCPP_ABI_UNSTABLE \
+      -D_LIBCPP_DISABLE_AVAILABILITY \
       -nostdinc++ \
       -isystem/root/llvm/libcxx/include \
       --target=arm-linux-gnueabihf \
diff --git a/build/raspberry-pi-os_armv7/Dockerfile b/build/raspberry-pi-os_armv7/Dockerfile
@@ -46,6 +46,7 @@ RUN \
   && ./b2 \
     cxxflags=' \
       -D_LIBCPP_ABI_UNSTABLE \
+      -D_LIBCPP_DISABLE_AVAILABILITY \
       -nostdinc++ \
       -isystem/root/llvm/libcxx/include \
       --target=arm-linux-gnueabihf \
diff --git a/build/raspberry-pi-os_armv8/Dockerfile b/build/raspberry-pi-os_armv8/Dockerfile
@@ -46,6 +46,7 @@ RUN \
   && ./b2 \
     cxxflags=' \
       -D_LIBCPP_ABI_UNSTABLE \
+      -D_LIBCPP_DISABLE_AVAILABILITY \
       -nostdinc++ \
       -isystem/root/llvm/libcxx/include \
       --target=aarch64-linux-gnu \
diff --git a/build/ubuntu-18.04_armv8_jetson_nano/Dockerfile b/build/ubuntu-18.04_armv8_jetson_nano/Dockerfile
@@ -51,6 +51,7 @@ RUN \
   && ./b2 \
     cxxflags=' \
       -D_LIBCPP_ABI_UNSTABLE \
+      -D_LIBCPP_DISABLE_AVAILABILITY \
       -nostdinc++ \
       -isystem/root/llvm/libcxx/include \
       --target=aarch64-linux-gnu \
diff --git a/build/ubuntu-18.04_armv8_jetson_xavier/Dockerfile b/build/ubuntu-18.04_armv8_jetson_xavier/Dockerfile
@@ -51,6 +51,7 @@ RUN \
   && ./b2 \
     cxxflags=' \
       -D_LIBCPP_ABI_UNSTABLE \
+      -D_LIBCPP_DISABLE_AVAILABILITY \
       -nostdinc++ \
       -isystem/root/llvm/libcxx/include \
       --target=aarch64-linux-gnu \
diff --git a/build/ubuntu-18.04_x86_64/Dockerfile b/build/ubuntu-18.04_x86_64/Dockerfile
@@ -40,6 +40,7 @@ RUN \
   && ./b2 \
     cxxflags=' \
       -D_LIBCPP_ABI_UNSTABLE \
+      -D_LIBCPP_DISABLE_AVAILABILITY \
       -nostdinc++ \
       -isystem/root/llvm/libcxx/include \
     ' \
diff --git a/build/ubuntu-20.04_x86_64/Dockerfile b/build/ubuntu-20.04_x86_64/Dockerfile
@@ -40,6 +40,7 @@ RUN \
   && ./b2 \
     cxxflags=' \
       -D_LIBCPP_ABI_UNSTABLE \
+      -D_LIBCPP_DISABLE_AVAILABILITY \
       -nostdinc++ \
       -isystem/root/llvm/libcxx/include \
     ' \
diff --git a/doc/USE_SERIAL.md b/doc/USE_SERIAL.md
@@ -38,7 +38,7 @@ send のところでなにか文字列を送って無事 ttys004 経由で表示
 次に /dev/ttys004 に書き込んだら
 
 ```
-$ echo "Hello, world!" > /dev/ttys004
+$ echo "Hello, world" > /dev/ttys004
 ```
 
 http://127.0.0.1:8080/html/test.html の JavaScript Console に表示される事を確認してください。
diff --git a/src/hwenc_jetson/jetson_video_decoder.cpp b/src/hwenc_jetson/jetson_video_decoder.cpp
@@ -125,10 +125,6 @@ int32_t JetsonVideoDecoder::Release() {
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-bool JetsonVideoDecoder::PrefersLateDecoding() const {
-  return true;
-}
-
 const char* JetsonVideoDecoder::ImplementationName() const {
   return "Jetson Video";
 }
diff --git a/src/hwenc_jetson/jetson_video_decoder.h b/src/hwenc_jetson/jetson_video_decoder.h
@@ -37,11 +37,6 @@ class JetsonVideoDecoder : public webrtc::VideoDecoder {
 
   int32_t Release() override;
 
-  // Returns true if the decoder prefer to decode frames late.
-  // That is, it can not decode infinite number of frames before the decoded
-  // frame is consumed.
-  bool PrefersLateDecoding() const override;
-
   const char* ImplementationName() const override;
 
  private:
diff --git a/src/hwenc_mmal/mmal_h264_decoder.cpp b/src/hwenc_mmal/mmal_h264_decoder.cpp
@@ -93,10 +93,6 @@ int32_t MMALH264Decoder::Release() {
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-bool MMALH264Decoder::PrefersLateDecoding() const {
-  return true;
-}
-
 const char* MMALH264Decoder::ImplementationName() const {
   return "MMAL H264";
 }
diff --git a/src/hwenc_mmal/mmal_h264_decoder.h b/src/hwenc_mmal/mmal_h264_decoder.h
@@ -43,11 +43,6 @@ class MMALH264Decoder : public webrtc::VideoDecoder {
 
   int32_t Release() override;
 
-  // Returns true if the decoder prefer to decode frames late.
-  // That is, it can not decode infinite number of frames before the decoded
-  // frame is consumed.
-  bool PrefersLateDecoding() const override;
-
   const char* ImplementationName() const override;
 
  private:
diff --git a/src/util.cpp b/src/util.cpp
@@ -344,7 +344,7 @@ void Util::ParseArgs(int argc,
   // サイマルキャストは VP8, H264 のみで動作する
   if (args.sora_simulcast && args.sora_video_codec_type != "VP8" &&
       args.sora_video_codec_type != "H264") {
-    std::cerr << "Simulcast works only --video-codec=VP8 or --video-codec=H264."
+    std::cerr << "Simulcast works only --video-codec-type=VP8 or --video-codec-type=H264."
               << std::endl;
     exit(1);
   }

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ elseif (TARGET_OS STREQUAL "linux")`
`552`	`552`	`WEBRTC_POSIX`
`553`	`553`	`)`
`554`	`554`	`# Linux 系の場合はカスタムされた libc++ を使っているためオプション追加`
`555`		`- target_compile_definitions(momo PRIVATE _LIBCPP_ABI_UNSTABLE)`
	`555`	`+ target_compile_definitions(momo PRIVATE _LIBCPP_ABI_UNSTABLE _LIBCPP_DISABLE_AVAILABILITY)`
`556`	`556`
`557`	`557`	`set_target_properties(momo PROPERTIES POSITION_INDEPENDENT_CODE ON)`
`558`	`558`	`target_link_libraries(momo`