update branch name

Signed-off-by: Yuji Ito <llamerada.jp@gmail.com>
llamerada-jp · Jan 8, 2023 · 11a62f0 · 11a62f0
1 parent 4552ec0
commit 11a62f0
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 54 deletions.
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ This program automatically uses the latest stable version of WebRTC's source cod
 At amd64 linux environment.
 
 ```sh
+sudo dpkg --add-architecture i386
 go run . build
 go run . test
 ```

diff --git a/configs/linux_amd64.yml b/configs/linux_amd64.yml
@@ -4,6 +4,7 @@ BuildDepsOpts:
 - '--no-chromeos-fonts'
 - '--no-nacl'
 GnOpts:
+- 'enable_libaom=false'
 - 'libyuv_disable_jpeg=true'
 - 'rtc_build_opus=false'
 - 'rtc_enable_protobuf=false'
@@ -15,7 +16,6 @@ GnOpts:
 - 'rtc_include_opus=false'
 - 'rtc_include_pulse_audio=false'
 - 'rtc_use_dummy_audio_file_devices=true'
-- 'rtc_use_gtk=false'
 - 'rtc_use_x11=false'
 - 'target_cpu="x64"'
 - 'target_os="linux"'
@@ -38,10 +38,8 @@ Headers:
 - 'modules/audio_coding/include'
 - 'modules/audio_device/include'
 - 'modules/audio_processing/include'
-# - 'modules/bitrate_controller/include'
 - 'modules/congestion_controller/include'
 - 'modules/include'
-- 'modules/remote_bitrate_estimator/include'
 - 'modules/rtp_rtcp/include'
 - 'modules/rtp_rtcp/source'
 - 'modules/utility/include'
@@ -50,21 +48,21 @@ Headers:
 - 'modules/video_coding/codecs/vp9/include'
 - 'modules/video_coding/include'
 - 'pc'
-# - 'rtc_base'
 - 'system_wrappers/include'
 # add by myself
-- '.'
 - 'call'
 - 'common_video'
 - 'common_video/include'
 - 'common_video/generic_frame_descriptor'
 - 'logging/rtc_event_log'
 - 'logging/rtc_event_log/events'
+- 'logging/rtc_event_log/encoder'
 - 'modules/async_audio_processing'
 - 'modules/rtp_rtcp/source/rtcp_packet'
 - 'modules/video_coding'
 - 'modules/video_coding/codecs/interface'
 - 'p2p/base'
+- 'video/config'
 HeadersWithSubdir:
 - 'api'
 # add by myself

diff --git a/configs/linux_arm64.yml b/configs/linux_arm64.yml
@@ -5,6 +5,7 @@ BuildDepsOpts:
 - '--no-nacl'
 SysrootArch: arm64
 GnOpts:
+- 'enable_libaom=false'
 - 'libyuv_disable_jpeg=true'
 - 'rtc_build_opus=false'
 - 'rtc_enable_protobuf=false'
@@ -16,12 +17,14 @@ GnOpts:
 - 'rtc_include_opus=false'
 - 'rtc_include_pulse_audio=false'
 - 'rtc_use_dummy_audio_file_devices=true'
-- 'rtc_use_gtk=false'
 - 'rtc_use_x11=false'
 - 'target_cpu="arm64"'
 - 'target_os="linux"'
+# avoid build error caused by using std::is_pod
+- 'treat_warnings_as_errors=false'
 - 'use_custom_libcxx=false'
 - 'use_libjpeg_turbo=false'
+- 'use_gtk=false'
 - 'use_rtti=true'
 - 'use_system_libjpeg=true'
 BuildTargets:
@@ -39,10 +42,8 @@ Headers:
 - 'modules/audio_coding/include'
 - 'modules/audio_device/include'
 - 'modules/audio_processing/include'
-# - 'modules/bitrate_controller/include'
 - 'modules/congestion_controller/include'
 - 'modules/include'
-- 'modules/remote_bitrate_estimator/include'
 - 'modules/rtp_rtcp/include'
 - 'modules/rtp_rtcp/source'
 - 'modules/utility/include'
@@ -51,21 +52,21 @@ Headers:
 - 'modules/video_coding/codecs/vp9/include'
 - 'modules/video_coding/include'
 - 'pc'
-# - 'rtc_base'
 - 'system_wrappers/include'
-# add by myself
 - '.'
 - 'call'
 - 'common_video'
 - 'common_video/include'
 - 'common_video/generic_frame_descriptor'
 - 'logging/rtc_event_log'
 - 'logging/rtc_event_log/events'
+- 'logging/rtc_event_log/encoder'
 - 'modules/async_audio_processing'
 - 'modules/rtp_rtcp/source/rtcp_packet'
 - 'modules/video_coding'
 - 'modules/video_coding/codecs/interface'
 - 'p2p/base'
+- 'video/config'
 HeadersWithSubdir:
 - 'api'
 # add by myself

diff --git a/configs/linux_armhf.yml b/configs/linux_armhf.yml
@@ -6,6 +6,7 @@ BuildDepsOpts:
 SysrootArch: arm
 GnOpts:
 - 'arm_float_abi="hard"'
+- 'enable_libaom=false'
 - 'libyuv_disable_jpeg=true'
 - 'rtc_build_opus=false'
 - 'rtc_enable_protobuf=false'
@@ -17,12 +18,14 @@ GnOpts:
 - 'rtc_include_opus=false'
 - 'rtc_include_pulse_audio=false'
 - 'rtc_use_dummy_audio_file_devices=true'
-- 'rtc_use_gtk=false'
 - 'rtc_use_x11=false'
 - 'target_cpu="arm"'
 - 'target_os="linux"'
+# avoid build error caused by using std::is_pod
+- 'treat_warnings_as_errors=false'
 - 'use_custom_libcxx=false'
 - 'use_libjpeg_turbo=false'
