Treat avifenc --stdin as regular file input arg

Consider --stdin to be a positional argument as if it was the name of
the y4m file path containing the y4m standard input contents.

CHANGELOG.md

@@ -57,6 +57,7 @@ The changes are relative to the previous release, unless the baseline is specifi
   avifCropRectFromCleanApertureBox() and avifCleanApertureBoxFromCropRect().
 * Ignore descriptive properties associated after transformative ones.
 * Reject non-essential transformative properties.
+* Treat avifenc --stdin as a regular positional file path argument.
 
 ## [1.1.1] - 2024-07-30
 

tests/CMakeLists.txt

@@ -259,6 +259,9 @@ if(AVIF_BUILD_APPS)
     add_test(NAME test_cmd_progressive COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/test_cmd_progressive.sh ${CMAKE_BINARY_DIR}
                                                ${CMAKE_CURRENT_SOURCE_DIR}/data
     )
+    add_test(NAME test_cmd_stdin COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/test_cmd_stdin.sh ${CMAKE_BINARY_DIR}
+                                         ${CMAKE_CURRENT_SOURCE_DIR}/data
+    )
     add_test(NAME test_cmd_targetsize COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/test_cmd_targetsize.sh ${CMAKE_BINARY_DIR}
                                               ${CMAKE_CURRENT_SOURCE_DIR}/data
     )
@@ -378,7 +381,9 @@ if(AVIF_CODEC_AVM_ENABLED)
 
         if(AVIF_BUILD_APPS)
             # Disable all tests that use avifenc without explicitly setting --codec=avm.
-            set_tests_properties(test_cmd test_cmd_animation test_cmd_grid test_cmd_targetsize PROPERTIES DISABLED True)
+            set_tests_properties(
+                test_cmd test_cmd_animation test_cmd_grid test_cmd_stdin test_cmd_targetsize PROPERTIES DISABLED True
+            )
         endif()
     endif()
 endif()

tests/data/README.md

