From 8524f06e515a9f7518fcdd214f6f34f221fe03cb Mon Sep 17 00:00:00 2001 From: NAKAI Ryosuke Date: Sun, 21 Mar 2021 17:21:26 +0900 Subject: [PATCH 1/7] =?UTF-8?q?2021.2.2=20=E3=81=AE=E3=83=AA=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=82=B9=E3=83=8E=E3=83=BC=E3=83=88=E3=82=92=E7=94=A8?= =?UTF-8?q?=E6=84=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index ed631977..5b6e98a4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,8 @@ ## develop +## 2021.2.2 + - [UPDATE] cmake を 3.19.6 に上げる - @voluntas - [UPDATE] `libwebrtc` を `M89.4389@{#7}` に上げる From 968a61797f01a575c224ab06268349360ecfe317 Mon Sep 17 00:00:00 2001 From: enm10k Date: Mon, 29 Mar 2021 16:43:13 +0900 Subject: [PATCH 2/7] =?UTF-8?q?JetsonVideoEncoder::SendFrame=20=E3=81=AB?= =?UTF-8?q?=20null=20=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hwenc_jetson/jetson_video_encoder.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/hwenc_jetson/jetson_video_encoder.cpp b/src/hwenc_jetson/jetson_video_encoder.cpp index 087f1666..8b6b69a5 100644 --- a/src/hwenc_jetson/jetson_video_encoder.cpp +++ b/src/hwenc_jetson/jetson_video_encoder.cpp @@ -902,6 +902,13 @@ int32_t JetsonVideoEncoder::SendFrame(unsigned char* buffer, size_t size, std::unique_ptr params, v4l2_ctrl_videoenc_outputbuf_metadata enc_metadata) { + if (!callback_) { + RTC_LOG(LS_WARNING) + << "InitEncode() has been called, but a callback function " + << "has not been set with RegisterEncodeCompleteCallback()"; + return WEBRTC_VIDEO_CODEC_UNINITIALIZED; + } + encoded_image_.SetTimestamp(params->timestamp_rtp); encoded_image_.SetColorSpace(params->color_space); encoded_image_._encodedWidth = params->width; From 5df72887f46cb3ed170de43a5da5e001e48221d2 Mon Sep 17 00:00:00 2001 From: enm10k Date: Mon, 29 Mar 2021 17:10:47 +0900 Subject: [PATCH 3/7] =?UTF-8?q?CHANGES.md=20=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 5b6e98a4..215d8bf5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,9 @@ ## develop +- [FIX] Jetson で HW エンコーダー指定時に、初期化タイミングによって、まれにセグフォが発生する問題を修正する + - @enm10k + ## 2021.2.2 - [UPDATE] cmake を 3.19.6 に上げる From 24a4aeb98e4ba7ce995be0fbe30ef5be2b8e44c6 Mon Sep 17 00:00:00 2001 From: NAKAI Ryosuke Date: Tue, 30 Mar 2021 12:26:01 +0900 Subject: [PATCH 4/7] =?UTF-8?q?cmake=20=E3=82=92=203.20.0=20=E3=81=AB?= =?UTF-8?q?=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 4 ++++ VERSION | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 5b6e98a4..fa1a95e6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,10 @@ ## develop +- [UPDATE] cmake を 3.20.0 に上げる + - @voluntas + + ## 2021.2.2 - [UPDATE] cmake を 3.19.6 に上げる diff --git a/VERSION b/VERSION index 5f12cdc0..c6631d4b 100644 --- a/VERSION +++ b/VERSION @@ -3,5 +3,5 @@ WEBRTC_BUILD_VERSION=89.4389.7.0 BOOST_VERSION=1.75.0 CLI11_VERSION=1.9.1 SDL2_VERSION=2.0.14 -CMAKE_VERSION=3.19.6 +CMAKE_VERSION=3.20.0 CUDA_VERSION=11.0.2-1 From 5a2445d217d34015c55d660f8672dc14964aff15 Mon Sep 17 00:00:00 2001 From: melpon Date: Tue, 30 Mar 2021 14:48:14 +0900 Subject: [PATCH 5/7] =?UTF-8?q?CMake=20=E3=81=AE=E3=83=80=E3=82=A6?= =?UTF-8?q?=E3=83=B3=E3=83=AD=E3=83=BC=E3=83=89=20URL=20=E3=82=92=E6=96=B0?= =?UTF-8?q?=E3=81=97=E3=81=84=E3=81=AE=E3=81=AB=E5=88=87=E3=82=8A=E6=9B=BF?= =?UTF-8?q?=E3=81=88=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/raspberry-pi-os_armv6/Dockerfile | 2 +- build/raspberry-pi-os_armv7/Dockerfile | 2 +- build/raspberry-pi-os_armv8/Dockerfile | 2 +- build/ubuntu-18.04_armv8_jetson_nano/Dockerfile | 2 +- build/ubuntu-18.04_armv8_jetson_xavier/Dockerfile | 2 +- build/ubuntu-18.04_x86_64/Dockerfile | 2 +- build/ubuntu-20.04_x86_64/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/raspberry-pi-os_armv6/Dockerfile b/build/raspberry-pi-os_armv6/Dockerfile index 4feb2e44..e92b2425 100644 --- a/build/raspberry-pi-os_armv6/Dockerfile +++ b/build/raspberry-pi-os_armv6/Dockerfile @@ -78,5 +78,5 @@ RUN git clone --branch v$CLI11_VERSION --depth 1 https://github.com/CLIUtils/CLI # CMake のインストール ARG CMAKE_VERSION COPY script/get_cmake.sh /root/ -RUN /root/get_cmake.sh "$CMAKE_VERSION" Linux /root +RUN /root/get_cmake.sh "$CMAKE_VERSION" linux /root ENV PATH "/root/cmake/bin:$PATH" diff --git a/build/raspberry-pi-os_armv7/Dockerfile b/build/raspberry-pi-os_armv7/Dockerfile index f9cb3071..3acabb84 100644 --- a/build/raspberry-pi-os_armv7/Dockerfile +++ b/build/raspberry-pi-os_armv7/Dockerfile @@ -78,7 +78,7 @@ RUN git clone --branch v$CLI11_VERSION --depth 1 https://github.com/CLIUtils/CLI # CMake のインストール ARG CMAKE_VERSION COPY script/get_cmake.sh /root/ -RUN /root/get_cmake.sh "$CMAKE_VERSION" Linux /root +RUN /root/get_cmake.sh "$CMAKE_VERSION" linux /root ENV PATH "/root/cmake/bin:$PATH" # SDL2 のビルド diff --git a/build/raspberry-pi-os_armv8/Dockerfile b/build/raspberry-pi-os_armv8/Dockerfile index 6e7c3c83..eea70952 100644 --- a/build/raspberry-pi-os_armv8/Dockerfile +++ b/build/raspberry-pi-os_armv8/Dockerfile @@ -78,5 +78,5 @@ RUN git clone --branch v$CLI11_VERSION --depth 1 https://github.com/CLIUtils/CLI # CMake のインストール ARG CMAKE_VERSION COPY script/get_cmake.sh /root/ -RUN /root/get_cmake.sh "$CMAKE_VERSION" Linux /root +RUN /root/get_cmake.sh "$CMAKE_VERSION" linux /root ENV PATH "/root/cmake/bin:$PATH" diff --git a/build/ubuntu-18.04_armv8_jetson_nano/Dockerfile b/build/ubuntu-18.04_armv8_jetson_nano/Dockerfile index 2c6c6a22..536147af 100644 --- a/build/ubuntu-18.04_armv8_jetson_nano/Dockerfile +++ b/build/ubuntu-18.04_armv8_jetson_nano/Dockerfile @@ -83,7 +83,7 @@ RUN git clone --branch v$CLI11_VERSION --depth 1 https://github.com/CLIUtils/CLI # CMake のインストール ARG CMAKE_VERSION COPY script/get_cmake.sh /root/ -RUN /root/get_cmake.sh "$CMAKE_VERSION" Linux /root +RUN /root/get_cmake.sh "$CMAKE_VERSION" linux /root ENV PATH "/root/cmake/bin:$PATH" # SDL2 のビルド diff --git a/build/ubuntu-18.04_armv8_jetson_xavier/Dockerfile b/build/ubuntu-18.04_armv8_jetson_xavier/Dockerfile index 2c6c6a22..536147af 100644 --- a/build/ubuntu-18.04_armv8_jetson_xavier/Dockerfile +++ b/build/ubuntu-18.04_armv8_jetson_xavier/Dockerfile @@ -83,7 +83,7 @@ RUN git clone --branch v$CLI11_VERSION --depth 1 https://github.com/CLIUtils/CLI # CMake のインストール ARG CMAKE_VERSION COPY script/get_cmake.sh /root/ -RUN /root/get_cmake.sh "$CMAKE_VERSION" Linux /root +RUN /root/get_cmake.sh "$CMAKE_VERSION" linux /root ENV PATH "/root/cmake/bin:$PATH" # SDL2 のビルド diff --git a/build/ubuntu-18.04_x86_64/Dockerfile b/build/ubuntu-18.04_x86_64/Dockerfile index e170fa48..f14811b3 100644 --- a/build/ubuntu-18.04_x86_64/Dockerfile +++ b/build/ubuntu-18.04_x86_64/Dockerfile @@ -66,7 +66,7 @@ RUN git clone --branch v$CLI11_VERSION --depth 1 https://github.com/CLIUtils/CLI # CMake のインストール ARG CMAKE_VERSION COPY script/get_cmake.sh /root/ -RUN /root/get_cmake.sh "$CMAKE_VERSION" Linux /root +RUN /root/get_cmake.sh "$CMAKE_VERSION" linux /root ENV PATH "/root/cmake/bin:$PATH" # SDL2 のビルド diff --git a/build/ubuntu-20.04_x86_64/Dockerfile b/build/ubuntu-20.04_x86_64/Dockerfile index 7ceaf0db..dbaba38d 100644 --- a/build/ubuntu-20.04_x86_64/Dockerfile +++ b/build/ubuntu-20.04_x86_64/Dockerfile @@ -66,7 +66,7 @@ RUN git clone --branch v$CLI11_VERSION --depth 1 https://github.com/CLIUtils/CLI # CMake のインストール ARG CMAKE_VERSION COPY script/get_cmake.sh /root/ -RUN /root/get_cmake.sh "$CMAKE_VERSION" Linux /root +RUN /root/get_cmake.sh "$CMAKE_VERSION" linux /root ENV PATH "/root/cmake/bin:$PATH" # SDL2 のビルド From 62eac34c8165a2a898687e786fd941287ee3e88a Mon Sep 17 00:00:00 2001 From: NAKAI Ryosuke Date: Wed, 31 Mar 2021 18:02:18 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 70be441c..22223dbe 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,10 +11,12 @@ ## develop +## 2021.2.3 + +- [UPDATE] cmake を 3.20.0 に上げる + - @melpon @voluntas - [FIX] Jetson で HW エンコーダー指定時に、初期化タイミングによって、まれにセグフォが発生する問題を修正する - @enm10k -- [UPDATE] cmake を 3.20.0 に上げる - - @voluntas ## 2021.2.2 From 58cfcb024a8bcb6369fdf9a4461743cea21ae217 Mon Sep 17 00:00:00 2001 From: NAKAI Ryosuke Date: Wed, 31 Mar 2021 18:03:01 +0900 Subject: [PATCH 7/7] =?UTF-8?q?2021.2.3=20=E3=81=AB=E4=B8=8A=E3=81=92?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c6631d4b..92a1da34 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -MOMO_VERSION=2021.2.2 +MOMO_VERSION=2021.2.3 WEBRTC_BUILD_VERSION=89.4389.7.0 BOOST_VERSION=1.75.0 CLI11_VERSION=1.9.1