+- 'use_gtk=false'
 - 'use_rtti=true'
 - 'use_system_libjpeg=true'
 BuildTargets:
@@ -40,10 +43,8 @@ Headers:
 - 'modules/audio_coding/include'
 - 'modules/audio_device/include'
 - 'modules/audio_processing/include'
-# - 'modules/bitrate_controller/include'
 - 'modules/congestion_controller/include'
 - 'modules/include'
-- 'modules/remote_bitrate_estimator/include'
 - 'modules/rtp_rtcp/include'
 - 'modules/rtp_rtcp/source'
 - 'modules/utility/include'
@@ -52,21 +53,21 @@ Headers:
 - 'modules/video_coding/codecs/vp9/include'
 - 'modules/video_coding/include'
 - 'pc'
-# - 'rtc_base'
 - 'system_wrappers/include'
 # add by myself
-- '.'
 - 'call'
 - 'common_video'
 - 'common_video/include'
 - 'common_video/generic_frame_descriptor'
 - 'logging/rtc_event_log'
 - 'logging/rtc_event_log/events'
+- 'logging/rtc_event_log/encoder'
 - 'modules/async_audio_processing'
 - 'modules/rtp_rtcp/source/rtcp_packet'
 - 'modules/video_coding'
 - 'modules/video_coding/codecs/interface'
 - 'p2p/base'
+- 'video/config'
 HeadersWithSubdir:
 - 'api'
 # add by myself

diff --git a/configs/linux_i386.yml b/configs/linux_i386.yml
@@ -5,6 +5,7 @@ BuildDepsOpts:
 - '--no-nacl'
 SysrootArch: x86
 GnOpts:
+- 'enable_libaom=false'
 - 'libyuv_disable_jpeg=true'
 - 'rtc_build_opus=false'
 - 'rtc_enable_protobuf=false'
@@ -16,12 +17,14 @@ GnOpts:
 - 'rtc_include_opus=false'
 - 'rtc_include_pulse_audio=false'
 - 'rtc_use_dummy_audio_file_devices=true'
-- 'rtc_use_gtk=false'
 - 'rtc_use_x11=false'
 - 'target_cpu="x86"'
 - 'target_os="linux"'
+# avoid build error caused by using std::is_pod
+- 'treat_warnings_as_errors=false'
 - 'use_custom_libcxx=false'
 - 'use_libjpeg_turbo=false'
+- 'use_gtk=false'
 - 'use_rtti=true'
 - 'use_system_libjpeg=true'
 BuildTargets:
@@ -39,10 +42,8 @@ Headers:
 - 'modules/audio_coding/include'
 - 'modules/audio_device/include'
 - 'modules/audio_processing/include'
-# - 'modules/bitrate_controller/include'
 - 'modules/congestion_controller/include'
 - 'modules/include'
-- 'modules/remote_bitrate_estimator/include'
 - 'modules/rtp_rtcp/include'
 - 'modules/rtp_rtcp/source'
 - 'modules/utility/include'
@@ -51,21 +52,21 @@ Headers:
 - 'modules/video_coding/codecs/vp9/include'
 - 'modules/video_coding/include'
 - 'pc'
-# - 'rtc_base'
 - 'system_wrappers/include'
 # add by myself
-- '.'
 - 'call'
 - 'common_video'
 - 'common_video/include'
 - 'common_video/generic_frame_descriptor'
 - 'logging/rtc_event_log'
 - 'logging/rtc_event_log/events'
+- 'logging/rtc_event_log/encoder'
 - 'modules/async_audio_processing'
 - 'modules/rtp_rtcp/source/rtcp_packet'
 - 'modules/video_coding'
 - 'modules/video_coding/codecs/interface'
 - 'p2p/base'
+- 'video/config'
 HeadersWithSubdir:
 - 'api'
 # add by myself

diff --git a/configs/macos_amd64.yml b/configs/macos_amd64.yml
@@ -32,10 +32,8 @@ Headers:
 - 'modules/audio_coding/include'
 - 'modules/audio_device/include'
 - 'modules/audio_processing/include'
-# - 'modules/bitrate_controller/include'
 - 'modules/congestion_controller/include'
 - 'modules/include'
-- 'modules/remote_bitrate_estimator/include'
 - 'modules/rtp_rtcp/include'
 - 'modules/rtp_rtcp/source'
 - 'modules/utility/include'
@@ -44,21 +42,21 @@ Headers:
 - 'modules/video_coding/codecs/vp9/include'
 - 'modules/video_coding/include'
 - 'pc'
-# - 'rtc_base'
 - 'system_wrappers/include'
 # add by myself
-- '.'
 - 'call'
 - 'common_video'
 - 'common_video/include'
 - 'common_video/generic_frame_descriptor'
 - 'logging/rtc_event_log'
 - 'logging/rtc_event_log/events'
+- 'logging/rtc_event_log/encoder'
 - 'modules/async_audio_processing'
 - 'modules/rtp_rtcp/source/rtcp_packet'
 - 'modules/video_coding'
 - 'modules/video_coding/codecs/interface'
 - 'p2p/base'
+- 'video/config'
 HeadersWithSubdir:
 - 'api'
 # add by myself

diff --git a/test/Makefile b/test/Makefile
@@ -21,7 +21,7 @@ ifeq ($(ARCH),arm64)
 endif
 
 # build option
-CXX_FLAGS := $(CXX_FLAGS) -std=c++14 -fvisibility=hidden -fvisibility-inlines-hidden
+CXX_FLAGS := $(CXX_FLAGS) -std=c++17 -fvisibility=hidden -fvisibility-inlines-hidden
 
 # build option by OS
 ifeq ($(shell uname),Linux)