Merge "aomcx_set_ref -> aom_cx_set_ref" into nextgenv2

.gitignore

@@ -37,7 +37,7 @@
 /examples/simple_encoder
 /examples/twopass_encoder
 /examples/aom_multi_resolution_encoder
-/examples/aomcx_set_ref
+/examples/aom_cx_set_ref
 /examples/av1_spatial_scalable_encoder
 /examples/aom_temporal_scalable_patterns
 /examples/aom_temporal_svc_encoder

examples.mk

@@ -176,13 +176,13 @@ set_maps.DESCRIPTION                = Set active and ROI maps
 
 ifeq ($(CONFIG_AV1_ENCODER), yes)
 ifeq ($(CONFIG_DECODERS),yes)
-EXAMPLES-yes                       += aomcx_set_ref.c
-aomcx_set_ref.SRCS                 += ivfenc.h ivfenc.c
-aomcx_set_ref.SRCS                 += tools_common.h tools_common.c
-aomcx_set_ref.SRCS                 += video_common.h
-aomcx_set_ref.SRCS                 += video_writer.h video_writer.c
-aomcx_set_ref.GUID                  = 65D7F14A-2EE6-4293-B958-AB5107A03B55
-aomcx_set_ref.DESCRIPTION           = AV1 set encoder reference frame
+EXAMPLES-yes                       += aom_cx_set_ref.c
+aom_cx_set_ref.SRCS                 += ivfenc.h ivfenc.c
+aom_cx_set_ref.SRCS                 += tools_common.h tools_common.c
+aom_cx_set_ref.SRCS                 += video_common.h
+aom_cx_set_ref.SRCS                 += video_writer.h video_writer.c
+aom_cx_set_ref.GUID                  = 65D7F14A-2EE6-4293-B958-AB5107A03B55
+aom_cx_set_ref.DESCRIPTION           = AV1 set encoder reference frame
 endif
 endif
 

test/cx_set_ref.sh

@@ -27,7 +27,7 @@ cx_set_ref_verify_environment() {
 # $1 is the codec name.
 aom_set_ref() {
   local codec="$1"
-  local encoder="${LIBAOM_BIN_PATH}/aomcx_set_ref${AOM_TEST_EXE_SUFFIX}"
+  local encoder="${LIBAOM_BIN_PATH}/aom_cx_set_ref${AOM_TEST_EXE_SUFFIX}"
 
   local output_file="${AOM_TEST_OUTPUT_DIR}/${codec}cx_set_ref_${codec}.ivf"
   local ref_frame_num=90