cfg/per-sequence/BasketballDrive.cfg

@@ -7,5 +7,6 @@ FrameSkip                     : 0           # Number of frames to be skipped in
 SourceWidth                   : 1920        # Input  frame width
 SourceHeight                  : 1080        # Input  frame height
 FramesToBeEncoded             : 500         # Number of frames to be coded
+LastValidFrame                : 499
 
 Level                         : 4.1

cfg/per-sequence/BasketballPass.cfg

@@ -7,5 +7,6 @@ FrameSkip                     : 0           # Number of frames to be skipped in
 SourceWidth                   : 416         # Input  frame width
 SourceHeight                  : 240         # Input  frame height
 FramesToBeEncoded             : 500         # Number of frames to be coded
+LastValidFrame                : 499
 
 Level                         : 2.1

cfg/per-sequence/BlowingBubbles.cfg

@@ -7,5 +7,6 @@ FrameSkip                     : 0           # Number of frames to be skipped in
 SourceWidth                   : 416         # Input  frame width
 SourceHeight                  : 240         # Input  frame height
 FramesToBeEncoded             : 500         # Number of frames to be coded
+LastValidFrame                : 499
 
 Level                         : 2.1

cfg/per-sequence/ChineseEditing_420.cfg

+#======== File I/O ===============
+InputFile                     : ChineseEditing_1920x1080_60_8bit_420.yuv
+InputBitDepth                 : 8           # Input bitdepth
+InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
+FrameRate                     : 60          # Frame Rate per second
+FrameSkip                     : 0           # Number of frames to be skipped in input
+SourceWidth                   : 1920        # Input  frame width
+SourceHeight                  : 1080        # Input  frame height
+FramesToBeEncoded             : 600         # Number of frames to be coded
+
+Level                         : 6.2

cfg/per-sequence/Console_420.cfg

+#======== File I/O ===============
+InputFile                     : sc_console_1920x1080_60_8bit_420.yuv
+InputBitDepth                 : 8           # Input bitdepth
+InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
+FrameRate                     : 60          # Frame Rate per second
+FrameSkip                     : 0           # Number of frames to be skipped in input
+SourceWidth                   : 1920        # Input  frame width
+SourceHeight                  : 1080        # Input  frame height
+FramesToBeEncoded             : 600         # Number of frames to be coded
+
+Level                         : 6.2

cfg/per-sequence/Desktop_420.cfg

+#======== File I/O ===============
+InputFile                     : sc_desktop_1920x1080_60_8bit_420.yuv
+InputBitDepth                 : 8           # Input bitdepth
+InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
+FrameRate                     : 60          # Frame Rate per second
+FrameSkip                     : 0           # Number of frames to be skipped in input
+SourceWidth                   : 1920        # Input  frame width
+SourceHeight                  : 1080        # Input  frame height
+FramesToBeEncoded             : 600         # Number of frames to be coded
+
+Level                         : 6.2

cfg/per-sequence/FlyingGraphics_420.cfg

+#======== File I/O ===============
+InputFile                     : sc_flyingGraphics_1920x1080_60_8bit_420.yuv
+InputBitDepth                 : 8           # Input bitdepth
+InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
+FrameRate                     : 60          # Frame Rate per second
+FrameSkip                     : 0           # Number of frames to be skipped in input
+SourceWidth                   : 1920        # Input  frame width
+SourceHeight                  : 1080        # Input  frame height
+FramesToBeEncoded             : 300         # Number of frames to be coded
+
+Level                         : 6.2

cfg/per-sequence/NebutaFestival_10bit.cfg

@@ -7,5 +7,6 @@ FrameSkip                     : 0           # Number of frames to be skipped in
 SourceWidth                   : 2560        # Input  frame width
 SourceHeight                  : 1600        # Input  frame height
 FramesToBeEncoded             : 300         # Number of frames to be coded
+LastValidFrame                : 299
 
 Level                         : 5

cfg/per-sequence/PartyScene.cfg

@@ -7,5 +7,6 @@ FrameSkip                     : 0           # Number of frames to be skipped in
 SourceWidth                   : 832         # Input  frame width
 SourceHeight                  : 480         # Input  frame height
 FramesToBeEncoded             : 500         # Number of frames to be coded
