Skip to content
GitLab
Commit 93ac60a6 authored by Tom Finegan's avatar Tom Finegan
Browse files

vpxenc.sh: Make vpxenc() usage agree with implementation. 

- Make $1 input file at all call sites.
- Actually use vpxenc_pipe().

Change-Id: I22f25719aeb3dce60863207b2e2a49e42e27ed06
parent 8b2abdee
v1.14.0-linphone 1.4.X feature/update_to_v1.9.0-linphone feature/uwp_nuget highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck nextgen nextgenv2 sandbox/Jingning/experimental sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 34 deletions
test/vpxenc.sh
+ 33
− 34
View file @ 93ac60a6
...@@ -69,13 +69,13 @@ vpxenc() { ...@@ -69,13 +69,13 @@ vpxenc() {
vpxenc_vp8_ivf() { vpxenc_vp8_ivf() {
if [ "$(vpxenc_can_encode_vp8)" = "yes" ]; then if [ "$(vpxenc_can_encode_vp8)" = "yes" ]; then
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp8.ivf" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp8.ivf"
vpxenc --codec=vp8 \ vpxenc "${YUV_RAW_INPUT}" \
--codec=vp8 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${TEST_FRAMES}" \ --limit="${TEST_FRAMES}" \
--ivf \ --ivf \
--output="${output}" \ --output="${output}"
"${YUV_RAW_INPUT}"
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
...@@ -88,12 +88,12 @@ vpxenc_vp8_webm() { ...@@ -88,12 +88,12 @@ vpxenc_vp8_webm() {
if [ "$(vpxenc_can_encode_vp8)" = "yes" ] && \ if [ "$(vpxenc_can_encode_vp8)" = "yes" ] && \
[ "$(webm_io_available)" = "yes" ]; then [ "$(webm_io_available)" = "yes" ]; then
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp8.webm" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp8.webm"
vpxenc --codec=vp8 \ vpxenc "${YUV_RAW_INPUT}" \
--codec=vp8 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${TEST_FRAMES}" \ --limit="${TEST_FRAMES}" \
--output="${output}" \ --output="${output}"
"${YUV_RAW_INPUT}"
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
...@@ -142,13 +142,13 @@ vpxenc_vp8_webm_2pass() { ...@@ -142,13 +142,13 @@ vpxenc_vp8_webm_2pass() {
if [ "$(vpxenc_can_encode_vp8)" = "yes" ] && \ if [ "$(vpxenc_can_encode_vp8)" = "yes" ] && \
[ "$(webm_io_available)" = "yes" ]; then [ "$(webm_io_available)" = "yes" ]; then
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp8.webm" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp8.webm"
vpxenc --codec=vp8 \ vpxenc "${YUV_RAW_INPUT}" \
--codec=vp8 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${TEST_FRAMES}" \ --limit="${TEST_FRAMES}" \
--output="${output}" \ --output="${output}" \
--passes=2 \ --passes=2
"${YUV_RAW_INPUT}"
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
...@@ -163,15 +163,15 @@ vpxenc_vp8_webm_lag10_frames20() { ...@@ -163,15 +163,15 @@ vpxenc_vp8_webm_lag10_frames20() {
local readonly lag_total_frames=20 local readonly lag_total_frames=20
local readonly lag_frames=10 local readonly lag_frames=10
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp8_lag10_frames20.webm" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp8_lag10_frames20.webm"
vpxenc --codec=vp8 \ vpxenc "${YUV_RAW_INPUT}" \
--codec=vp8 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${lag_total_frames}" \ --limit="${lag_total_frames}" \
--lag-in-frames="${lag_frames}" \ --lag-in-frames="${lag_frames}" \
--output="${output}" \ --output="${output}" \
--auto-alt-ref=1 \ --auto-alt-ref=1 \
--passes=2 \ --passes=2
"${YUV_RAW_INPUT}"
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
...@@ -183,14 +183,13 @@ vpxenc_vp8_webm_lag10_frames20() { ...@@ -183,14 +183,13 @@ vpxenc_vp8_webm_lag10_frames20() {
vpxenc_vp8_ivf_piped_input() { vpxenc_vp8_ivf_piped_input() {
if [ "$(vpxenc_can_encode_vp8)" = "yes" ]; then if [ "$(vpxenc_can_encode_vp8)" = "yes" ]; then
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp8_piped_input.ivf" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp8_piped_input.ivf"
cat "${YUV_RAW_INPUT}" \ vpxenc_pipe "${YUV_RAW_INPUT}" \
| vpxenc --codec=vp8 \ --codec=vp8 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${TEST_FRAMES}" \ --limit="${TEST_FRAMES}" \
--ivf \ --ivf \
--output="${output}" \ --output="${output}"
-
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
...@@ -202,13 +201,13 @@ vpxenc_vp8_ivf_piped_input() { ...@@ -202,13 +201,13 @@ vpxenc_vp8_ivf_piped_input() {
vpxenc_vp9_ivf() { vpxenc_vp9_ivf() {
if [ "$(vpxenc_can_encode_vp9)" = "yes" ]; then if [ "$(vpxenc_can_encode_vp9)" = "yes" ]; then
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9.ivf" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9.ivf"
vpxenc --codec=vp9 \ vpxenc "${YUV_RAW_INPUT}" \
--codec=vp9 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${TEST_FRAMES}" \ --limit="${TEST_FRAMES}" \
--ivf \ --ivf \
--output="${output}" \ --output="${output}"
"${YUV_RAW_INPUT}"
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
...@@ -221,12 +220,12 @@ vpxenc_vp9_webm() { ...@@ -221,12 +220,12 @@ vpxenc_vp9_webm() {
if [ "$(vpxenc_can_encode_vp9)" = "yes" ] && \ if [ "$(vpxenc_can_encode_vp9)" = "yes" ] && \
[ "$(webm_io_available)" = "yes" ]; then [ "$(webm_io_available)" = "yes" ]; then
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9.webm" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9.webm"
vpxenc --codec=vp9 \ vpxenc "${YUV_RAW_INPUT}" \
--codec=vp9 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${TEST_FRAMES}" \ --limit="${TEST_FRAMES}" \
--output="${output}" \ --output="${output}"
"${YUV_RAW_INPUT}"
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
...@@ -275,13 +274,13 @@ vpxenc_vp9_webm_2pass() { ...@@ -275,13 +274,13 @@ vpxenc_vp9_webm_2pass() {
if [ "$(vpxenc_can_encode_vp9)" = "yes" ] && \ if [ "$(vpxenc_can_encode_vp9)" = "yes" ] && \
[ "$(webm_io_available)" = "yes" ]; then [ "$(webm_io_available)" = "yes" ]; then
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9.webm" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9.webm"
vpxenc --codec=vp9 \ vpxenc "${YUV_RAW_INPUT}" \
--codec=vp9 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${TEST_FRAMES}" \ --limit="${TEST_FRAMES}" \
--output="${output}" \ --output="${output}" \
--passes=2 \ --passes=2
"${YUV_RAW_INPUT}"
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
...@@ -293,14 +292,14 @@ vpxenc_vp9_webm_2pass() { ...@@ -293,14 +292,14 @@ vpxenc_vp9_webm_2pass() {
vpxenc_vp9_ivf_lossless() { vpxenc_vp9_ivf_lossless() {
if [ "$(vpxenc_can_encode_vp9)" = "yes" ]; then if [ "$(vpxenc_can_encode_vp9)" = "yes" ]; then
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9_lossless.ivf" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9_lossless.ivf"
vpxenc --codec=vp9 \ vpxenc "${YUV_RAW_INPUT}" \
--codec=vp9 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${TEST_FRAMES}" \ --limit="${TEST_FRAMES}" \
--ivf \ --ivf \
--output="${output}" \ --output="${output}" \
--lossless=1 \ --lossless=1
"${YUV_RAW_INPUT}"
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
...@@ -312,15 +311,15 @@ vpxenc_vp9_ivf_lossless() { ...@@ -312,15 +311,15 @@ vpxenc_vp9_ivf_lossless() {
vpxenc_vp9_ivf_minq0_maxq0() { vpxenc_vp9_ivf_minq0_maxq0() {
if [ "$(vpxenc_can_encode_vp9)" = "yes" ]; then if [ "$(vpxenc_can_encode_vp9)" = "yes" ]; then
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9_lossless_minq0_maxq0.ivf" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9_lossless_minq0_maxq0.ivf"
vpxenc --codec=vp9 \ vpxenc "${YUV_RAW_INPUT}" \
--codec=vp9 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${TEST_FRAMES}" \ --limit="${TEST_FRAMES}" \
--ivf \ --ivf \
--output="${output}" \ --output="${output}" \
--min-q=0 \ --min-q=0 \
--max-q=0 \ --max-q=0
"${YUV_RAW_INPUT}"
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
...@@ -335,15 +334,15 @@ vpxenc_vp9_webm_lag10_frames20() { ...@@ -335,15 +334,15 @@ vpxenc_vp9_webm_lag10_frames20() {
local readonly lag_total_frames=20 local readonly lag_total_frames=20
local readonly lag_frames=10 local readonly lag_frames=10
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9_lag10_frames20.webm" local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9_lag10_frames20.webm"
vpxenc --codec=vp9 \ vpxenc "${YUV_RAW_INPUT}" \
--codec=vp9 \
--width="${YUV_RAW_INPUT_WIDTH}" \ --width="${YUV_RAW_INPUT_WIDTH}" \
--height="${YUV_RAW_INPUT_HEIGHT}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \
--limit="${lag_total_frames}" \ --limit="${lag_total_frames}" \
--lag-in-frames="${lag_frames}" \ --lag-in-frames="${lag_frames}" \
--output="${output}" \ --output="${output}" \
--passes=2 \ --passes=2 \
--auto-alt-ref=1 \ --auto-alt-ref=1
"${YUV_RAW_INPUT}"
if [ ! -e "${output}" ]; then if [ ! -e "${output}" ]; then
elog "Output file does not exist." elog "Output file does not exist."
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment