rename ivf{enc,dec} to vpx{enc,dec}

The new WebM output support should be preferred to IVF, but we can't
change the default behavior of the ivf* tools. There are a few other
default behaviors for these tools that are counterintuitive for
historical reasons, and changing the binary name provides the
opportunity to clean those up as well. This patch takes the first
step by renaming the binaries.

Change-Id: I647008ae37cc352dd27ec1da7ed13489e0609b24

diff --git a/examples.mk b/examples.mk
index ef1d1a26b194d58d47e691f83336fbfa6d9a5694..28fc6eaa9d81a54ea77c0545c8cf5977e9ccd2d0 100644 (file)
--- a/examples.mk
+++ b/examples.mk
@@ -12,29 +12,38 @@
 # List of examples to build. UTILS are files that are taken from the source
 # tree directly, and GEN_EXAMPLES are files that are created from the
 # examples folder.
-UTILS-$(CONFIG_DECODERS)    += ivfdec.c
-ivfdec.SRCS                 += md5_utils.c md5_utils.h
-ivfdec.SRCS                 += vpx_ports/vpx_timer.h
-ivfdec.SRCS                 += vpx/vpx_integer.h
-ivfdec.SRCS                 += args.c args.h vpx_ports/config.h
-ivfdec.SRCS                 += nestegg/halloc/halloc.h
-ivfdec.SRCS                 += nestegg/halloc/src/align.h
-ivfdec.SRCS                 += nestegg/halloc/src/halloc.c
-ivfdec.SRCS                 += nestegg/halloc/src/hlist.h
-ivfdec.SRCS                 += nestegg/halloc/src/macros.h
-ivfdec.SRCS                 += nestegg/include/nestegg/nestegg.h
-ivfdec.SRCS                 += nestegg/src/nestegg.c
-ivfdec.GUID                  = BA5FE66F-38DD-E034-F542-B1578C5FB950
-ivfdec.DESCRIPTION           = Full featured decoder
-UTILS-$(CONFIG_ENCODERS)    += ivfenc.c
-ivfenc.SRCS                 += args.c args.h y4minput.c y4minput.h
-ivfenc.SRCS                 += vpx_ports/config.h vpx_ports/mem_ops.h
-ivfenc.SRCS                 += vpx_ports/mem_ops_aligned.h
-ivfenc.SRCS                 += libmkv/EbmlIDs.h
-ivfenc.SRCS                 += libmkv/EbmlWriter.c
-ivfenc.SRCS                 += libmkv/EbmlWriter.h
-ivfenc.GUID                  = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1
-ivfenc.DESCRIPTION           = Full featured encoder
+UTILS-$(CONFIG_DECODERS)    += vpxdec.c
+vpxdec.SRCS                 += md5_utils.c md5_utils.h
+vpxdec.SRCS                 += vpx_ports/vpx_timer.h
+vpxdec.SRCS                 += vpx/vpx_integer.h
+vpxdec.SRCS                 += args.c args.h vpx_ports/config.h
+vpxdec.SRCS                 += nestegg/halloc/halloc.h
+vpxdec.SRCS                 += nestegg/halloc/src/align.h
+vpxdec.SRCS                 += nestegg/halloc/src/halloc.c
+vpxdec.SRCS                 += nestegg/halloc/src/hlist.h
+vpxdec.SRCS                 += nestegg/halloc/src/macros.h
+vpxdec.SRCS                 += nestegg/include/nestegg/nestegg.h
+vpxdec.SRCS                 += nestegg/src/nestegg.c
+vpxdec.GUID                  = BA5FE66F-38DD-E034-F542-B1578C5FB950
+vpxdec.DESCRIPTION           = Full featured decoder
+UTILS-$(CONFIG_ENCODERS)    += vpxenc.c
+vpxenc.SRCS                 += args.c args.h y4minput.c y4minput.h
+vpxenc.SRCS                 += vpx_ports/config.h vpx_ports/mem_ops.h
+vpxenc.SRCS                 += vpx_ports/mem_ops_aligned.h
+vpxenc.SRCS                 += libmkv/EbmlIDs.h
+vpxenc.SRCS                 += libmkv/EbmlWriter.c
+vpxenc.SRCS                 += libmkv/EbmlWriter.h
+vpxenc.GUID                  = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1
+vpxenc.DESCRIPTION           = Full featured encoder
+
+# Clean up old ivfenc, ivfdec binaries.
+ifeq ($(CONFIG_MSVS),yes)
+CLEAN-OBJS += $(foreach p,$(VS_PLATFORMS),$(p)/Release/ivfenc.exe)
+CLEAN-OBJS += $(foreach p,$(VS_PLATFORMS),$(p)/Release/ivfdec.exe)
+else
+CLEAN-OBJS += ivfenc{.c.o,.c.d,.dox,.exe}
+CLEAN-OBJS += ivfdec{.c.o,.c.d,.dox,.exe}
+endif
 
 # XMA example disabled for now, not used in VP8
 #UTILS-$(CONFIG_DECODERS)    += example_xma.c