+LastValidFrame                : 499
 
 Level                         : 3.1

cfg/per-sequence/SocialNetworkMap_444.cfg

@@ -7,5 +7,6 @@ FrameSkip                     : 0           # Number of frames to be skipped in
 SourceWidth                   : 1920        # Input  frame width
 SourceHeight                  : 1080        # Input  frame height
 FramesToBeEncoded             : 600         # Number of frames to be coded
+LastValidFrame                : 599
 
 Level                         : 6.2

cfg/per-sequence/SocialNetworkMap_RGB.cfg

@@ -7,6 +7,7 @@ FrameSkip                     : 0           # Number of frames to be skipped in
 SourceWidth                   : 1920        # Input  frame width
 SourceHeight                  : 1080        # Input  frame height
 FramesToBeEncoded             : 600         # Number of frames to be coded
+LastValidFrame                : 599
 InputColourSpaceConvert       : RGBtoGBR    # Non-normative colour space conversion to apply to input video
 SNRInternalColourSpace        : 1           # Evaluate SNRs in GBR order
 OutputInternalColourSpace     : 0           # Convert recon output back to RGB order. Use --OutputColourSpaceConvert GBRtoRGB on decoder to produce a matching output file.

cfg/per-sequence/SteamLocomotiveTrain_10bit.cfg

@@ -7,5 +7,6 @@ FrameSkip                     : 0           # Number of frames to be skipped in
 SourceWidth                   : 2560        # Input  frame width
 SourceHeight                  : 1600        # Input  frame height
 FramesToBeEncoded             : 300         # Number of frames to be coded
+LastValidFrame                : 299
 
 Level                         : 5

cfg/rpr/scale1.25x.cfg

+# Reference picture resampling CE settings for scaling ratio and number of encoded frames
+
+RPR                                 : 1
+ScalingRatioHor                     : 1.25
+ScalingRatioVer                     : 1.25
+FractionNumFrames                   : 1.0
+UpscaledOutput                      : 1
\ No newline at end of file

cfg/rpr/scale1.33x.cfg

+# Reference picture resampling CE settings for scaling ratio and number of encoded frames
+
+RPR                                 : 1
+ScalingRatioHor                     : 1.333333
+ScalingRatioVer                     : 1.333333
+FractionNumFrames                   : 1.0
+UpscaledOutput                      : 1
\ No newline at end of file

cfg/rpr/scale1.5x.cfg

 # Reference picture resampling CE settings for scaling ratio and number of encoded frames
 
+RPR                                 : 1
 ScalingRatioHor                     : 1.5
 ScalingRatioVer                     : 1.5
 FractionNumFrames                   : 0.5

cfg/rpr/scale2.0x.cfg

 # Reference picture resampling CE settings for scaling ratio and number of encoded frames
 
+RPR                                 : 1
 ScalingRatioHor                     : 2.0
 ScalingRatioVer                     : 2.0
 FractionNumFrames                   : 0.5

cmake/CMakeBuild/bin/cmake.py

-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # cmake.py
 #

cmake/CMakeBuild/bin/cmake_docutil.py

-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # cmake_docutil.py
 #

cmake/CMakeBuild/bin/cmakebuild_update.py

-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # cmakebuild_update.py
 #

cmake/CMakeBuild/cmake/modules/BBuildEnv.cmake

@@ -873,6 +873,9 @@ function( _bb_query_system_info system_info_ )
     endif()
   elseif( CMAKE_HOST_APPLE )
     set( _system_info "macosx" )
+    if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm64" )
+      set( _os_arch "arm64" )
+    endif()
     if( NOT CMAKE_VERSION VERSION_LESS 3.10.0 )
       # sw_vers -productVersion
       cmake_host_system_information( RESULT _lsb_distro_version QUERY OS_RELEASE )
@@ -973,7 +976,9 @@ function( _bb_get_platform_dir platform_dir_ )
       set( _platform_dir "${CMAKE_SYSTEM_PROCESSOR}" )
     endif()  
   else()
-    if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+    if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm64" )
+      set( _platform_dir "arm64" )
+    elseif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
       set( _platform_dir "x86_64" )
     else()
       set( _platform_dir "x86" )