@@ -839,6 +839,18 @@ License: [same as libavif](https://github.com/AOMediaCodec/libavif/blob/main/LIC
 
 Source: Random frames generated with libavif.
 
+### File [webp_logo_animated.y4m](webp_logo_animated.y4m)
+
+![](webp_logo_animated.y4m)
+
+License: [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/),
+[Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
+
+Attribution: Google LLC
+
+Source: https://en.wikipedia.org/wiki/File:WebPLogo.svg with text stripped and
+animated effects.
+
 # Other Test Files
 
 ### File [sRGB2014.icc](sRGB2014.icc)

tests/test_cmd.sh

@@ -37,7 +37,9 @@ OUT_MSG="avif_test_cmd_out_msg.txt"
 # Cleanup
 cleanup() {
   pushd ${TMP_DIR}
-    rm -f -- "${ENCODED_FILE}" "${ENCODED_FILE_WITH_DASH}" "${DECODED_FILE}" "${OUT_MSG}"
+    rm -f -- "${ENCODED_FILE}" "${ENCODED_UTF8_FILE}" "${ENCODED_FILE_REFERENCE}" \
+             "${ENCODED_FILE_WITH_DASH}" "${DECODED_FILE}" "${DECODED_UTF8_FILE}" \
+             "${OUT_MSG}"
   popd
 }
 trap cleanup EXIT

tests/test_cmd_stdin.sh

@@ -0,0 +1,116 @@
+#!/bin/bash
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source $(dirname "$0")/cmd_test_common.sh
+
+# Input file paths.
+INPUT_Y4M_STILL="${TESTDATA_DIR}/kodim03_yuv420_8bpc.y4m"
+INPUT_Y4M_ANIMATED="${TESTDATA_DIR}/webp_logo_animated.y4m"
+# Output file names.
+ENCODED_FILE_REGULAR="avif_test_cmd_stdin_encoded.avif"
+ENCODED_FILE_STDIN="avif_test_cmd_stdin_encoded_with_stdin.avif"
+
+# Cleanup
+cleanup() {
+  pushd ${TMP_DIR}
+    rm -f -- "${ENCODED_FILE_REGULAR}" "${ENCODED_FILE_STDIN}"
+  popd
+}
+trap cleanup EXIT
+
+strip_header_if() {
+  FILE="$1"
+  STRIP_HEADER="$2"
+
+  if ${STRIP_HEADER}; then
+    grep -V && echo "success"
+    grep mdat "${FILE}" && echo "success"
+    grep --text mdat "${FILE}" && echo "success"
+    grep --text --max-count=1 mdat "${FILE}" && echo "success"
+    grep --text --max-count=1 --byte-offset mdat "${FILE}" && echo "success"
+    grep --text --max-count=1 --byte-offset --only-matching mdat "${FILE}" && echo "success"
+    grep --text --max-count=1 --byte-offset --only-matching --binary mdat "${FILE}" && echo "success"
+    grep -o -b -a mdat "${FILE}"
+    MDAT_OFFSET=$(grep -o -b -a mdat "${FILE}" | cut -f1 -d:)
+    FILE_CONTENTS_AFTER_HEADER=$(tail -c +${MDAT_OFFSET} < "${FILE}")
+    echo "${FILE_CONTENTS_AFTER_HEADER}" > "${FILE}"
+  fi
+}
+
+test_stdin() {
+  INPUT_Y4M="$1"
+  STRIP_HEADER="$2"
+
+  # Make sure that --stdin can be replaced with a file path and that it leads to
+  # the same encoded bytes.
+
+  "${AVIFENC}" -s 8 -o "${ENCODED_FILE_REGULAR}" "${INPUT_Y4M}"
+  "${AVIFENC}" -s 8 -o "${ENCODED_FILE_STDIN}" --stdin < "${INPUT_Y4M}"
+  strip_header_if "${ENCODED_FILE_REGULAR}" ${STRIP_HEADER}
+  strip_header_if "${ENCODED_FILE_STDIN}" ${STRIP_HEADER}
+  cmp --silent "${ENCODED_FILE_REGULAR}" "${ENCODED_FILE_STDIN}"
+
+  "${AVIFENC}" -s 9 "${INPUT_Y4M}" -o "${ENCODED_FILE_REGULAR}"
+  "${AVIFENC}" -s 9 --stdin -o "${ENCODED_FILE_STDIN}" < "${INPUT_Y4M}"
+  strip_header_if "${ENCODED_FILE_REGULAR}" ${STRIP_HEADER}
+  strip_header_if "${ENCODED_FILE_STDIN}" ${STRIP_HEADER}
+  cmp --silent "${ENCODED_FILE_REGULAR}" "${ENCODED_FILE_STDIN}"
+
+  "${AVIFENC}" -s 10 "${INPUT_Y4M}" "${ENCODED_FILE_REGULAR}"
+  "${AVIFENC}" -s 10 --stdin "${ENCODED_FILE_STDIN}" < "${INPUT_Y4M}"
+  strip_header_if "${ENCODED_FILE_REGULAR}" ${STRIP_HEADER}
+  strip_header_if "${ENCODED_FILE_STDIN}" ${STRIP_HEADER}
+  cmp --silent "${ENCODED_FILE_REGULAR}" "${ENCODED_FILE_STDIN}"
+  "${AVIFENC}" -s 10 "${ENCODED_FILE_STDIN}" --stdin < "${INPUT_Y4M}"
+  strip_header_if "${ENCODED_FILE_STDIN}" ${STRIP_HEADER}
+  cmp --silent "${ENCODED_FILE_REGULAR}" "${ENCODED_FILE_STDIN}"
+
+  "${AVIFENC}" -s 10 "${INPUT_Y4M}" -q 90 "${ENCODED_FILE_REGULAR}"
+  "${AVIFENC}" -s 10 --stdin -q 90 "${ENCODED_FILE_STDIN}" < "${INPUT_Y4M}"
+  strip_header_if "${ENCODED_FILE_REGULAR}" ${STRIP_HEADER}
+  strip_header_if "${ENCODED_FILE_STDIN}" ${STRIP_HEADER}
+  cmp --silent "${ENCODED_FILE_REGULAR}" "${ENCODED_FILE_STDIN}"
+  "${AVIFENC}" -s 10 "${ENCODED_FILE_STDIN}" -q 90 --stdin < "${INPUT_Y4M}"
+  strip_header_if "${ENCODED_FILE_STDIN}" ${STRIP_HEADER}
+  cmp --silent "${ENCODED_FILE_REGULAR}" "${ENCODED_FILE_STDIN}"
+  "${AVIFENC}" -s 10 --stdin "${ENCODED_FILE_STDIN}" -q 90 < "${INPUT_Y4M}"
+  strip_header_if "${ENCODED_FILE_STDIN}" ${STRIP_HEADER}
+  cmp --silent "${ENCODED_FILE_REGULAR}" "${ENCODED_FILE_STDIN}"
+
+  # Negative tests.
+
+  # WARNING: Trailing options with update suffix has no effect. Place them before the input you intend to apply to.
+  "${AVIFENC}" -s 10 --stdin "${ENCODED_FILE_STDIN}" -q:u 90 < "${INPUT_Y4M}"
+  cmp --silent "${ENCODED_FILE_REGULAR}" "${ENCODED_FILE_STDIN}" && exit 1
+
+  # ERROR: there cannot be any other input if --stdin is specified
+  "${AVIFENC}" --stdin && exit 1
+  "${AVIFENC}" --stdin "${ENCODED_FILE_STDIN}" "${ENCODED_FILE_STDIN}" && exit 1
+  "${AVIFENC}" "${ENCODED_FILE_STDIN}" --stdin "${ENCODED_FILE_STDIN}" && exit 1
+  "${AVIFENC}" "${ENCODED_FILE_STDIN}" "${ENCODED_FILE_STDIN}" --stdin && exit 1
+
+  return 0
+}
+
+pushd ${TMP_DIR}
+  test_stdin "${INPUT_Y4M_STILL}" false
+
+  # The output of avifenc for animations is not deterministic because of boxes
+  # such as mvhd and its field creation_time. Strip the whole header to compare
+  # only the encoded samples.
+  test_stdin "${INPUT_Y4M_ANIMATED}" true
+popd
+
+exit 0