DRAFT: Rebase av2enc on main

.github/workflows/build-job-reusable.yaml

@@ -58,10 +58,11 @@ jobs:
       AVM_BUILD_CONFIG: ${{ inputs.avm-build-config }}
       PARENT_JOB_NAME: ${{ inputs.parent-job-name }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
         with:
           fetch-depth: 50
           lfs: true
+          persist-credentials: false
 
       - uses: ./.github/actions/common-setup
         with:
@@ -71,7 +72,7 @@ jobs:
       - name: Run before-script
         run: ${{ inputs.before-script }}
 
-      - uses: actions/cache/restore@v5
+      - uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: ccache
           key: non-existent
@@ -124,9 +125,6 @@ jobs:
             bitstream-mismatch-debug)
               CMAKE_FLAGS="${CMAKE_FLAGS} -DCONFIG_BITSTREAM_DEBUG=1 -DCONFIG_MISMATCH_DEBUG=1"
               ;;
-            enable-12bit-profile)
-              CMAKE_FLAGS="${CMAKE_FLAGS} -DCONFIG_TESTONLY_12BIT_SUPPORT=1"
-              ;;
             nasm)
               CMAKE_FLAGS="${CMAKE_FLAGS} -DENABLE_NASM=1"
               ;;
@@ -179,13 +177,13 @@ jobs:
         run: |
           ccache --show-stats
 
-      - uses: actions/cache/save@v5
+      - uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: ccache
           key: ${{ inputs.parent-job-name }}-${{ inputs.avm-build-config }}-${{ github.run_id }}
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         if: ${{ success() && inputs.artifact-paths != '' }}
         with:
           name: ${{ inputs.parent-job-name }}-${{ inputs.avm-build-config }}

.github/workflows/common-builds-reusable.yaml

@@ -70,7 +70,6 @@ jobs:
           - nasm
           - no-examples
           - debug
-          - enable-12bit-profile
 
   build-entropy-stats:
     name: Build (entropy-stats)
@@ -105,21 +104,6 @@ jobs:
         avm-build-config:
           - bitstream-mismatch-debug
 
-  build-enable-12bit-profile:
-    name: Build (enable-12bit-profile)
-    uses: ./.github/workflows/build-job-reusable.yaml
-    if: (!cancelled())
-    with:
-      avm-build-config: ${{ matrix.avm-build-config }}
-      parent-job-name: build-enable-12bit-profile
-      runner: ${{ inputs.runner }}
-      container-image: ${{ inputs.container-image }}
-      show-github-context: true
-    strategy:
-      matrix:
-        avm-build-config:
-          - enable-12bit-profile
-
   build-x86-linux-gcc:
     name: Build (x86-linux-gcc)
     uses: ./.github/workflows/build-job-reusable.yaml
