This unclutters the top-level directory and groups related files together.
---
Now everything is placed below "avtools" as discussed on IRC.
.gitignore | 3 --
Makefile | 45 +++---------------------------
avtools/.gitignore | 3 ++
avtools/Makefile | 43 ++++++++++++++++++++++++++++
avconv.c => avtools/avconv.c | 0
avconv.h => avtools/avconv.h | 0
avconv_dxva2.c => avtools/avconv_dxva2.c | 0
avconv_filter.c => avtools/avconv_filter.c | 0
avconv_opt.c => avtools/avconv_opt.c | 0
avconv_qsv.c => avtools/avconv_qsv.c | 0
avconv_vaapi.c => avtools/avconv_vaapi.c | 0
avconv_vda.c => avtools/avconv_vda.c | 0
avconv_vdpau.c => avtools/avconv_vdpau.c | 0
avplay.c => avtools/avplay.c | 0
avprobe.c => avtools/avprobe.c | 0
cmdutils.c => avtools/cmdutils.c | 0
cmdutils.h => avtools/cmdutils.h | 0
configure | 2 +-
tests/Makefile | 2 +-
tests/fate-run.sh | 28 +++++++++----------
tests/fate/mov.mak | 2 +-
tests/fate/probe.mak | 2 +-
tests/regression-funcs.sh | 2 +-
23 files changed, 69 insertions(+), 63 deletions(-)
create mode 100644 avtools/.gitignore
create mode 100644 avtools/Makefile
rename avconv.c => avtools/avconv.c (100%)
rename avconv.h => avtools/avconv.h (100%)
rename avconv_dxva2.c => avtools/avconv_dxva2.c (100%)
rename avconv_filter.c => avtools/avconv_filter.c (100%)
rename avconv_opt.c => avtools/avconv_opt.c (100%)
rename avconv_qsv.c => avtools/avconv_qsv.c (100%)
rename avconv_vaapi.c => avtools/avconv_vaapi.c (100%)
rename avconv_vda.c => avtools/avconv_vda.c (100%)
rename avconv_vdpau.c => avtools/avconv_vdpau.c (100%)
rename avplay.c => avtools/avplay.c (100%)
rename avprobe.c => avtools/avprobe.c (100%)
rename cmdutils.c => avtools/cmdutils.c (100%)
rename cmdutils.h => avtools/cmdutils.h (100%)
diff --git a/.gitignore b/.gitignore
index f6d97b0..5bca92d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,6 @@
*.ver
/.config
/.version
-/avconv
-/avplay
-/avprobe
/avversion.h
/config.asm
/config.h
diff --git a/Makefile b/Makefile
index 98eb3ab..d1b24eb 100644
--- a/Makefile
+++ b/Makefile
@@ -69,25 +69,6 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
%.c %.h %.pc %.ver %.version: TAG = GEN
-AVPROGS-$(CONFIG_AVCONV) += avconv
-AVPROGS-$(CONFIG_AVPLAY) += avplay
-AVPROGS-$(CONFIG_AVPROBE) += avprobe
-
-AVPROGS := $(AVPROGS-yes:%=%$(EXESUF))
-PROGS += $(AVPROGS)
-
-AVBASENAMES = avconv avplay avprobe
-ALLAVPROGS = $(AVBASENAMES:%=%$(EXESUF))
-
-$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
-
-OBJS-avconv += avconv_opt.o avconv_filter.o
-OBJS-avconv-$(CONFIG_LIBMFX) += avconv_qsv.o
-OBJS-avconv-$(CONFIG_VAAPI) += avconv_vaapi.o
-OBJS-avconv-$(CONFIG_VDA) += avconv_vda.o
-OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o
-OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
-
TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options
@@ -115,8 +96,6 @@ FF_EXTRALIBS := $(FFEXTRALIBS)
FF_DEP_LIBS := $(DEP_LIBS)
FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
-all: $(AVPROGS)
-
$(TOOLS): %$(EXESUF): %.o
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS) $(ELIBS)
@@ -153,8 +132,6 @@ endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
-include $(SRC_PATH)/doc/Makefile
-
define DOPROG
OBJS-$(1) += $(1).o $(OBJS-$(1)-yes)
$(1)$(EXESUF): $$(OBJS-$(1))
@@ -164,7 +141,8 @@ $(1)$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1))
-include $$(OBJS-$(1):.o=.d)
endef
-$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(EXESUF)=))))
+include $(SRC_PATH)/doc/Makefile
+include $(SRC_PATH)/avtools/Makefile
$(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
@@ -175,7 +153,7 @@ GIT_LOG = $(SRC_PATH)/.git/logs/HEAD
.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) avbuild/config.mak
.version: M=@
-cmdutils.o libavutil/utils.o: avversion.h
+libavutil/utils.o: avversion.h
avversion.h .version:
$(M)$(VERSION_SH) $(SRC_PATH) avversion.h $(EXTRA_VERSION)
$(Q)touch .version
@@ -183,35 +161,20 @@ avversion.h .version:
# force version.sh to run whenever version might have changed
-include .version
-ifdef AVPROGS
-install: install-progs install-data
-endif
-
install: install-libs install-headers
install-libs: install-libs-yes
-install-progs-yes:
-install-progs-$(CONFIG_SHARED): install-libs
-
-install-progs: install-progs-yes $(AVPROGS)
- $(Q)mkdir -p "$(BINDIR)"
- $(INSTALL) -c -m 755 $(AVPROGS) "$(BINDIR)"
-
install-data: $(DATA_FILES)
$(Q)mkdir -p "$(DATADIR)"
$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
-uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
-
-uninstall-progs:
- $(RM) $(addprefix "$(BINDIR)/", $(ALLAVPROGS))
+uninstall: uninstall-libs uninstall-headers uninstall-data
uninstall-data:
$(RM) -r "$(DATADIR)"
clean::
- $(RM) $(ALLAVPROGS)
$(RM) $(CLEANSUFFIXES)
$(RM) -rf coverage.info lcov
diff --git a/avtools/.gitignore b/avtools/.gitignore
new file mode 100644
index 0000000..e6cba09
--- /dev/null
+++ b/avtools/.gitignore
@@ -0,0 +1,3 @@
+/avconv
+/avplay
+/avprobe
diff --git a/avtools/Makefile b/avtools/Makefile
new file mode 100644
index 0000000..04d2a02
--- /dev/null
+++ b/avtools/Makefile
@@ -0,0 +1,43 @@
+AVPROGS-$(CONFIG_AVCONV) += avtools/avconv
+AVPROGS-$(CONFIG_AVPLAY) += avtools/avplay
+AVPROGS-$(CONFIG_AVPROBE) += avtools/avprobe
+
+AVPROGS := $(AVPROGS-yes:%=%$(EXESUF))
+PROGS += $(AVPROGS-yes)
+
+AVBASENAMES = avconv avplay avprobe
+ALLAVPROGS = $(AVBASENAMES:%=avtools/%$(EXESUF))
+
+all: $(AVPROGS)
+
+$(foreach prog,$(ALLAVPROGS),$(eval OBJS-$(prog) += avtools/cmdutils.o))
+
+OBJS-avtools/avconv += avtools/avconv_opt.o
avtools/avconv_filter.o
+OBJS-avtools/avconv-$(CONFIG_LIBMFX) += avtools/avconv_qsv.o
+OBJS-avtools/avconv-$(CONFIG_VAAPI) += avtools/avconv_vaapi.o
+OBJS-avtools/avconv-$(CONFIG_VDA) += avtools/avconv_vda.o
+OBJS-avtools/avconv-$(HAVE_DXVA2_LIB) += avtools/avconv_dxva2.o
+OBJS-avtools/avconv-$(HAVE_VDPAU_X11) += avtools/avconv_vdpau.o
+
+$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P))))
+
+avtools/cmdutils.o: avversion.h | avtools
+
+ifdef AVPROGS
+install: install-progs install-data
+endif
+
+install-progs-yes:
+install-progs-$(CONFIG_SHARED): install-libs
+
+install-progs: install-progs-yes $(AVPROGS)
+ $(Q)mkdir -p "$(BINDIR)"
+ $(INSTALL) -c -m 755 $(AVPROGS) "$(BINDIR)"
+
+uninstall: uninstall-progs
+
+uninstall-progs:
+ $(RM) $(addprefix "$(BINDIR)/", $(ALLAVPROGS))
+
+clean::
+ $(RM) $(ALLAVPROGS) $(CLEANSUFFIXES:%=avtools/%)
diff --git a/avconv.c b/avtools/avconv.c
similarity index 100%
rename from avconv.c
rename to avtools/avconv.c
diff --git a/avconv.h b/avtools/avconv.h
similarity index 100%
rename from avconv.h
rename to avtools/avconv.h
diff --git a/avconv_dxva2.c b/avtools/avconv_dxva2.c
similarity index 100%
rename from avconv_dxva2.c
rename to avtools/avconv_dxva2.c
diff --git a/avconv_filter.c b/avtools/avconv_filter.c
similarity index 100%
rename from avconv_filter.c
rename to avtools/avconv_filter.c
diff --git a/avconv_opt.c b/avtools/avconv_opt.c
similarity index 100%
rename from avconv_opt.c
rename to avtools/avconv_opt.c
diff --git a/avconv_qsv.c b/avtools/avconv_qsv.c
similarity index 100%
rename from avconv_qsv.c
rename to avtools/avconv_qsv.c
diff --git a/avconv_vaapi.c b/avtools/avconv_vaapi.c
similarity index 100%
rename from avconv_vaapi.c
rename to avtools/avconv_vaapi.c
diff --git a/avconv_vda.c b/avtools/avconv_vda.c
similarity index 100%
rename from avconv_vda.c
rename to avtools/avconv_vda.c
diff --git a/avconv_vdpau.c b/avtools/avconv_vdpau.c
similarity index 100%
rename from avconv_vdpau.c
rename to avtools/avconv_vdpau.c
diff --git a/avplay.c b/avtools/avplay.c
similarity index 100%
rename from avplay.c
rename to avtools/avplay.c
diff --git a/avprobe.c b/avtools/avprobe.c
similarity index 100%
rename from avprobe.c
rename to avtools/avprobe.c
diff --git a/cmdutils.c b/avtools/cmdutils.c
similarity index 100%
rename from cmdutils.c
rename to avtools/cmdutils.c
diff --git a/cmdutils.h b/avtools/cmdutils.h
similarity index 100%
rename from cmdutils.h
rename to avtools/cmdutils.h
diff --git a/configure b/configure
index a222302..6bccbdf 100755
--- a/configure
+++ b/configure
@@ -5327,7 +5327,7 @@ HOSTLD_O=$HOSTLD_O
TARGET_EXEC=$target_exec $target_exec_args
TARGET_PATH=$target_path
TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
-CFLAGS-avplay=$sdl_cflags
+CFLAGS-avtools/avplay=$sdl_cflags
CFLAGS_HEADERS=$CFLAGS_HEADERS
ZLIB=$($ldflags_filter -lz)
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
diff --git a/tests/Makefile b/tests/Makefile
index 30e06e8..d649011 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -128,7 +128,7 @@ FATE_SAMPLES += $(FATE_SAMPLES-yes)
FATE += $(FATE-yes)
-$(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF)
+$(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avtools/avconv$(EXESUF)
ifdef SAMPLES
FATE += $(FATE_SAMPLES)
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 623fd63..d2db684 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -74,11 +74,11 @@ run(){
}
probefmt(){
- run avprobe -show_format_entry format_name -v 0 "$@"
+ run avtools/avprobe -show_format_entry format_name -v 0 "$@"
}
probestream(){
- run avprobe -show_stream_entry "$1" -v 0 "$2"
+ run avtools/avprobe -show_stream_entry "$1" -v 0 "$2"
}
avconv(){
@@ -88,27 +88,27 @@ avconv(){
[ x${arg} = x-i ] && avconv_args="${avconv_args} ${dec_opts}"
avconv_args="${avconv_args} ${arg}"
done
- run avconv ${avconv_args}
+ run avtools/avconv ${avconv_args}
}
framecrc(){
- avconv "$@" -f framecrc -
+ avtools/avconv "$@" -f framecrc -
}
framemd5(){
- avconv "$@" -f framemd5 -
+ avtools/avconv "$@" -f framemd5 -
}
crc(){
- avconv "$@" -f crc -
+ avtools/avconv "$@" -f crc -
}
md5(){
- avconv "$@" md5:
+ avtools/avconv "$@" md5:
}
pcm(){
- avconv "$@" -vn -f s16le -
+ avtools/avconv "$@" -vn -f s16le -
}
enc_dec_pcm(){
@@ -120,8 +120,8 @@ enc_dec_pcm(){
encfile="${outdir}/${test}.${out_fmt}"
cleanfiles=$encfile
encfile=$(target_path ${encfile})
- avconv -i $src_file "$@" -f $out_fmt -y ${encfile} || return
- avconv -f $out_fmt -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} -
+ avtools/avconv -i $src_file "$@" -f $out_fmt -y ${encfile} || return
+ avtools/avconv -f $out_fmt -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt}
-
}
FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
@@ -142,11 +142,11 @@ enc_dec(){
tsrcfile=$(target_path $srcfile)
tencfile=$(target_path $encfile)
tdecfile=$(target_path $decfile)
- avconv -f $src_fmt $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS \
+ avtools/avconv -f $src_fmt $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt
$FLAGS \
-f $enc_fmt -y $tencfile || return
do_md5sum $encfile
echo $(wc -c $encfile)
- avconv $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
+ avtools/avconv $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
-f $dec_fmt -y $tdecfile || return
do_md5sum $decfile
tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
@@ -164,7 +164,7 @@ video_filter(){
label=${test#filter-}
raw_src="${target_path}/tests/vsynth1/%02d.pgm"
printf '%-20s' $label
- avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \
+ avtools/avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \
$FLAGS $ENC_OPTS -vf "$filters" -vcodec rawvideo -frames:v 5 $* -f nut
md5:
}
@@ -177,7 +177,7 @@ pixfmts(){
out_fmts=${outfile}${filter}_out_fmts
# exclude pixel formats which are not supported as input
- avconv -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^\..\./ { print $2 }'
| sort >$exclude_fmts
+ avtools/avconv -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^\..\./ {
print $2 }' | sort >$exclude_fmts
$showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ print $3 }' | sort | comm
-23 - $exclude_fmts >$out_fmts
pix_fmts=$($showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ print $3 }' |
sort | comm -12 - $out_fmts)
diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index 57cbb1c..cf408fb 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -16,6 +16,6 @@ fate-mov-spherical: CMD = probestream
projection,yaw,pitch,roll $(TARGET_SAMPLES
FATE_MOV += fate-mov-stereo3d
fate-mov-stereo3d: CMD = probestream type $(TARGET_SAMPLES)/mov/spherical.mov
-$(FATE_MOV): avprobe$(EXESUF)
+$(FATE_MOV): avtools/avprobe$(EXESUF)
FATE_SAMPLES-$(call ALLYES, AVPROBE MOV_DEMUXER) += $(FATE_MOV)
fate-mov: $(FATE_MOV)
diff --git a/tests/fate/probe.mak b/tests/fate/probe.mak
index 376dfdd..a985d1b 100644
--- a/tests/fate/probe.mak
+++ b/tests/fate/probe.mak
@@ -13,6 +13,6 @@ fate-probe-format-roundup2015: REF = dv
FATE_SAMPLES-$(CONFIG_AVPROBE) += $(FATE_PROBE_FORMAT)
fate-probe-format: $(FATE_PROBE_FORMAT)
-$(FATE_PROBE_FORMAT): avprobe$(EXESUF)
+$(FATE_PROBE_FORMAT): avtools/avprobe$(EXESUF)
$(FATE_PROBE_FORMAT): CMP = oneline
fate-probe-format-%: CMD = probefmt
$(TARGET_SAMPLES)/probe-format/$(@:fate-probe-format-%=%)
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 3728d44..2d3104e 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -19,7 +19,7 @@ this="$test.$test_ref"
outfile="$datadir/$test_ref/"
# various files
-avconv="$target_exec ${target_path}/avconv"
+avconv="$target_exec ${target_path}/avtools/avconv"
raw_src="${target_path}/$raw_src_dir/%02d.pgm"
raw_dst="$datadir/$this.out.yuv"
pcm_src="$target_datadir/asynth1.sw"
--
2.1.4
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