diff --git a/solution.mk b/solution.mk
index 8e852ec5df1e02a8ef096abc0cf7080961f6f55d..6d2c08d060c6692a4adafc70531f1d7d5f5b325a 100644 (file)
--- a/solution.mk
+++ b/solution.mk
@@ -22,7 +22,7 @@ else
 vpx.sln: $(wildcard *.vcproj)
        @echo "    [CREATE] $@"
        $(SRC_PATH_BARE)/build/make/gen_msvs_sln.sh \
-            $(if $(filter %vpx.vcproj,$^),--dep=ivfdec:vpx) \
+            $(if $(filter %vpx.vcproj,$^),--dep=vpxdec:vpx) \
             $(if $(filter %vpx.vcproj,$^),--dep=xma:vpx) \
             --ver=$(CONFIG_VS_VERSION)\
             --target=$(TOOLCHAIN)\

diff --git a/ivfdec.c b/vpxdec.c
similarity index 99%
rename from ivfdec.c
rename to vpxdec.c
index c2822904f2b11d79d2e222baf40c64bf318cdc82..0de072e8bf120c3853bc8c475b2a6d4987f0114a 100644 (file)
--- a/ivfdec.c
+++ b/vpxdec.c
@@ -367,7 +367,7 @@ unsigned int file_is_ivf(FILE *infile,
             *fps_num = mem_get_le32(raw_hdr + 16);
             *fps_den = mem_get_le32(raw_hdr + 20);
 
-            /* Some versions of ivfenc used 1/(2*fps) for the timebase, so
+            /* Some versions of vpxenc used 1/(2*fps) for the timebase, so
              * we can guess the framerate using only the timebase in this
              * case. Other files would require reading ahead to guess the
              * timebase, like we do for webm.

diff --git a/ivfenc.c b/vpxenc.c
similarity index 99%
rename from ivfenc.c
rename to vpxenc.c
index 7d3cea9c92cb0837eb925585237db1692a2b6f6e..3537419d80d482d9c8fa3acb37fc4d9262d8a647 100644 (file)
--- a/ivfenc.c
+++ b/vpxenc.c
@@ -552,8 +552,8 @@ write_webm_seek_info(EbmlGlobal *ebml)
         Ebml_SerializeUnsigned(ebml, TimecodeScale, 1000000);
         Ebml_SerializeFloat(ebml, Segment_Duration,
                             ebml->last_pts_ms + frame_time);
-        Ebml_SerializeString(ebml, 0x4D80, "ivfenc" VERSION_STRING);
-        Ebml_SerializeString(ebml, 0x5741, "ivfenc" VERSION_STRING);
+        Ebml_SerializeString(ebml, 0x4D80, "vpxenc" VERSION_STRING);
+        Ebml_SerializeString(ebml, 0x5741, "vpxenc" VERSION_STRING);
         Ebml_EndSubElement(ebml, &startInfo);
     }
 }