@@ -302,10 +286,11 @@ jobs:
     container:
       image: ${{ inputs.container-image }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
         with:
           fetch-depth: 50
           lfs: true
+          persist-credentials: false
 
       - uses: ./.github/actions/common-setup
 
@@ -326,7 +311,7 @@ jobs:
           cmake --build avm_docs_build --target docs
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         if: success()
         with:
           name: documentation
@@ -353,14 +338,15 @@ jobs:
       CCACHE_COMPILERCHECK: content
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
         with:
           fetch-depth: 50
           lfs: true
+          persist-credentials: false
 
       - uses: ./.github/actions/common-setup
 
-      - uses: actions/cache/restore@v5
+      - uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: ccache
           key: non-existent
@@ -427,13 +413,13 @@ jobs:
         run: |
           ccache --show-stats
 
-      - uses: actions/cache/save@v5
+      - uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: ccache
           key: ${{ github.job }}-${{ matrix.avm-sanitizer-type }}-${{ github.run_id }}
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         if: always()
         with:
           name: avm-sanitizers-${{ matrix.avm-sanitizer-type }}
@@ -465,15 +451,16 @@ jobs:
       CCACHE_DIR: ${{ github.workspace }}/ccache
       CCACHE_COMPILERCHECK: content
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
         with:
           fetch-depth: 50
           fetch-tags: true
           lfs: true
+          persist-credentials: false
 
       - uses: ./.github/actions/common-setup
 
-      - uses: actions/cache/restore@v5
+      - uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: ccache
           key: non-existent
@@ -502,13 +489,13 @@ jobs:
         run: |
           ccache --show-stats
 
-      - uses: actions/cache/save@v5
+      - uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: ccache
           key: ${{ github.job }}-${{ github.run_id }}
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         if: success()
         with:
           name: example-build

.github/workflows/common-test-data-reusable.yaml

@@ -26,10 +26,11 @@ jobs:
     env:
       LIBAVM_TEST_DATA_PATH: ${{ github.workspace }}/libavm-test-data
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
         with:
           fetch-depth: 50
           lfs: true
+          persist-credentials: false
 
       - uses: ./.github/actions/common-setup
 
@@ -39,7 +40,7 @@ jobs:
           cmake --build avm_testdata --target testdata
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         if: success()
         with:
           name: "${{ github.job }}"

.github/workflows/pull_request.yaml

@@ -336,6 +336,12 @@ jobs:
       "
 
     steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 50
+
+      - uses: ./.github/actions/common-setup
+
       - name: Configure AVM encoder
         run: |
           if [ -z "${AVMENC_OUTPUT}" ]; then
@@ -484,7 +490,7 @@ jobs:
           ALLOW_FAIL=0
           FAILED=0
 
-          if [ -n "$(git --no-pager log --grep STATS_CHANGED --format=format:"%H" "${{ github.event.pull_request.base.sha }}..${{ github.sha }}")" ]; then
+          if [ -n "$(git --no-pager log --grep STATS_CHANGED --format=format:"%H" "${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}")" ]; then
             ALLOW_FAIL=1
           fi
 
@@ -507,7 +513,7 @@ jobs:
               echo "         commits contain the STATS_CHANGED keyword, so mismatch"
               echo "         of encode outputs is allowed."
               echo "Commits containing STATS_CHANGED added in this MR:"
-              git --no-pager log --grep STATS_CHANGED --format=format:"%h: %s; \"%aN\" <%aE>" "${{ github.event.pull_request.base.sha }}..${{ github.sha }}"
+              git --no-pager log --grep STATS_CHANGED --format=format:"%h: %s; \"%aN\" <%aE>" "${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}"
               echo ""
               exit 0
             fi

.github/workflows/sanitizer-job-reusable.yaml

@@ -61,23 +61,24 @@ jobs:
       AVM_SANITIZER_TYPE: ${{ inputs.avm-sanitizer-type }}
       USE_LARGE_TESTS: ${{ inputs.use-large-tests }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
         with:
           fetch-depth: 50
           lfs: true
+          persist-credentials: false
 
       - uses: ./.github/actions/common-setup
         with:
           show-github-context: ${{ inputs.show-github-context }}
           extra-env-vars: ${{ inputs.extra-env-vars }}
 
       - name: Get sanitizer build
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           name: avm-sanitizers-${{ inputs.avm-sanitizer-type }}
 
       - name: Get test data
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           name: test-data
           path: libavm-test-data
@@ -227,7 +228,7 @@ jobs:
           exit ${exit_code}
 
       - name: Upload logs
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         if: ${{ always() }}
         with:
           name: sanitizer-${{ inputs.avm-sanitizer-type }}-logs

CMakeLists.txt

@@ -911,7 +911,8 @@ foreach(avm_app ${AVM_APP_TARGETS})
   target_link_libraries(${avm_app} ${AVM_LIB_LINK_TYPE} avm)
 endforeach()
 
-if(ENABLE_EXAMPLES
+if(ENABLE_APPS
+   OR ENABLE_EXAMPLES
    OR ENABLE_TESTS
    OR ENABLE_TOOLS)
   if(CONFIG_LIBYUV)
@@ -1015,10 +1016,8 @@ if(ENABLE_EXAMPLES AND "${CMAKE_GENERATOR}" MATCHES "Makefiles$")
   file(MAKE_DIRECTORY "${AVM_CONFIG_DIR}/examples")
 
   foreach(target ${AVM_EXAMPLE_TARGETS})
-    if(NOT "${target}" MATCHES "avmdec\|avmenc")
-      set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-                                                 "${AVM_CONFIG_DIR}/examples")
-    endif()
+    set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+                                               "${AVM_CONFIG_DIR}/examples")
   endforeach()
 
   if(ENABLE_TOOLS AND AVM_TOOL_TARGETS)

apps/avmenc.c

@@ -147,6 +147,7 @@ const arg_def_t *main_args[] = { &g_av2_codec_arg_defs.help,
                                  &g_av2_codec_arg_defs.skip,
                                  &g_av2_codec_arg_defs.step,
                                  &g_av2_codec_arg_defs.good_dl,
+                                 &g_av2_codec_arg_defs.rt_dl,
                                  &g_av2_codec_arg_defs.quietarg,
                                  &g_av2_codec_arg_defs.verbosearg,
                                  &g_av2_codec_arg_defs.psnrarg,
@@ -303,6 +304,7 @@ const arg_def_t *av2_key_val_args[] = {
   &g_av2_codec_arg_defs.enable_joint_mvd,
   &g_av2_codec_arg_defs.enable_keyframe_filtering,
   &g_av2_codec_arg_defs.enable_lf_sub_pu,
+  &g_av2_codec_arg_defs.enable_low_complexity_decode,
   &g_av2_codec_arg_defs.enable_masked_comp,
   &g_av2_codec_arg_defs.enable_mfh_obu_signaling,
   &g_av2_codec_arg_defs.enable_mhccp,
@@ -631,6 +633,7 @@ static void init_config(cfg_options_t *config) {
   config->scan_type_info_present_flag = 0;
   config->enable_mfh_obu_signaling = 0;
   config->operating_points_count = 1;
+  config->enable_low_complexity_decode = 0;
 }
 
 int read_icc_profile(struct AvxEncoderConfig *global, const char *file) {
@@ -702,6 +705,8 @@ static void parse_global_config(struct AvxEncoderConfig *global, char ***argv) {
       global->usage = arg_parse_uint(&arg);
     } else if (arg_match(&arg, &g_av2_codec_arg_defs.good_dl, argi)) {
       global->usage = AVM_USAGE_GOOD_QUALITY;  // Good quality usage
+    } else if (arg_match(&arg, &g_av2_codec_arg_defs.rt_dl, argi)) {
+      global->usage = AVM_USAGE_REALTIME;  // REALTIME usage
     } else if (arg_match(&arg, &g_av2_codec_arg_defs.use_yv12, argi)) {
       global->color_type = YV12;
     } else if (arg_match(&arg, &g_av2_codec_arg_defs.use_i420, argi)) {
@@ -2159,12 +2164,12 @@ int main(int argc, const char **argv_) {
         }
       }
 
-#if CONFIG_TESTONLY_12BIT_SUPPORT
+#if CONFIG_12BIT_PROFILE
       if (stream->config.cfg.g_bit_depth > 10) {
-        stream->config.cfg.g_profile = TEST_ONLY_12BIT_PROFILE;
+        stream->config.cfg.g_profile = MAIN_444C_12_IP2;
         profile_updated = 1;
       }
-#endif  // CONFIG_TESTONLY_12BIT_SUPPORT
+#endif  // CONFIG_12BIT_PROFILE
 
       // Force encoder to use 16-bit pipeline for 8-bit video/image
       if (profile_updated && !global.quiet) {

av2/arg_defs.c

@@ -177,6 +177,7 @@ const av2_codec_arg_definitions_t g_av2_codec_arg_defs = {
   .step = ARG_DEF(NULL, "step", 1,
                   "Encode every n-th frame (after the --skip frames)"),
   .good_dl = ARG_DEF(NULL, "good", 0, "Use Good Quality Deadline"),
+  .rt_dl = ARG_DEF(NULL, "rt", 0, "Use Realtime Quality Deadline"),
   .quietarg = ARG_DEF("q", "quiet", 0, "Do not print encode progress"),
   .verbosearg = ARG_DEF("v", "verbose", 0, "Show encoder parameters"),
   .psnrarg = ARG_DEF(
@@ -383,7 +384,7 @@ const av2_codec_arg_definitions_t g_av2_codec_arg_defs = {
   .disable_ml_partition_speed_features =
       ARG_DEF(NULL, "disable-ml-partition-speed-features", 1,
               "Disable ML partition speed features "
-              "(0: false (default), 1: true)"),
+              "(0: false, 1: true (default))"),
   .erp_pruning_level =
       ARG_DEF(NULL, "erp-pruning-level", 1,
               "Set the level of aggressiveness for erp pruning."
@@ -885,6 +886,11 @@ const av2_codec_arg_definitions_t g_av2_codec_arg_defs = {
   .use_short_metadata = ARG_DEF(NULL, "use-short-metadata", 1,
                                 "Use short metadata OBU format "
                                 "(0: GROUP format [default], 1: SHORT format)"),
+  .enable_low_complexity_decode =
+      ARG_DEF(NULL, "enable-low-complexity-decode", 1,
+              "Enable low complexity decode. "
+              "(0: false (default), 1: standard low-complexity level, 2: "
+              "aggressive low-complexity level)"),
 #endif  // CONFIG_AV2_ENCODER
   .enable_short_refresh_frame_flags =
       ARG_DEF(NULL, "enable-short-refresh-frame-flags", 1,

av2/arg_defs.h

@@ -50,6 +50,7 @@ typedef struct av2_codec_arg_definitions {
   arg_def_t skip;
   arg_def_t step;
   arg_def_t good_dl;
+  arg_def_t rt_dl;
   arg_def_t quietarg;
   arg_def_t verbosearg;
   arg_def_t psnrarg;
@@ -277,6 +278,7 @@ typedef struct av2_codec_arg_definitions {
   arg_def_t dpb_size;
   arg_def_t enable_bru;
   arg_def_t disable_loopfilters_across_tiles;
+  arg_def_t enable_low_complexity_decode;
 #endif  // CONFIG_AV2_ENCODER
   arg_def_t frame_hash_metadata;
   arg_def_t frame_hash_per_plane;