From 4ab26cb4cc9af2ab2199105aa273aa23e1f27911 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Tue, 7 Aug 2012 12:49:01 -0400 Subject: configure: Add support for e500mc CPU Signed-off-by: Derek Buitenhuis --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index a97198c9ef..f43206849c 100755 --- a/configure +++ b/configure @@ -2354,6 +2354,10 @@ elif enabled ppc; then cpuflags="-mcpu=cell" enable ldbrx ;; + e500mc) + cpuflags="-mcpu=e500mc" + disable altivec + ;; e500v2) cpuflags="-mcpu=8548 -mhard-float -mfloat-gprs=double" disable altivec -- cgit v1.2.3 From ec9d2c15c17ada4ebb5c8ca335a71a1f330dcaf9 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Tue, 7 Aug 2012 17:43:29 +0100 Subject: ARM: use Q/R inline asm operand modifiers only if supported Some compilers do not support the Q/R modifiers used to access the low/high parts of a 64-bit register pair. Check for this and disable all uses of it when not supported. Fixes bug #337. Signed-off-by: Mans Rullgard --- configure | 2 ++ libavutil/arm/intmath.h | 4 ++++ libavutil/arm/intreadwrite.h | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/configure b/configure index f43206849c..da4036ec7b 100755 --- a/configure +++ b/configure @@ -1077,6 +1077,7 @@ HAVE_LIST=" alsa_asoundlib_h altivec_h arpa_inet_h + asm_mod_q asm_mod_y attribute_may_alias attribute_packed @@ -2792,6 +2793,7 @@ EOF enabled neon && check_asm neon '"vadd.i16 q0, q0, q0"' enabled vfpv3 && check_asm vfpv3 '"vmov.f32 s0, #1.0"' + check_asm asm_mod_q '"add r0, %Q0, %R0" :: "r"((long long)0)' check_asm asm_mod_y '"vmul.i32 d0, d0, %y0" :: "x"(0)' enabled_all armv6t2 shared !pic && enable_pic diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h index b6a45c1395..fa31ecf6a5 100644 --- a/libavutil/arm/intmath.h +++ b/libavutil/arm/intmath.h @@ -97,6 +97,8 @@ static av_always_inline av_const int FASTDIV(int a, int b) #endif /* HAVE_ARMV6 */ +#if HAVE_ASM_MOD_Q + #define av_clipl_int32 av_clipl_int32_arm static av_always_inline av_const int32_t av_clipl_int32_arm(int64_t a) { @@ -110,6 +112,8 @@ static av_always_inline av_const int32_t av_clipl_int32_arm(int64_t a) return x; } +#endif /* HAVE_ASM_MOD_Q */ + #endif /* HAVE_INLINE_ASM */ #endif /* AVUTIL_ARM_INTMATH_H */ diff --git a/libavutil/arm/intreadwrite.h b/libavutil/arm/intreadwrite.h index ed53330e39..6eff7332fb 100644 --- a/libavutil/arm/intreadwrite.h +++ b/libavutil/arm/intreadwrite.h @@ -61,6 +61,8 @@ static av_always_inline void AV_WN32(void *p, uint32_t v) __asm__ ("str %1, %0" : "=m"(*(uint32_t *)p) : "r"(v)); } +#if HAVE_ASM_MOD_Q + #define AV_RN64 AV_RN64 static av_always_inline uint64_t AV_RN64(const void *p) { @@ -82,6 +84,8 @@ static av_always_inline void AV_WN64(void *p, uint64_t v) : "r"(v)); } +#endif /* HAVE_ASM_MOD_Q */ + #endif /* HAVE_INLINE_ASM */ #endif /* AVUTIL_ARM_INTREADWRITE_H */ -- cgit v1.2.3 From 12127b65b095d36f528ac477e1c995d1b3742852 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 7 Aug 2012 12:21:31 +0200 Subject: rtmp: Factorize simultaneous URLProtocol / AVClass declarations with a macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/rtmpproto.c | 127 +++++++++--------------------------------------- 1 file changed, 23 insertions(+), 104 deletions(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 4a35319c4d..1a6b5c1903 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1598,110 +1598,29 @@ static const AVOption rtmp_options[] = { { NULL }, }; -static const AVClass rtmp_class = { - .class_name = "rtmp", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, +#define RTMP_PROTOCOL(flavor) \ +static const AVClass flavor##_class = { \ + .class_name = #flavor, \ + .item_name = av_default_item_name, \ + .option = rtmp_options, \ + .version = LIBAVUTIL_VERSION_INT, \ +}; \ + \ +URLProtocol ff_##flavor##_protocol = { \ + .name = #flavor, \ + .url_open = rtmp_open, \ + .url_read = rtmp_read, \ + .url_write = rtmp_write, \ + .url_close = rtmp_close, \ + .priv_data_size = sizeof(RTMPContext), \ + .flags = URL_PROTOCOL_FLAG_NETWORK, \ + .priv_data_class= &flavor##_class, \ }; -URLProtocol ff_rtmp_protocol = { - .name = "rtmp", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class= &rtmp_class, -}; - -static const AVClass rtmpe_class = { - .class_name = "rtmpe", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -URLProtocol ff_rtmpe_protocol = { - .name = "rtmpe", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &rtmpe_class, -}; - -static const AVClass rtmps_class = { - .class_name = "rtmps", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -URLProtocol ff_rtmps_protocol = { - .name = "rtmps", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &rtmps_class, -}; - -static const AVClass rtmpt_class = { - .class_name = "rtmpt", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -URLProtocol ff_rtmpt_protocol = { - .name = "rtmpt", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &rtmpt_class, -}; - -static const AVClass rtmpte_class = { - .class_name = "rtmpte", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, -}; -URLProtocol ff_rtmpte_protocol = { - .name = "rtmpte", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &rtmpte_class, -}; - -static const AVClass rtmpts_class = { - .class_name = "rtmpts", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -URLProtocol ff_rtmpts_protocol = { - .name = "rtmpts", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &rtmpts_class, -}; +RTMP_PROTOCOL(rtmp) +RTMP_PROTOCOL(rtmpe) +RTMP_PROTOCOL(rtmps) +RTMP_PROTOCOL(rtmpt) +RTMP_PROTOCOL(rtmpte) +RTMP_PROTOCOL(rtmpts) -- cgit v1.2.3 From f9e77c1762c6904828550326dbbb2b36905eca1a Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 7 Aug 2012 21:51:46 +0200 Subject: rtmp: Add support for subscribing live streams MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When streaming live streams using the Akamai, Edgecast or Limelight CDN, players cannot simply connect to the live stream. Instead, they have to subscribe to it, by sending an FC Subscribe call to the server. Signed-off-by: Martin Storsjö --- libavformat/rtmpproto.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 1a6b5c1903..d21ffead7f 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -604,6 +604,29 @@ static int gen_bytes_read(URLContext *s, RTMPContext *rt, uint32_t ts) return ret; } +static int gen_fcsubscribe_stream(URLContext *s, RTMPContext *rt) +{ + RTMPPacket pkt; + uint8_t *p; + int ret; + + if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, + 0, 27 + strlen(rt->playpath))) < 0) + return ret; + + p = pkt.data; + ff_amf_write_string(&p, "FCSubscribe"); + ff_amf_write_number(&p, ++rt->nb_invokes); + ff_amf_write_null(&p); + ff_amf_write_string(&p, rt->playpath); + + ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, + rt->prev_pkt[1]); + ff_rtmp_packet_destroy(&pkt); + + return ret; +} + int ff_rtmp_calc_digest(const uint8_t *src, int len, int gap, const uint8_t *key, int keylen, uint8_t *dst) { @@ -1011,6 +1034,14 @@ static int handle_invoke(URLContext *s, RTMPPacket *pkt) } if ((ret = gen_create_stream(s, rt)) < 0) return ret; + + if (rt->is_input) { + /* Send the FCSubscribe command if live stream. */ + if (rt->live == -1) { + if ((ret = gen_fcsubscribe_stream(s, rt)) < 0) + return ret; + } + } break; case STATE_FCPUBLISH: rt->state = STATE_CONNECTING; -- cgit v1.2.3 From 00cb52c65cb2913f20dd3d0e6601d1b0db0b657b Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 7 Aug 2012 22:02:27 +0200 Subject: rtmp: Add a new option 'rtmp_subscribe' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This option specifies the name of live stream to subscribe. Defaults to rtmp_playpath. Signed-off-by: Martin Storsjö --- doc/protocols.texi | 5 +++++ libavformat/rtmpproto.c | 21 +++++++++++++++------ libavformat/version.h | 2 +- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index ff872fcdca..bf67d89ad3 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -237,6 +237,11 @@ value will be sent. Stream identifier to play or to publish. This option overrides the parameter specified in the URI. +@item rtmp_subscribe +Name of live stream to subscribe to. By default no value will be sent. +It is only sent if the option is specified or if rtmp_live +is set to live. + @item rtmp_swfurl URL of the SWF player for the media. By default no value will be sent. diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index d21ffead7f..19b6874791 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -91,6 +91,7 @@ typedef struct RTMPContext { char* flashver; ///< version of the flash plugin char* swfurl; ///< url of the swf player char* pageurl; ///< url of the web page + char* subscribe; ///< name of live stream to subscribe int server_bw; ///< server bandwidth int client_buffer_time; ///< client buffer time in ms int flush_interval; ///< number of packets flushed in the same request (RTMPT only) @@ -604,21 +605,22 @@ static int gen_bytes_read(URLContext *s, RTMPContext *rt, uint32_t ts) return ret; } -static int gen_fcsubscribe_stream(URLContext *s, RTMPContext *rt) +static int gen_fcsubscribe_stream(URLContext *s, RTMPContext *rt, + const char *subscribe) { RTMPPacket pkt; uint8_t *p; int ret; if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, - 0, 27 + strlen(rt->playpath))) < 0) + 0, 27 + strlen(subscribe))) < 0) return ret; p = pkt.data; ff_amf_write_string(&p, "FCSubscribe"); ff_amf_write_number(&p, ++rt->nb_invokes); ff_amf_write_null(&p); - ff_amf_write_string(&p, rt->playpath); + ff_amf_write_string(&p, subscribe); ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); @@ -1036,9 +1038,15 @@ static int handle_invoke(URLContext *s, RTMPPacket *pkt) return ret; if (rt->is_input) { - /* Send the FCSubscribe command if live stream. */ - if (rt->live == -1) { - if ((ret = gen_fcsubscribe_stream(s, rt)) < 0) + /* Send the FCSubscribe command when the name of live + * stream is defined by the user or if it's a live stream. */ + if (rt->subscribe) { + if ((ret = gen_fcsubscribe_stream(s, rt, + rt->subscribe)) < 0) + return ret; + } else if (rt->live == -1) { + if ((ret = gen_fcsubscribe_stream(s, rt, + rt->playpath)) < 0) return ret; } } @@ -1624,6 +1632,7 @@ static const AVOption rtmp_options[] = { {"recorded", "recorded stream", 0, AV_OPT_TYPE_CONST, {0}, 0, 0, DEC, "rtmp_live"}, {"rtmp_pageurl", "URL of the web page in which the media was embedded. By default no value will be sent.", OFFSET(pageurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC}, {"rtmp_playpath", "Stream identifier to play or to publish", OFFSET(playpath), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_subscribe", "Name of live stream to subscribe to. Defaults to rtmp_playpath.", OFFSET(subscribe), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC}, {"rtmp_swfurl", "URL of the SWF player. By default no value will be sent", OFFSET(swfurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, {"rtmp_tcurl", "URL of the target stream. Defaults to proto://host[:port]/app.", OFFSET(tcurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, { NULL }, diff --git a/libavformat/version.h b/libavformat/version.h index 6a11bf9df7..55026e809c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 13 -#define LIBAVFORMAT_VERSION_MICRO 0 +#define LIBAVFORMAT_VERSION_MICRO 1 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ -- cgit v1.2.3 From dfd9159f3db987e9115715cded7a4408179e3ed9 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Tue, 7 Aug 2012 02:11:25 +0100 Subject: build: change checkheaders to use regular build rules Many compilers need special flags to compile *.h files as regular source code, if they will do so at all. Rather than hoping all compilers will have such a flag and adding mappings for it, create wrapper .c files for test building single headers. This allows using the regular rule for compiling C files without the need for special flags, and it also provides proper dependency tracking for these objects. Signed-off-by: Mans Rullgard --- .gitignore | 2 +- Makefile | 4 ++-- common.mak | 8 +++++--- library.mak | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 56b304070d..19dbe88ff6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ *.def *.dll *.exe -*.ho +*.h.c *.lib *.pc *.so diff --git a/Makefile b/Makefile index 20e6a3861b..682eda75a4 100644 --- a/Makefile +++ b/Makefile @@ -45,8 +45,8 @@ COMPILE_S = $(call COMPILE,AS) %.o: %.S $(COMPILE_S) -%.ho: %.h - $(CC) $(CCFLAGS) -c $(CC_O) -x c $< +%.h.c: + $(Q)echo '#include "$*.h"' >$@ %.ver: %.v $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@ diff --git a/common.mak b/common.mak index aed11f7891..f94a43d35a 100644 --- a/common.mak +++ b/common.mak @@ -28,7 +28,9 @@ DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME) ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h)) SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) -checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho)) +HOBJS = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o)) +checkheaders: $(HOBJS) +.SECONDARY: $(HOBJS:.o=.c) alltools: $(TOOLS) @@ -45,8 +47,8 @@ $(TOOLOBJS): | tools OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS)) -CLEANSUFFIXES = *.d *.o *~ *.ho *.map *.ver +CLEANSUFFIXES = *.d *.o *~ *.h.c *.map *.ver DISTCLEANSUFFIXES = *.pc LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a --include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d)) +-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d)) diff --git a/library.mak b/library.mak index cd3fdc28f9..3045640e0b 100644 --- a/library.mak +++ b/library.mak @@ -20,7 +20,7 @@ $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm $(DEPYASM) $(YASMFLAGS) -I $( $(@:.o=.d) $(YASM) $(YASMFLAGS) -I $( Date: Tue, 7 Aug 2012 17:05:34 +0200 Subject: build: Remove all installed headers and header directories on uninstall --- library.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library.mak b/library.mak index 3045640e0b..9742ac4b7b 100644 --- a/library.mak +++ b/library.mak @@ -82,9 +82,9 @@ uninstall-libs:: -$(RM) "$(LIBDIR)/$(LIBNAME)" uninstall-headers:: - $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS)) + $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS)) $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc" - -rmdir "$(INCDIR)" + -rmdir "$(INCINSTDIR)" endef $(eval $(RULES)) -- cgit v1.2.3 From 578344f79c480507fe07303ce6ed75d45fe0dd26 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 7 Aug 2012 14:56:38 +0200 Subject: doc: cygwin: Update list of FATE package requirements --- doc/platform.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/platform.texi b/doc/platform.texi index 46e36c381a..2049031f11 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -287,9 +287,9 @@ following "Devel" ones: binutils, gcc4-core, make, git, mingw-runtime, texi2html @end example -And the following "Utils" one: +In order to run FATE you will also need the following "Utils" packages: @example -diffutils +bc, diffutils @end example Then run -- cgit v1.2.3 From 154caa677c0ea62f82b7787b528304c150c6b928 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 9 May 2012 04:29:53 +0100 Subject: configure: add --enable/disable-random option This allows creating random configurations which is useful for testing purposes. Signed-off-by: Mans Rullgard --- configure | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/configure b/configure index da4036ec7b..9bdeebde45 100755 --- a/configure +++ b/configure @@ -266,6 +266,14 @@ Developer options (useful when working on Libav itself): \$LIBAV_SAMPLES at make invocation time. --enable-xmm-clobber-test check XMM registers for clobbering (Win64-only; should be used only for debugging purposes) + --enable-random randomly enable/disable components + --disable-random + --enable-random=LIST randomly enable/disable specific components or + --disable-random=LIST component groups. LIST is a comma-separated list + of NAME[:PROB] entries where NAME is a component + (group) and PROB the probability associated with + NAME (default 0.5). + --random-seed=VALUE seed value for --enable/disable-random NOTE: Object files are built at the place where configure is launched. EOF @@ -1270,6 +1278,7 @@ CMDLINE_SET=" nm optflags pkg_config + random_seed samples sysinclude sysroot @@ -1846,6 +1855,27 @@ show_list() { exit 0 } +rand_list(){ + IFS=', ' + set -- $* + unset IFS + for thing; do + comp=${thing%:*} + prob=${thing#$comp} + prob=${prob#:} + is_in ${comp} $COMPONENT_LIST && eval comp=\$$(toupper ${comp%s})_LIST + echo "prob ${prob:-0.5}" + printf '%s\n' $comp + done +} + +do_random(){ + action=$1 + shift + random_seed=$(awk "BEGIN { srand($random_seed); print srand() }") + $action $(rand_list "$@" | awk "BEGIN { srand($random_seed) } \$1 == \"prob\" { prob = \$2; next } rand() < prob { print }") +} + for opt do optval="${opt#*=}" case "$opt" in @@ -1860,6 +1890,14 @@ for opt do --disable-everything) map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST ;; + --enable-random|--disable-random) + action=${opt%%-random} + do_random ${action#--} $COMPONENT_LIST + ;; + --enable-random=*|--disable-random=*) + action=${opt%%-random=*} + do_random ${action#--} $optval + ;; --enable-*=*|--disable-*=*) eval $(echo "${opt%%=*}" | sed 's/--/action=/;s/-/ thing=/') is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt" @@ -3390,6 +3428,8 @@ echo "libxvid enabled ${libxvid-no}" echo "openssl enabled ${openssl-no}" echo "zlib enabled ${zlib-no}" echo "bzlib enabled ${bzlib-no}" +test -n "$random_seed" && + echo "random seed ${random_seed}" echo for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf indev outdev; do -- cgit v1.2.3 From 5702c8670e3f3bcdacec918ff64326ccd7af7236 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 31 Jul 2012 15:32:02 +0200 Subject: api-example: update to new audio encoding API. --- libavcodec/api-example.c | 137 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 120 insertions(+), 17 deletions(-) diff --git a/libavcodec/api-example.c b/libavcodec/api-example.c index cdb22c618a..533b6f7cc9 100644 --- a/libavcodec/api-example.c +++ b/libavcodec/api-example.c @@ -37,6 +37,7 @@ #endif #include "libavcodec/avcodec.h" +#include "libavutil/audioconvert.h" #include "libavutil/mathematics.h" #include "libavutil/samplefmt.h" @@ -44,6 +45,59 @@ #define AUDIO_INBUF_SIZE 20480 #define AUDIO_REFILL_THRESH 4096 +/* check that a given sample format is supported by the encoder */ +static int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt) +{ + const enum AVSampleFormat *p = codec->sample_fmts; + + while (*p != AV_SAMPLE_FMT_NONE) { + if (*p == sample_fmt) + return 1; + p++; + } + return 0; +} + +/* just pick the highest supported samplerate */ +static int select_sample_rate(AVCodec *codec) +{ + const int *p; + int best_samplerate = 0; + + if (!codec->supported_samplerates) + return 44100; + + p = codec->supported_samplerates; + while (*p) { + best_samplerate = FFMAX(*p, best_samplerate); + p++; + } + return best_samplerate; +} + +/* select layout with the highest channel count */ +static int select_channel_layout(AVCodec *codec) +{ + const uint64_t *p; + uint64_t best_ch_layout = 0; + int best_nb_channells = 0; + + if (!codec->channel_layouts) + return AV_CH_LAYOUT_STEREO; + + p = codec->channel_layouts; + while (*p) { + int nb_channels = av_get_channel_layout_nb_channels(*p); + + if (nb_channels > best_nb_channells) { + best_ch_layout = *p; + best_nb_channells = nb_channels; + } + p++; + } + return best_ch_layout; +} + /* * Audio encoding example */ @@ -51,11 +105,13 @@ static void audio_encode_example(const char *filename) { AVCodec *codec; AVCodecContext *c= NULL; - int frame_size, i, j, out_size, outbuf_size; + AVFrame *frame; + AVPacket pkt; + int i, j, k, ret, got_output; + int buffer_size; FILE *f; - short *samples; + uint16_t *samples; float t, tincr; - uint8_t *outbuf; printf("Audio encoding\n"); @@ -70,8 +126,19 @@ static void audio_encode_example(const char *filename) /* put sample parameters */ c->bit_rate = 64000; - c->sample_rate = 44100; - c->channels = 2; + + /* check that the encoder supports s16 pcm input */ + c->sample_fmt = AV_SAMPLE_FMT_S16; + if (!check_sample_fmt(codec, c->sample_fmt)) { + fprintf(stderr, "encoder does not support %s", + av_get_sample_fmt_name(c->sample_fmt)); + exit(1); + } + + /* select other audio parameters supported by the encoder */ + c->sample_rate = select_sample_rate(codec); + c->channel_layout = select_channel_layout(codec); + c->channels = av_get_channel_layout_nb_channels(c->channel_layout); /* open it */ if (avcodec_open2(c, codec, NULL) < 0) { @@ -79,35 +146,71 @@ static void audio_encode_example(const char *filename) exit(1); } - /* the codec gives us the frame size, in samples */ - frame_size = c->frame_size; - samples = malloc(frame_size * 2 * c->channels); - outbuf_size = 10000; - outbuf = malloc(outbuf_size); - f = fopen(filename, "wb"); if (!f) { fprintf(stderr, "could not open %s\n", filename); exit(1); } + /* frame containing input raw audio */ + frame = avcodec_alloc_frame(); + if (!frame) { + fprintf(stderr, "could not allocate audio frame\n"); + exit(1); + } + + frame->nb_samples = c->frame_size; + frame->format = c->sample_fmt; + frame->channel_layout = c->channel_layout; + + /* the codec gives us the frame size, in samples, + * we calculate the size of the samples buffer in bytes */ + buffer_size = av_samples_get_buffer_size(NULL, c->channels, c->frame_size, + c->sample_fmt, 0); + samples = av_malloc(buffer_size); + if (!samples) { + fprintf(stderr, "could not allocate %d bytes for samples buffer\n", + buffer_size); + exit(1); + } + /* setup the data pointers in the AVFrame */ + ret = avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt, + (const uint8_t*)samples, buffer_size, 0); + if (ret < 0) { + fprintf(stderr, "could not setup audio frame\n"); + exit(1); + } + /* encode a single tone sound */ t = 0; tincr = 2 * M_PI * 440.0 / c->sample_rate; for(i=0;i<200;i++) { - for(j=0;jframe_size; j++) { samples[2*j] = (int)(sin(t) * 10000); - samples[2*j+1] = samples[2*j]; + + for (k = 1; k < c->channels; k++) + samples[2*j + k] = samples[2*j]; t += tincr; } /* encode the samples */ - out_size = avcodec_encode_audio(c, outbuf, outbuf_size, samples); - fwrite(outbuf, 1, out_size, f); + ret = avcodec_encode_audio2(c, &pkt, frame, &got_output); + if (ret < 0) { + fprintf(stderr, "error encoding audio frame\n"); + exit(1); + } + if (got_output) { + fwrite(pkt.data, 1, pkt.size, f); + av_free_packet(&pkt); + } } fclose(f); - free(outbuf); - free(samples); + av_freep(&samples); + av_freep(&frame); avcodec_close(c); av_free(c); } -- cgit v1.2.3 From 927e92cdc7f442a526ba1266420181d4418c02f3 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 31 Jul 2012 15:44:00 +0200 Subject: mpegaudiodec: don't print an error on > 1 frame in a packet. It's a perfectly normal situation, nothing to spam about. --- libavcodec/mpegaudiodec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index c33b12a354..03094f6260 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1663,7 +1663,6 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr, av_log(avctx, AV_LOG_ERROR, "incomplete frame\n"); return AVERROR_INVALIDDATA; } else if (s->frame_size < buf_size) { - av_log(avctx, AV_LOG_ERROR, "incorrect frame size\n"); buf_size= s->frame_size; } -- cgit v1.2.3 From 94364b7d425bdb150f3b92fb94e7cc2a32ef325f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 1 Aug 2012 07:33:56 +0200 Subject: mpegaudioenc: list supported channel layouts. --- libavcodec/mpegaudioenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index bc44aed12d..36777d4804 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -24,6 +24,8 @@ * The simplest mpeg audio layer 2 encoder. */ +#include "libavutil/audioconvert.h" + #include "avcodec.h" #include "internal.h" #include "put_bits.h" @@ -794,6 +796,9 @@ AVCodec ff_mp2_encoder = { .supported_samplerates = (const int[]){ 44100, 48000, 32000, 22050, 24000, 16000, 0 }, + .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + 0 }, .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), .defaults = mp2_defaults, }; -- cgit v1.2.3 From 8f2aa89a5d4e0bc530af7dc7b4d9e9b2d61f7feb Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Tue, 7 Aug 2012 20:22:57 +0200 Subject: mpc8: do not leave padding after last frame in buffer for the next decode call --- libavcodec/mpc8.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 915a785b81..79225c4275 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -411,6 +411,8 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data, c->cur_frame++; c->last_bits_used = get_bits_count(gb); + if(get_bits_left(gb) < 8) // we have only padding left + c->last_bits_used = buf_size << 3; if(c->cur_frame >= c->frames) c->cur_frame = 0; -- cgit v1.2.3 From f5e668273a0c3ee439b3df41c7555fd3b77f6035 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 1 Aug 2012 18:23:12 +0200 Subject: avconv: split option parsing into a separate file. --- Makefile | 1 + avconv.c | 2227 ++-------------------------------------------------------- avconv.h | 360 ++++++++++ avconv_opt.c | 1915 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 2324 insertions(+), 2179 deletions(-) create mode 100644 avconv.h create mode 100644 avconv_opt.c diff --git a/Makefile b/Makefile index 682eda75a4..6477059c3f 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,7 @@ PROGS-$(CONFIG_AVSERVER) += avserver PROGS := $(PROGS-yes:%=%$(EXESUF)) OBJS = cmdutils.o +OBJS-avconv = avconv_opt.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options TOOLS = qt-faststart trasher diff --git a/avconv.c b/avconv.c index ea76937f4b..ad4a975a1c 100644 --- a/avconv.c +++ b/avconv.c @@ -73,74 +73,23 @@ #include +#include "avconv.h" #include "cmdutils.h" #include "libavutil/avassert.h" -#define VSYNC_AUTO -1 -#define VSYNC_PASSTHROUGH 0 -#define VSYNC_CFR 1 -#define VSYNC_VFR 2 - const char program_name[] = "avconv"; const int program_birth_year = 2000; -/* select an input stream for an output stream */ -typedef struct StreamMap { - int disabled; /** 1 is this mapping is disabled by a negative map */ - int file_index; - int stream_index; - int sync_file_index; - int sync_stream_index; - char *linklabel; /** name of an output link, for mapping lavfi outputs */ -} StreamMap; - -/** - * select an input file for an output file - */ -typedef struct MetadataMap { - int file; ///< file index - char type; ///< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram - int index; ///< stream/chapter/program number -} MetadataMap; - -static const OptionDef *options; - -static int video_discard = 0; -static int same_quant = 0; -static int do_deinterlace = 0; -static int intra_dc_precision = 8; -static int qp_hist = 0; - -static int file_overwrite = 0; -static int do_benchmark = 0; -static int do_hex_dump = 0; -static int do_pkt_dump = 0; -static int do_pass = 0; -static char *pass_logfilename_prefix = NULL; -static int video_sync_method = VSYNC_AUTO; -static int audio_sync_method = 0; -static float audio_drift_threshold = 0.1; -static int copy_ts = 0; -static int copy_tb = 1; -static int opt_shortest = 0; -static char *vstats_filename; static FILE *vstats_file; -static int audio_volume = 256; - -static int exit_on_error = 0; -static int using_stdin = 0; static int64_t video_size = 0; static int64_t audio_size = 0; static int64_t extra_size = 0; static int nb_frames_dup = 0; static int nb_frames_drop = 0; -static int input_sync; -static float dts_delta_threshold = 10; -static int print_stats = 1; #if HAVE_PTHREADS /* signal to input threads that they should exit; set by the main thread */ @@ -149,309 +98,18 @@ static int transcoding_finished; #define DEFAULT_PASS_LOGFILENAME_PREFIX "av2pass" -typedef struct InputFilter { - AVFilterContext *filter; - struct InputStream *ist; - struct FilterGraph *graph; - uint8_t *name; -} InputFilter; - -typedef struct OutputFilter { - AVFilterContext *filter; - struct OutputStream *ost; - struct FilterGraph *graph; - uint8_t *name; - - /* temporary storage until stream maps are processed */ - AVFilterInOut *out_tmp; -} OutputFilter; - -typedef struct FilterGraph { - int index; - const char *graph_desc; - - AVFilterGraph *graph; - - InputFilter **inputs; - int nb_inputs; - OutputFilter **outputs; - int nb_outputs; -} FilterGraph; - -typedef struct InputStream { - int file_index; - AVStream *st; - int discard; /* true if stream data should be discarded */ - int decoding_needed; /* true if the packets must be decoded in 'raw_fifo' */ - AVCodec *dec; - AVFrame *decoded_frame; - - int64_t start; /* time when read started */ - /* predicted dts of the next packet read for this stream or (when there are - * several frames in a packet) of the next frame in current packet */ - int64_t next_dts; - /* dts of the last packet read for this stream */ - int64_t last_dts; - PtsCorrectionContext pts_ctx; - double ts_scale; - int is_start; /* is 1 at the start and after a discontinuity */ - int showed_multi_packet_warning; - AVDictionary *opts; - AVRational framerate; /* framerate forced with -r */ - - int resample_height; - int resample_width; - int resample_pix_fmt; - - int resample_sample_fmt; - int resample_sample_rate; - int resample_channels; - uint64_t resample_channel_layout; - - /* a pool of free buffers for decoded data */ - FrameBuffer *buffer_pool; - - /* decoded data from this stream goes into all those filters - * currently video and audio only */ - InputFilter **filters; - int nb_filters; -} InputStream; - -typedef struct InputFile { - AVFormatContext *ctx; - int eof_reached; /* true if eof reached */ - int ist_index; /* index of first stream in ist_table */ - int buffer_size; /* current total buffer size */ - int64_t ts_offset; - int nb_streams; /* number of stream that avconv is aware of; may be different - from ctx.nb_streams if new streams appear during av_read_frame() */ - int rate_emu; - -#if HAVE_PTHREADS - pthread_t thread; /* thread reading from this file */ - int finished; /* the thread has exited */ - int joined; /* the thread has been joined */ - pthread_mutex_t fifo_lock; /* lock for access to fifo */ - pthread_cond_t fifo_cond; /* the main thread will signal on this cond after reading from fifo */ - AVFifoBuffer *fifo; /* demuxed packets are stored here; freed by the main thread */ -#endif -} InputFile; - -typedef struct OutputStream { - int file_index; /* file index */ - int index; /* stream index in the output file */ - int source_index; /* InputStream index */ - AVStream *st; /* stream in the output file */ - int encoding_needed; /* true if encoding needed for this stream */ - int frame_number; - /* input pts and corresponding output pts - for A/V sync */ - // double sync_ipts; /* dts from the AVPacket of the demuxer in second units */ - struct InputStream *sync_ist; /* input stream to sync against */ - int64_t sync_opts; /* output frame counter, could be changed to some true timestamp */ // FIXME look at frame_number - /* pts of the first frame encoded for this stream, used for limiting - * recording time */ - int64_t first_pts; - AVBitStreamFilterContext *bitstream_filters; - AVCodec *enc; - int64_t max_frames; - AVFrame *filtered_frame; - - /* video only */ - AVRational frame_rate; - int force_fps; - int top_field_first; - - float frame_aspect_ratio; - float last_quality; - - /* forced key frames */ - int64_t *forced_kf_pts; - int forced_kf_count; - int forced_kf_index; - char *forced_keyframes; - - FILE *logfile; - - OutputFilter *filter; - char *avfilter; - - int64_t sws_flags; - AVDictionary *opts; - int is_past_recording_time; - int stream_copy; - const char *attachment_filename; - int copy_initial_nonkeyframes; - - enum PixelFormat pix_fmts[2]; -} OutputStream; - - -typedef struct OutputFile { - AVFormatContext *ctx; - AVDictionary *opts; - int ost_index; /* index of the first stream in output_streams */ - int64_t recording_time; /* desired length of the resulting file in microseconds */ - int64_t start_time; /* start time in microseconds */ - uint64_t limit_filesize; -} OutputFile; - -static InputStream **input_streams = NULL; -static int nb_input_streams = 0; -static InputFile **input_files = NULL; -static int nb_input_files = 0; - -static OutputStream **output_streams = NULL; -static int nb_output_streams = 0; -static OutputFile **output_files = NULL; -static int nb_output_files = 0; - -static FilterGraph **filtergraphs; -int nb_filtergraphs; - -typedef struct OptionsContext { - /* input/output options */ - int64_t start_time; - const char *format; - - SpecifierOpt *codec_names; - int nb_codec_names; - SpecifierOpt *audio_channels; - int nb_audio_channels; - SpecifierOpt *audio_sample_rate; - int nb_audio_sample_rate; - SpecifierOpt *frame_rates; - int nb_frame_rates; - SpecifierOpt *frame_sizes; - int nb_frame_sizes; - SpecifierOpt *frame_pix_fmts; - int nb_frame_pix_fmts; - - /* input options */ - int64_t input_ts_offset; - int rate_emu; - - SpecifierOpt *ts_scale; - int nb_ts_scale; - SpecifierOpt *dump_attachment; - int nb_dump_attachment; - - /* output options */ - StreamMap *stream_maps; - int nb_stream_maps; - /* first item specifies output metadata, second is input */ - MetadataMap (*meta_data_maps)[2]; - int nb_meta_data_maps; - int metadata_global_manual; - int metadata_streams_manual; - int metadata_chapters_manual; - const char **attachments; - int nb_attachments; - - int chapters_input_file; - - int64_t recording_time; - uint64_t limit_filesize; - float mux_preload; - float mux_max_delay; - - int video_disable; - int audio_disable; - int subtitle_disable; - int data_disable; - - /* indexed by output file stream index */ - int *streamid_map; - int nb_streamid_map; - - SpecifierOpt *metadata; - int nb_metadata; - SpecifierOpt *max_frames; - int nb_max_frames; - SpecifierOpt *bitstream_filters; - int nb_bitstream_filters; - SpecifierOpt *codec_tags; - int nb_codec_tags; - SpecifierOpt *sample_fmts; - int nb_sample_fmts; - SpecifierOpt *qscale; - int nb_qscale; - SpecifierOpt *forced_key_frames; - int nb_forced_key_frames; - SpecifierOpt *force_fps; - int nb_force_fps; - SpecifierOpt *frame_aspect_ratios; - int nb_frame_aspect_ratios; - SpecifierOpt *rc_overrides; - int nb_rc_overrides; - SpecifierOpt *intra_matrices; - int nb_intra_matrices; - SpecifierOpt *inter_matrices; - int nb_inter_matrices; - SpecifierOpt *top_field_first; - int nb_top_field_first; - SpecifierOpt *metadata_map; - int nb_metadata_map; - SpecifierOpt *presets; - int nb_presets; - SpecifierOpt *copy_initial_nonkeyframes; - int nb_copy_initial_nonkeyframes; - SpecifierOpt *filters; - int nb_filters; -} OptionsContext; - -#define MATCH_PER_STREAM_OPT(name, type, outvar, fmtctx, st)\ -{\ - int i, ret;\ - for (i = 0; i < o->nb_ ## name; i++) {\ - char *spec = o->name[i].specifier;\ - if ((ret = check_stream_specifier(fmtctx, st, spec)) > 0)\ - outvar = o->name[i].u.type;\ - else if (ret < 0)\ - exit_program(1);\ - }\ -} - -static void reset_options(OptionsContext *o) -{ - const OptionDef *po = options; - int i; - - /* all OPT_SPEC and OPT_STRING can be freed in generic way */ - while (po->name) { - void *dst = (uint8_t*)o + po->u.off; - - if (po->flags & OPT_SPEC) { - SpecifierOpt **so = dst; - int i, *count = (int*)(so + 1); - for (i = 0; i < *count; i++) { - av_freep(&(*so)[i].specifier); - if (po->flags & OPT_STRING) - av_freep(&(*so)[i].u.str); - } - av_freep(so); - *count = 0; - } else if (po->flags & OPT_OFFSET && po->flags & OPT_STRING) - av_freep(dst); - po++; - } - - for (i = 0; i < o->nb_stream_maps; i++) - av_freep(&o->stream_maps[i].linklabel); - av_freep(&o->stream_maps); - av_freep(&o->meta_data_maps); - av_freep(&o->streamid_map); - - memset(o, 0, sizeof(*o)); +InputStream **input_streams = NULL; +int nb_input_streams = 0; +InputFile **input_files = NULL; +int nb_input_files = 0; - o->mux_max_delay = 0.7; - o->recording_time = INT64_MAX; - o->limit_filesize = UINT64_MAX; - o->chapters_input_file = INT_MAX; +OutputStream **output_streams = NULL; +int nb_output_streams = 0; +OutputFile **output_files = NULL; +int nb_output_files = 0; - uninit_opts(); - init_opts(); -} +FilterGraph **filtergraphs; +int nb_filtergraphs; /** * Define a function for building a string containing a list of @@ -779,7 +437,7 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, avio_close_dyn_buf(pb, &f->name); \ } -static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) +int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) { av_freep(&ofilter->name); DESCRIBE_FILTER_LINK(ofilter, out, 0); @@ -912,7 +570,7 @@ static int configure_input_filter(FilterGraph *fg, InputFilter *ifilter, } } -static int configure_filtergraph(FilterGraph *fg) +int configure_filtergraph(FilterGraph *fg) { AVFilterInOut *inputs, *outputs, *cur; int ret, i, init = !fg->graph, simple = !fg->graph_desc; @@ -973,17 +631,6 @@ static int configure_filtergraph(FilterGraph *fg) return 0; } -static int configure_complex_filters(void) -{ - int i, ret = 0; - - for (i = 0; i < nb_filtergraphs; i++) - if (!filtergraphs[i]->graph && - (ret = configure_filtergraph(filtergraphs[i])) < 0) - return ret; - return 0; -} - static int ist_in_filtergraph(FilterGraph *fg, InputStream *ist) { int i; @@ -1023,7 +670,7 @@ static int decode_interrupt_cb(void *ctx) return received_nb_signals > 1; } -static const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL }; +const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL }; void exit_program(int ret) { @@ -1103,7 +750,7 @@ void exit_program(int ret) exit(ret); } -static void assert_avoptions(AVDictionary *m) +void assert_avoptions(AVDictionary *m) { AVDictionaryEntry *t; if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) { @@ -1877,7 +1524,7 @@ static void rate_emu_sleep(InputStream *ist) } } -static int guess_input_channel_layout(InputStream *ist) +int guess_input_channel_layout(InputStream *ist) { AVCodecContext *dec = ist->st->codec; @@ -3148,1832 +2795,54 @@ static int transcode(void) return ret; } -static double parse_frame_aspect_ratio(const char *arg) -{ - int x = 0, y = 0; - double ar = 0; - const char *p; - char *end; - - p = strchr(arg, ':'); - if (p) { - x = strtol(arg, &end, 10); - if (end == p) - y = strtol(end + 1, &end, 10); - if (x > 0 && y > 0) - ar = (double)x / (double)y; - } else - ar = strtod(arg, NULL); - - if (!ar) { - av_log(NULL, AV_LOG_FATAL, "Incorrect aspect ratio specification.\n"); - exit_program(1); - } - return ar; -} - -static int opt_audio_codec(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "codec:a", arg, options); -} - -static int opt_video_codec(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "codec:v", arg, options); -} - -static int opt_subtitle_codec(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "codec:s", arg, options); -} - -static int opt_data_codec(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "codec:d", arg, options); -} - -static int opt_map(OptionsContext *o, const char *opt, const char *arg) -{ - StreamMap *m = NULL; - int i, negative = 0, file_idx; - int sync_file_idx = -1, sync_stream_idx; - char *p, *sync; - char *map; - - if (*arg == '-') { - negative = 1; - arg++; - } - map = av_strdup(arg); - - /* parse sync stream first, just pick first matching stream */ - if (sync = strchr(map, ',')) { - *sync = 0; - sync_file_idx = strtol(sync + 1, &sync, 0); - if (sync_file_idx >= nb_input_files || sync_file_idx < 0) { - av_log(NULL, AV_LOG_FATAL, "Invalid sync file index: %d.\n", sync_file_idx); - exit_program(1); - } - if (*sync) - sync++; - for (i = 0; i < input_files[sync_file_idx]->nb_streams; i++) - if (check_stream_specifier(input_files[sync_file_idx]->ctx, - input_files[sync_file_idx]->ctx->streams[i], sync) == 1) { - sync_stream_idx = i; - break; - } - if (i == input_files[sync_file_idx]->nb_streams) { - av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s does not " - "match any streams.\n", arg); - exit_program(1); - } - } - - - if (map[0] == '[') { - /* this mapping refers to lavfi output */ - const char *c = map + 1; - o->stream_maps = grow_array(o->stream_maps, sizeof(*o->stream_maps), - &o->nb_stream_maps, o->nb_stream_maps + 1); - m = &o->stream_maps[o->nb_stream_maps - 1]; - m->linklabel = av_get_token(&c, "]"); - if (!m->linklabel) { - av_log(NULL, AV_LOG_ERROR, "Invalid output link label: %s.\n", map); - exit_program(1); - } - } else { - file_idx = strtol(map, &p, 0); - if (file_idx >= nb_input_files || file_idx < 0) { - av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx); - exit_program(1); - } - if (negative) - /* disable some already defined maps */ - for (i = 0; i < o->nb_stream_maps; i++) { - m = &o->stream_maps[i]; - if (file_idx == m->file_index && - check_stream_specifier(input_files[m->file_index]->ctx, - input_files[m->file_index]->ctx->streams[m->stream_index], - *p == ':' ? p + 1 : p) > 0) - m->disabled = 1; - } - else - for (i = 0; i < input_files[file_idx]->nb_streams; i++) { - if (check_stream_specifier(input_files[file_idx]->ctx, input_files[file_idx]->ctx->streams[i], - *p == ':' ? p + 1 : p) <= 0) - continue; - o->stream_maps = grow_array(o->stream_maps, sizeof(*o->stream_maps), - &o->nb_stream_maps, o->nb_stream_maps + 1); - m = &o->stream_maps[o->nb_stream_maps - 1]; - - m->file_index = file_idx; - m->stream_index = i; - - if (sync_file_idx >= 0) { - m->sync_file_index = sync_file_idx; - m->sync_stream_index = sync_stream_idx; - } else { - m->sync_file_index = file_idx; - m->sync_stream_index = i; - } - } - } - - if (!m) { - av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n", arg); - exit_program(1); - } - - av_freep(&map); - return 0; -} - -static int opt_attach(OptionsContext *o, const char *opt, const char *arg) -{ - o->attachments = grow_array(o->attachments, sizeof(*o->attachments), - &o->nb_attachments, o->nb_attachments + 1); - o->attachments[o->nb_attachments - 1] = arg; - return 0; -} - -/** - * Parse a metadata specifier in arg. - * @param type metadata type is written here -- g(lobal)/s(tream)/c(hapter)/p(rogram) - * @param index for type c/p, chapter/program index is written here - * @param stream_spec for type s, the stream specifier is written here - */ -static void parse_meta_type(char *arg, char *type, int *index, const char **stream_spec) -{ - if (*arg) { - *type = *arg; - switch (*arg) { - case 'g': - break; - case 's': - if (*(++arg) && *arg != ':') { - av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", arg); - exit_program(1); - } - *stream_spec = *arg == ':' ? arg + 1 : ""; - break; - case 'c': - case 'p': - if (*(++arg) == ':') - *index = strtol(++arg, NULL, 0); - break; - default: - av_log(NULL, AV_LOG_FATAL, "Invalid metadata type %c.\n", *arg); - exit_program(1); - } - } else - *type = 'g'; -} - -static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFormatContext *ic, OptionsContext *o) -{ - AVDictionary **meta_in = NULL; - AVDictionary **meta_out; - int i, ret = 0; - char type_in, type_out; - const char *istream_spec = NULL, *ostream_spec = NULL; - int idx_in = 0, idx_out = 0; - - parse_meta_type(inspec, &type_in, &idx_in, &istream_spec); - parse_meta_type(outspec, &type_out, &idx_out, &ostream_spec); - - if (type_in == 'g' || type_out == 'g') - o->metadata_global_manual = 1; - if (type_in == 's' || type_out == 's') - o->metadata_streams_manual = 1; - if (type_in == 'c' || type_out == 'c') - o->metadata_chapters_manual = 1; - -#define METADATA_CHECK_INDEX(index, nb_elems, desc)\ - if ((index) < 0 || (index) >= (nb_elems)) {\ - av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps.\n",\ - (desc), (index));\ - exit_program(1);\ - } - -#define SET_DICT(type, meta, context, index)\ - switch (type) {\ - case 'g':\ - meta = &context->metadata;\ - break;\ - case 'c':\ - METADATA_CHECK_INDEX(index, context->nb_chapters, "chapter")\ - meta = &context->chapters[index]->metadata;\ - break;\ - case 'p':\ - METADATA_CHECK_INDEX(index, context->nb_programs, "program")\ - meta = &context->programs[index]->metadata;\ - break;\ - default: av_assert0(0);\ - }\ - - SET_DICT(type_in, meta_in, ic, idx_in); - SET_DICT(type_out, meta_out, oc, idx_out); - - /* for input streams choose first matching stream */ - if (type_in == 's') { - for (i = 0; i < ic->nb_streams; i++) { - if ((ret = check_stream_specifier(ic, ic->streams[i], istream_spec)) > 0) { - meta_in = &ic->streams[i]->metadata; - break; - } else if (ret < 0) - exit_program(1); - } - if (!meta_in) { - av_log(NULL, AV_LOG_FATAL, "Stream specifier %s does not match any streams.\n", istream_spec); - exit_program(1); - } - } - - if (type_out == 's') { - for (i = 0; i < oc->nb_streams; i++) { - if ((ret = check_stream_specifier(oc, oc->streams[i], ostream_spec)) > 0) { - meta_out = &oc->streams[i]->metadata; - av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE); - } else if (ret < 0) - exit_program(1); - } - } else - av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE); - - return 0; -} - -static AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder) -{ - const char *codec_string = encoder ? "encoder" : "decoder"; - AVCodec *codec; - - codec = encoder ? - avcodec_find_encoder_by_name(name) : - avcodec_find_decoder_by_name(name); - if (!codec) { - av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name); - exit_program(1); - } - if (codec->type != type) { - av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name); - exit_program(1); - } - return codec; -} - -static AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVStream *st) -{ - char *codec_name = NULL; - - MATCH_PER_STREAM_OPT(codec_names, str, codec_name, s, st); - if (codec_name) { - AVCodec *codec = find_codec_or_die(codec_name, st->codec->codec_type, 0); - st->codec->codec_id = codec->id; - return codec; - } else - return avcodec_find_decoder(st->codec->codec_id); -} - -/** - * Add all the streams from the given input file to the global - * list of input streams. - */ -static void add_input_streams(OptionsContext *o, AVFormatContext *ic) -{ - int i; - - for (i = 0; i < ic->nb_streams; i++) { - AVStream *st = ic->streams[i]; - AVCodecContext *dec = st->codec; - InputStream *ist = av_mallocz(sizeof(*ist)); - char *framerate = NULL; - - if (!ist) - exit_program(1); - - input_streams = grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1); - input_streams[nb_input_streams - 1] = ist; - - ist->st = st; - ist->file_index = nb_input_files; - ist->discard = 1; - st->discard = AVDISCARD_ALL; - ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st, NULL); - - ist->ts_scale = 1.0; - MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); - - ist->dec = choose_decoder(o, ic, st); - - switch (dec->codec_type) { - case AVMEDIA_TYPE_VIDEO: - ist->resample_height = dec->height; - ist->resample_width = dec->width; - ist->resample_pix_fmt = dec->pix_fmt; - - MATCH_PER_STREAM_OPT(frame_rates, str, framerate, ic, st); - if (framerate && av_parse_video_rate(&ist->framerate, - framerate) < 0) { - av_log(NULL, AV_LOG_ERROR, "Error parsing framerate %s.\n", - framerate); - exit_program(1); - } - - break; - case AVMEDIA_TYPE_AUDIO: - guess_input_channel_layout(ist); - - ist->resample_sample_fmt = dec->sample_fmt; - ist->resample_sample_rate = dec->sample_rate; - ist->resample_channels = dec->channels; - ist->resample_channel_layout = dec->channel_layout; - - break; - case AVMEDIA_TYPE_DATA: - case AVMEDIA_TYPE_SUBTITLE: - case AVMEDIA_TYPE_ATTACHMENT: - case AVMEDIA_TYPE_UNKNOWN: - break; - default: - abort(); - } - } -} - -static void assert_file_overwrite(const char *filename) -{ - if (!file_overwrite && - (strchr(filename, ':') == NULL || filename[1] == ':' || - av_strstart(filename, "file:", NULL))) { - if (avio_check(filename, 0) == 0) { - if (!using_stdin) { - fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename); - fflush(stderr); - if (!read_yesno()) { - fprintf(stderr, "Not overwriting - exiting\n"); - exit_program(1); - } - } - else { - fprintf(stderr,"File '%s' already exists. Exiting.\n", filename); - exit_program(1); - } - } - } -} - -static void dump_attachment(AVStream *st, const char *filename) +static int64_t getutime(void) { - int ret; - AVIOContext *out = NULL; - AVDictionaryEntry *e; - - if (!st->codec->extradata_size) { - av_log(NULL, AV_LOG_WARNING, "No extradata to dump in stream #%d:%d.\n", - nb_input_files - 1, st->index); - return; - } - if (!*filename && (e = av_dict_get(st->metadata, "filename", NULL, 0))) - filename = e->value; - if (!*filename) { - av_log(NULL, AV_LOG_FATAL, "No filename specified and no 'filename' tag" - "in stream #%d:%d.\n", nb_input_files - 1, st->index); - exit_program(1); - } - - assert_file_overwrite(filename); - - if ((ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, &int_cb, NULL)) < 0) { - av_log(NULL, AV_LOG_FATAL, "Could not open file %s for writing.\n", - filename); - exit_program(1); - } +#if HAVE_GETRUSAGE + struct rusage rusage; - avio_write(out, st->codec->extradata, st->codec->extradata_size); - avio_flush(out); - avio_close(out); + getrusage(RUSAGE_SELF, &rusage); + return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec; +#elif HAVE_GETPROCESSTIMES + HANDLE proc; + FILETIME c, e, k, u; + proc = GetCurrentProcess(); + GetProcessTimes(proc, &c, &e, &k, &u); + return ((int64_t) u.dwHighDateTime << 32 | u.dwLowDateTime) / 10; +#else + return av_gettime(); +#endif } -static int opt_input_file(OptionsContext *o, const char *opt, const char *filename) +static int64_t getmaxrss(void) { - AVFormatContext *ic; - AVInputFormat *file_iformat = NULL; - int err, i, ret; - int64_t timestamp; - uint8_t buf[128]; - AVDictionary **opts; - int orig_nb_streams; // number of streams before avformat_find_stream_info - - if (o->format) { - if (!(file_iformat = av_find_input_format(o->format))) { - av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format); - exit_program(1); - } - } - - if (!strcmp(filename, "-")) - filename = "pipe:"; - - using_stdin |= !strncmp(filename, "pipe:", 5) || - !strcmp(filename, "/dev/stdin"); - - /* get default parameters from command line */ - ic = avformat_alloc_context(); - if (!ic) { - print_error(filename, AVERROR(ENOMEM)); - exit_program(1); - } - if (o->nb_audio_sample_rate) { - snprintf(buf, sizeof(buf), "%d", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i); - av_dict_set(&format_opts, "sample_rate", buf, 0); - } - if (o->nb_audio_channels) { - /* because we set audio_channels based on both the "ac" and - * "channel_layout" options, we need to check that the specified - * demuxer actually has the "channels" option before setting it */ - if (file_iformat && file_iformat->priv_class && - av_opt_find(&file_iformat->priv_class, "channels", NULL, 0, - AV_OPT_SEARCH_FAKE_OBJ)) { - snprintf(buf, sizeof(buf), "%d", - o->audio_channels[o->nb_audio_channels - 1].u.i); - av_dict_set(&format_opts, "channels", buf, 0); - } - } - if (o->nb_frame_rates) { - /* set the format-level framerate option; - * this is important for video grabbers, e.g. x11 */ - if (file_iformat && file_iformat->priv_class && - av_opt_find(&file_iformat->priv_class, "framerate", NULL, 0, - AV_OPT_SEARCH_FAKE_OBJ)) { - av_dict_set(&format_opts, "framerate", - o->frame_rates[o->nb_frame_rates - 1].u.str, 0); - } - } - if (o->nb_frame_sizes) { - av_dict_set(&format_opts, "video_size", o->frame_sizes[o->nb_frame_sizes - 1].u.str, 0); - } - if (o->nb_frame_pix_fmts) - av_dict_set(&format_opts, "pixel_format", o->frame_pix_fmts[o->nb_frame_pix_fmts - 1].u.str, 0); - - ic->flags |= AVFMT_FLAG_NONBLOCK; - ic->interrupt_callback = int_cb; - - /* open the input file with generic libav function */ - err = avformat_open_input(&ic, filename, file_iformat, &format_opts); - if (err < 0) { - print_error(filename, err); - exit_program(1); - } - assert_avoptions(format_opts); - - /* apply forced codec ids */ - for (i = 0; i < ic->nb_streams; i++) - choose_decoder(o, ic, ic->streams[i]); - - /* Set AVCodecContext options for avformat_find_stream_info */ - opts = setup_find_stream_info_opts(ic, codec_opts); - orig_nb_streams = ic->nb_streams; - - /* If not enough info to get the stream parameters, we decode the - first frames to get it. (used in mpeg case for example) */ - ret = avformat_find_stream_info(ic, opts); - if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename); - avformat_close_input(&ic); - exit_program(1); - } - - timestamp = o->start_time; - /* add the stream start time */ - if (ic->start_time != AV_NOPTS_VALUE) - timestamp += ic->start_time; - - /* if seeking requested, we execute it */ - if (o->start_time != 0) { - ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD); - if (ret < 0) { - av_log(NULL, AV_LOG_WARNING, "%s: could not seek to position %0.3f\n", - filename, (double)timestamp / AV_TIME_BASE); - } - } - - /* update the current parameters so that they match the one of the input stream */ - add_input_streams(o, ic); - - /* dump the file content */ - av_dump_format(ic, nb_input_files, filename, 0); - - input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1); - if (!(input_files[nb_input_files - 1] = av_mallocz(sizeof(*input_files[0])))) - exit_program(1); - - input_files[nb_input_files - 1]->ctx = ic; - input_files[nb_input_files - 1]->ist_index = nb_input_streams - ic->nb_streams; - input_files[nb_input_files - 1]->ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp); - input_files[nb_input_files - 1]->nb_streams = ic->nb_streams; - input_files[nb_input_files - 1]->rate_emu = o->rate_emu; - - for (i = 0; i < o->nb_dump_attachment; i++) { - int j; - - for (j = 0; j < ic->nb_streams; j++) { - AVStream *st = ic->streams[j]; - - if (check_stream_specifier(ic, st, o->dump_attachment[i].specifier) == 1) - dump_attachment(st, o->dump_attachment[i].u.str); - } - } - - for (i = 0; i < orig_nb_streams; i++) - av_dict_free(&opts[i]); - av_freep(&opts); - - reset_options(o); +#if HAVE_GETRUSAGE && HAVE_STRUCT_RUSAGE_RU_MAXRSS + struct rusage rusage; + getrusage(RUSAGE_SELF, &rusage); + return (int64_t)rusage.ru_maxrss * 1024; +#elif HAVE_GETPROCESSMEMORYINFO + HANDLE proc; + PROCESS_MEMORY_COUNTERS memcounters; + proc = GetCurrentProcess(); + memcounters.cb = sizeof(memcounters); + GetProcessMemoryInfo(proc, &memcounters, sizeof(memcounters)); + return memcounters.PeakPagefileUsage; +#else return 0; +#endif } -static uint8_t *get_line(AVIOContext *s) +static void parse_cpuflags(int argc, char **argv, const OptionDef *options) { - AVIOContext *line; - uint8_t *buf; - char c; - - if (avio_open_dyn_buf(&line) < 0) { - av_log(NULL, AV_LOG_FATAL, "Could not alloc buffer for reading preset.\n"); - exit_program(1); - } - - while ((c = avio_r8(s)) && c != '\n') - avio_w8(line, c); - avio_w8(line, 0); - avio_close_dyn_buf(line, &buf); - - return buf; + int idx = locate_option(argc, argv, options, "cpuflags"); + if (idx && argv[idx + 1]) + opt_cpuflags("cpuflags", argv[idx + 1]); } -static int get_preset_file_2(const char *preset_name, const char *codec_name, AVIOContext **s) -{ - int i, ret = 1; - char filename[1000]; - const char *base[3] = { getenv("AVCONV_DATADIR"), - getenv("HOME"), - AVCONV_DATADIR, - }; - - for (i = 0; i < FF_ARRAY_ELEMS(base) && ret; i++) { - if (!base[i]) - continue; - if (codec_name) { - snprintf(filename, sizeof(filename), "%s%s/%s-%s.avpreset", base[i], - i != 1 ? "" : "/.avconv", codec_name, preset_name); - ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL); - } - if (ret) { - snprintf(filename, sizeof(filename), "%s%s/%s.avpreset", base[i], - i != 1 ? "" : "/.avconv", preset_name); - ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL); - } - } - return ret; -} - -static void choose_encoder(OptionsContext *o, AVFormatContext *s, OutputStream *ost) -{ - char *codec_name = NULL; - - MATCH_PER_STREAM_OPT(codec_names, str, codec_name, s, ost->st); - if (!codec_name) { - ost->st->codec->codec_id = av_guess_codec(s->oformat, NULL, s->filename, - NULL, ost->st->codec->codec_type); - ost->enc = avcodec_find_encoder(ost->st->codec->codec_id); - } else if (!strcmp(codec_name, "copy")) - ost->stream_copy = 1; - else { - ost->enc = find_codec_or_die(codec_name, ost->st->codec->codec_type, 1); - ost->st->codec->codec_id = ost->enc->id; - } -} - -static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, enum AVMediaType type) -{ - OutputStream *ost; - AVStream *st = avformat_new_stream(oc, NULL); - int idx = oc->nb_streams - 1, ret = 0; - char *bsf = NULL, *next, *codec_tag = NULL; - AVBitStreamFilterContext *bsfc, *bsfc_prev = NULL; - double qscale = -1; - char *buf = NULL, *arg = NULL, *preset = NULL; - AVIOContext *s = NULL; - - if (!st) { - av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n"); - exit_program(1); - } - - if (oc->nb_streams - 1 < o->nb_streamid_map) - st->id = o->streamid_map[oc->nb_streams - 1]; - - output_streams = grow_array(output_streams, sizeof(*output_streams), &nb_output_streams, - nb_output_streams + 1); - if (!(ost = av_mallocz(sizeof(*ost)))) - exit_program(1); - output_streams[nb_output_streams - 1] = ost; - - ost->file_index = nb_output_files; - ost->index = idx; - ost->st = st; - st->codec->codec_type = type; - choose_encoder(o, oc, ost); - if (ost->enc) { - ost->opts = filter_codec_opts(codec_opts, ost->enc->id, oc, st, ost->enc); - } - - avcodec_get_context_defaults3(st->codec, ost->enc); - st->codec->codec_type = type; // XXX hack, avcodec_get_context_defaults2() sets type to unknown for stream copy - - MATCH_PER_STREAM_OPT(presets, str, preset, oc, st); - if (preset && (!(ret = get_preset_file_2(preset, ost->enc->name, &s)))) { - do { - buf = get_line(s); - if (!buf[0] || buf[0] == '#') { - av_free(buf); - continue; - } - if (!(arg = strchr(buf, '='))) { - av_log(NULL, AV_LOG_FATAL, "Invalid line found in the preset file.\n"); - exit_program(1); - } - *arg++ = 0; - av_dict_set(&ost->opts, buf, arg, AV_DICT_DONT_OVERWRITE); - av_free(buf); - } while (!s->eof_reached); - avio_close(s); - } - if (ret) { - av_log(NULL, AV_LOG_FATAL, - "Preset %s specified for stream %d:%d, but could not be opened.\n", - preset, ost->file_index, ost->index); - exit_program(1); - } - - ost->max_frames = INT64_MAX; - MATCH_PER_STREAM_OPT(max_frames, i64, ost->max_frames, oc, st); - - MATCH_PER_STREAM_OPT(bitstream_filters, str, bsf, oc, st); - while (bsf) { - if (next = strchr(bsf, ',')) - *next++ = 0; - if (!(bsfc = av_bitstream_filter_init(bsf))) { - av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf); - exit_program(1); - } - if (bsfc_prev) - bsfc_prev->next = bsfc; - else - ost->bitstream_filters = bsfc; - - bsfc_prev = bsfc; - bsf = next; - } - - MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, oc, st); - if (codec_tag) { - uint32_t tag = strtol(codec_tag, &next, 0); - if (*next) - tag = AV_RL32(codec_tag); - st->codec->codec_tag = tag; - } - - MATCH_PER_STREAM_OPT(qscale, dbl, qscale, oc, st); - if (qscale >= 0 || same_quant) { - st->codec->flags |= CODEC_FLAG_QSCALE; - st->codec->global_quality = FF_QP2LAMBDA * qscale; - } - - if (oc->oformat->flags & AVFMT_GLOBALHEADER) - st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER; - - av_opt_get_int(sws_opts, "sws_flags", 0, &ost->sws_flags); - - ost->pix_fmts[0] = ost->pix_fmts[1] = PIX_FMT_NONE; - - return ost; -} - -static void parse_matrix_coeffs(uint16_t *dest, const char *str) -{ - int i; - const char *p = str; - for (i = 0;; i++) { - dest[i] = atoi(p); - if (i == 63) - break; - p = strchr(p, ','); - if (!p) { - av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i); - exit_program(1); - } - p++; - } -} - -static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) -{ - AVStream *st; - OutputStream *ost; - AVCodecContext *video_enc; - - ost = new_output_stream(o, oc, AVMEDIA_TYPE_VIDEO); - st = ost->st; - video_enc = st->codec; - - if (!ost->stream_copy) { - const char *p = NULL; - char *frame_rate = NULL, *frame_size = NULL; - char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL; - char *intra_matrix = NULL, *inter_matrix = NULL; - const char *filters = "null"; - int i; - - MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st); - if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) { - av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate); - exit_program(1); - } - - MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st); - if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) { - av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size); - exit_program(1); - } - - MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st); - if (frame_aspect_ratio) - ost->frame_aspect_ratio = parse_frame_aspect_ratio(frame_aspect_ratio); - - MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st); - if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == PIX_FMT_NONE) { - av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt); - exit_program(1); - } - st->sample_aspect_ratio = video_enc->sample_aspect_ratio; - - MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st); - if (intra_matrix) { - if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) { - av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n"); - exit_program(1); - } - parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix); - } - MATCH_PER_STREAM_OPT(inter_matrices, str, inter_matrix, oc, st); - if (inter_matrix) { - if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) { - av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for inter matrix.\n"); - exit_program(1); - } - parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix); - } - - MATCH_PER_STREAM_OPT(rc_overrides, str, p, oc, st); - for (i = 0; p; i++) { - int start, end, q; - int e = sscanf(p, "%d,%d,%d", &start, &end, &q); - if (e != 3) { - av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n"); - exit_program(1); - } - video_enc->rc_override = - av_realloc(video_enc->rc_override, - sizeof(RcOverride) * (i + 1)); - video_enc->rc_override[i].start_frame = start; - video_enc->rc_override[i].end_frame = end; - if (q > 0) { - video_enc->rc_override[i].qscale = q; - video_enc->rc_override[i].quality_factor = 1.0; - } - else { - video_enc->rc_override[i].qscale = 0; - video_enc->rc_override[i].quality_factor = -q/100.0; - } - p = strchr(p, '/'); - if (p) p++; - } - video_enc->rc_override_count = i; - if (!video_enc->rc_initial_buffer_occupancy) - video_enc->rc_initial_buffer_occupancy = video_enc->rc_buffer_size * 3 / 4; - video_enc->intra_dc_precision = intra_dc_precision - 8; - - /* two pass mode */ - if (do_pass) { - if (do_pass == 1) { - video_enc->flags |= CODEC_FLAG_PASS1; - } else { - video_enc->flags |= CODEC_FLAG_PASS2; - } - } - - MATCH_PER_STREAM_OPT(forced_key_frames, str, ost->forced_keyframes, oc, st); - if (ost->forced_keyframes) - ost->forced_keyframes = av_strdup(ost->forced_keyframes); - - MATCH_PER_STREAM_OPT(force_fps, i, ost->force_fps, oc, st); - - ost->top_field_first = -1; - MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, st); - - MATCH_PER_STREAM_OPT(filters, str, filters, oc, st); - ost->avfilter = av_strdup(filters); - } else { - MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st); - } - - return ost; -} - -static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc) -{ - AVStream *st; - OutputStream *ost; - AVCodecContext *audio_enc; - - ost = new_output_stream(o, oc, AVMEDIA_TYPE_AUDIO); - st = ost->st; - - audio_enc = st->codec; - audio_enc->codec_type = AVMEDIA_TYPE_AUDIO; - - if (!ost->stream_copy) { - char *sample_fmt = NULL; - const char *filters = "anull"; - - MATCH_PER_STREAM_OPT(audio_channels, i, audio_enc->channels, oc, st); - - MATCH_PER_STREAM_OPT(sample_fmts, str, sample_fmt, oc, st); - if (sample_fmt && - (audio_enc->sample_fmt = av_get_sample_fmt(sample_fmt)) == AV_SAMPLE_FMT_NONE) { - av_log(NULL, AV_LOG_FATAL, "Invalid sample format '%s'\n", sample_fmt); - exit_program(1); - } - - MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st); - - MATCH_PER_STREAM_OPT(filters, str, filters, oc, st); - ost->avfilter = av_strdup(filters); - } - - return ost; -} - -static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc) -{ - OutputStream *ost; - - ost = new_output_stream(o, oc, AVMEDIA_TYPE_DATA); - if (!ost->stream_copy) { - av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n"); - exit_program(1); - } - - return ost; -} - -static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *oc) -{ - OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT); - ost->stream_copy = 1; - return ost; -} - -static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc) -{ - AVStream *st; - OutputStream *ost; - AVCodecContext *subtitle_enc; - - ost = new_output_stream(o, oc, AVMEDIA_TYPE_SUBTITLE); - st = ost->st; - subtitle_enc = st->codec; - - subtitle_enc->codec_type = AVMEDIA_TYPE_SUBTITLE; - - return ost; -} - -/* arg format is "output-stream-index:streamid-value". */ -static int opt_streamid(OptionsContext *o, const char *opt, const char *arg) -{ - int idx; - char *p; - char idx_str[16]; - - av_strlcpy(idx_str, arg, sizeof(idx_str)); - p = strchr(idx_str, ':'); - if (!p) { - av_log(NULL, AV_LOG_FATAL, - "Invalid value '%s' for option '%s', required syntax is 'index:value'\n", - arg, opt); - exit_program(1); - } - *p++ = '\0'; - idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, INT_MAX); - o->streamid_map = grow_array(o->streamid_map, sizeof(*o->streamid_map), &o->nb_streamid_map, idx+1); - o->streamid_map[idx] = parse_number_or_die(opt, p, OPT_INT, 0, INT_MAX); - return 0; -} - -static int copy_chapters(InputFile *ifile, OutputFile *ofile, int copy_metadata) -{ - AVFormatContext *is = ifile->ctx; - AVFormatContext *os = ofile->ctx; - int i; - - for (i = 0; i < is->nb_chapters; i++) { - AVChapter *in_ch = is->chapters[i], *out_ch; - int64_t ts_off = av_rescale_q(ofile->start_time - ifile->ts_offset, - AV_TIME_BASE_Q, in_ch->time_base); - int64_t rt = (ofile->recording_time == INT64_MAX) ? INT64_MAX : - av_rescale_q(ofile->recording_time, AV_TIME_BASE_Q, in_ch->time_base); - - - if (in_ch->end < ts_off) - continue; - if (rt != INT64_MAX && in_ch->start > rt + ts_off) - break; - - out_ch = av_mallocz(sizeof(AVChapter)); - if (!out_ch) - return AVERROR(ENOMEM); - - out_ch->id = in_ch->id; - out_ch->time_base = in_ch->time_base; - out_ch->start = FFMAX(0, in_ch->start - ts_off); - out_ch->end = FFMIN(rt, in_ch->end - ts_off); - - if (copy_metadata) - av_dict_copy(&out_ch->metadata, in_ch->metadata, 0); - - os->nb_chapters++; - os->chapters = av_realloc(os->chapters, sizeof(AVChapter) * os->nb_chapters); - if (!os->chapters) - return AVERROR(ENOMEM); - os->chapters[os->nb_chapters - 1] = out_ch; - } - return 0; -} - -static void init_output_filter(OutputFilter *ofilter, OptionsContext *o, - AVFormatContext *oc) -{ - OutputStream *ost; - - switch (avfilter_pad_get_type(ofilter->out_tmp->filter_ctx->output_pads, - ofilter->out_tmp->pad_idx)) { - case AVMEDIA_TYPE_VIDEO: ost = new_video_stream(o, oc); break; - case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream(o, oc); break; - default: - av_log(NULL, AV_LOG_FATAL, "Only video and audio filters are supported " - "currently.\n"); - exit_program(1); - } - - ost->source_index = -1; - ost->filter = ofilter; - - ofilter->ost = ost; - - if (ost->stream_copy) { - av_log(NULL, AV_LOG_ERROR, "Streamcopy requested for output stream %d:%d, " - "which is fed from a complex filtergraph. Filtering and streamcopy " - "cannot be used together.\n", ost->file_index, ost->index); - exit_program(1); - } - - if (configure_output_filter(ofilter->graph, ofilter, ofilter->out_tmp) < 0) { - av_log(NULL, AV_LOG_FATAL, "Error configuring filter.\n"); - exit_program(1); - } - avfilter_inout_free(&ofilter->out_tmp); -} - -static void opt_output_file(void *optctx, const char *filename) -{ - OptionsContext *o = optctx; - AVFormatContext *oc; - int i, j, err; - AVOutputFormat *file_oformat; - OutputStream *ost; - InputStream *ist; - - if (configure_complex_filters() < 0) { - av_log(NULL, AV_LOG_FATAL, "Error configuring filters.\n"); - exit_program(1); - } - - if (!strcmp(filename, "-")) - filename = "pipe:"; - - oc = avformat_alloc_context(); - if (!oc) { - print_error(filename, AVERROR(ENOMEM)); - exit_program(1); - } - - if (o->format) { - file_oformat = av_guess_format(o->format, NULL, NULL); - if (!file_oformat) { - av_log(NULL, AV_LOG_FATAL, "Requested output format '%s' is not a suitable output format\n", o->format); - exit_program(1); - } - } else { - file_oformat = av_guess_format(NULL, filename, NULL); - if (!file_oformat) { - av_log(NULL, AV_LOG_FATAL, "Unable to find a suitable output format for '%s'\n", - filename); - exit_program(1); - } - } - - oc->oformat = file_oformat; - oc->interrupt_callback = int_cb; - av_strlcpy(oc->filename, filename, sizeof(oc->filename)); - - /* create streams for all unlabeled output pads */ - for (i = 0; i < nb_filtergraphs; i++) { - FilterGraph *fg = filtergraphs[i]; - for (j = 0; j < fg->nb_outputs; j++) { - OutputFilter *ofilter = fg->outputs[j]; - - if (!ofilter->out_tmp || ofilter->out_tmp->name) - continue; - - switch (avfilter_pad_get_type(ofilter->out_tmp->filter_ctx->output_pads, - ofilter->out_tmp->pad_idx)) { - case AVMEDIA_TYPE_VIDEO: o->video_disable = 1; break; - case AVMEDIA_TYPE_AUDIO: o->audio_disable = 1; break; - case AVMEDIA_TYPE_SUBTITLE: o->subtitle_disable = 1; break; - } - init_output_filter(ofilter, o, oc); - } - } - - if (!o->nb_stream_maps) { - /* pick the "best" stream of each type */ -#define NEW_STREAM(type, index)\ - if (index >= 0) {\ - ost = new_ ## type ## _stream(o, oc);\ - ost->source_index = index;\ - ost->sync_ist = input_streams[index];\ - input_streams[index]->discard = 0;\ - input_streams[index]->st->discard = AVDISCARD_NONE;\ - } - - /* video: highest resolution */ - if (!o->video_disable && oc->oformat->video_codec != AV_CODEC_ID_NONE) { - int area = 0, idx = -1; - for (i = 0; i < nb_input_streams; i++) { - ist = input_streams[i]; - if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && - ist->st->codec->width * ist->st->codec->height > area) { - area = ist->st->codec->width * ist->st->codec->height; - idx = i; - } - } - NEW_STREAM(video, idx); - } - - /* audio: most channels */ - if (!o->audio_disable && oc->oformat->audio_codec != AV_CODEC_ID_NONE) { - int channels = 0, idx = -1; - for (i = 0; i < nb_input_streams; i++) { - ist = input_streams[i]; - if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO && - ist->st->codec->channels > channels) { - channels = ist->st->codec->channels; - idx = i; - } - } - NEW_STREAM(audio, idx); - } - - /* subtitles: pick first */ - if (!o->subtitle_disable && oc->oformat->subtitle_codec != AV_CODEC_ID_NONE) { - for (i = 0; i < nb_input_streams; i++) - if (input_streams[i]->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { - NEW_STREAM(subtitle, i); - break; - } - } - /* do something with data? */ - } else { - for (i = 0; i < o->nb_stream_maps; i++) { - StreamMap *map = &o->stream_maps[i]; - - if (map->disabled) - continue; - - if (map->linklabel) { - FilterGraph *fg; - OutputFilter *ofilter = NULL; - int j, k; - - for (j = 0; j < nb_filtergraphs; j++) { - fg = filtergraphs[j]; - for (k = 0; k < fg->nb_outputs; k++) { - AVFilterInOut *out = fg->outputs[k]->out_tmp; - if (out && !strcmp(out->name, map->linklabel)) { - ofilter = fg->outputs[k]; - goto loop_end; - } - } - } -loop_end: - if (!ofilter) { - av_log(NULL, AV_LOG_FATAL, "Output with label '%s' does not exist " - "in any defined filter graph.\n", map->linklabel); - exit_program(1); - } - init_output_filter(ofilter, o, oc); - } else { - ist = input_streams[input_files[map->file_index]->ist_index + map->stream_index]; - switch (ist->st->codec->codec_type) { - case AVMEDIA_TYPE_VIDEO: ost = new_video_stream(o, oc); break; - case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream(o, oc); break; - case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream(o, oc); break; - case AVMEDIA_TYPE_DATA: ost = new_data_stream(o, oc); break; - case AVMEDIA_TYPE_ATTACHMENT: ost = new_attachment_stream(o, oc); break; - default: - av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d:%d - unsupported type.\n", - map->file_index, map->stream_index); - exit_program(1); - } - - ost->source_index = input_files[map->file_index]->ist_index + map->stream_index; - ost->sync_ist = input_streams[input_files[map->sync_file_index]->ist_index + - map->sync_stream_index]; - ist->discard = 0; - ist->st->discard = AVDISCARD_NONE; - } - } - } - - /* handle attached files */ - for (i = 0; i < o->nb_attachments; i++) { - AVIOContext *pb; - uint8_t *attachment; - const char *p; - int64_t len; - - if ((err = avio_open2(&pb, o->attachments[i], AVIO_FLAG_READ, &int_cb, NULL)) < 0) { - av_log(NULL, AV_LOG_FATAL, "Could not open attachment file %s.\n", - o->attachments[i]); - exit_program(1); - } - if ((len = avio_size(pb)) <= 0) { - av_log(NULL, AV_LOG_FATAL, "Could not get size of the attachment %s.\n", - o->attachments[i]); - exit_program(1); - } - if (!(attachment = av_malloc(len))) { - av_log(NULL, AV_LOG_FATAL, "Attachment %s too large to fit into memory.\n", - o->attachments[i]); - exit_program(1); - } - avio_read(pb, attachment, len); - - ost = new_attachment_stream(o, oc); - ost->stream_copy = 0; - ost->source_index = -1; - ost->attachment_filename = o->attachments[i]; - ost->st->codec->extradata = attachment; - ost->st->codec->extradata_size = len; - - p = strrchr(o->attachments[i], '/'); - av_dict_set(&ost->st->metadata, "filename", (p && *p) ? p + 1 : o->attachments[i], AV_DICT_DONT_OVERWRITE); - avio_close(pb); - } - - output_files = grow_array(output_files, sizeof(*output_files), &nb_output_files, nb_output_files + 1); - if (!(output_files[nb_output_files - 1] = av_mallocz(sizeof(*output_files[0])))) - exit_program(1); - - output_files[nb_output_files - 1]->ctx = oc; - output_files[nb_output_files - 1]->ost_index = nb_output_streams - oc->nb_streams; - output_files[nb_output_files - 1]->recording_time = o->recording_time; - if (o->recording_time != INT64_MAX) - oc->duration = o->recording_time; - output_files[nb_output_files - 1]->start_time = o->start_time; - output_files[nb_output_files - 1]->limit_filesize = o->limit_filesize; - av_dict_copy(&output_files[nb_output_files - 1]->opts, format_opts, 0); - - /* check filename in case of an image number is expected */ - if (oc->oformat->flags & AVFMT_NEEDNUMBER) { - if (!av_filename_number_test(oc->filename)) { - print_error(oc->filename, AVERROR(EINVAL)); - exit_program(1); - } - } - - if (!(oc->oformat->flags & AVFMT_NOFILE)) { - /* test if it already exists to avoid losing precious files */ - assert_file_overwrite(filename); - - /* open the file */ - if ((err = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE, - &oc->interrupt_callback, - &output_files[nb_output_files - 1]->opts)) < 0) { - print_error(filename, err); - exit_program(1); - } - } - - if (o->mux_preload) { - uint8_t buf[64]; - snprintf(buf, sizeof(buf), "%d", (int)(o->mux_preload*AV_TIME_BASE)); - av_dict_set(&output_files[nb_output_files - 1]->opts, "preload", buf, 0); - } - oc->max_delay = (int)(o->mux_max_delay * AV_TIME_BASE); - oc->flags |= AVFMT_FLAG_NONBLOCK; - - /* copy metadata */ - for (i = 0; i < o->nb_metadata_map; i++) { - char *p; - int in_file_index = strtol(o->metadata_map[i].u.str, &p, 0); - - if (in_file_index < 0) - continue; - if (in_file_index >= nb_input_files) { - av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d while processing metadata maps\n", in_file_index); - exit_program(1); - } - copy_metadata(o->metadata_map[i].specifier, *p ? p + 1 : p, oc, input_files[in_file_index]->ctx, o); - } - - /* copy chapters */ - if (o->chapters_input_file >= nb_input_files) { - if (o->chapters_input_file == INT_MAX) { - /* copy chapters from the first input file that has them*/ - o->chapters_input_file = -1; - for (i = 0; i < nb_input_files; i++) - if (input_files[i]->ctx->nb_chapters) { - o->chapters_input_file = i; - break; - } - } else { - av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n", - o->chapters_input_file); - exit_program(1); - } - } - if (o->chapters_input_file >= 0) - copy_chapters(input_files[o->chapters_input_file], output_files[nb_output_files - 1], - !o->metadata_chapters_manual); - - /* copy global metadata by default */ - if (!o->metadata_global_manual && nb_input_files) - av_dict_copy(&oc->metadata, input_files[0]->ctx->metadata, - AV_DICT_DONT_OVERWRITE); - if (!o->metadata_streams_manual) - for (i = output_files[nb_output_files - 1]->ost_index; i < nb_output_streams; i++) { - InputStream *ist; - if (output_streams[i]->source_index < 0) /* this is true e.g. for attached files */ - continue; - ist = input_streams[output_streams[i]->source_index]; - av_dict_copy(&output_streams[i]->st->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE); - } - - /* process manually set metadata */ - for (i = 0; i < o->nb_metadata; i++) { - AVDictionary **m; - char type, *val; - const char *stream_spec; - int index = 0, j, ret; - - val = strchr(o->metadata[i].u.str, '='); - if (!val) { - av_log(NULL, AV_LOG_FATAL, "No '=' character in metadata string %s.\n", - o->metadata[i].u.str); - exit_program(1); - } - *val++ = 0; - - parse_meta_type(o->metadata[i].specifier, &type, &index, &stream_spec); - if (type == 's') { - for (j = 0; j < oc->nb_streams; j++) { - if ((ret = check_stream_specifier(oc, oc->streams[j], stream_spec)) > 0) { - av_dict_set(&oc->streams[j]->metadata, o->metadata[i].u.str, *val ? val : NULL, 0); - } else if (ret < 0) - exit_program(1); - } - } - else { - switch (type) { - case 'g': - m = &oc->metadata; - break; - case 'c': - if (index < 0 || index >= oc->nb_chapters) { - av_log(NULL, AV_LOG_FATAL, "Invalid chapter index %d in metadata specifier.\n", index); - exit_program(1); - } - m = &oc->chapters[index]->metadata; - break; - default: - av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", o->metadata[i].specifier); - exit_program(1); - } - av_dict_set(m, o->metadata[i].u.str, *val ? val : NULL, 0); - } - } - - reset_options(o); -} - -/* same option as mencoder */ -static int opt_pass(const char *opt, const char *arg) -{ - do_pass = parse_number_or_die(opt, arg, OPT_INT, 1, 2); - return 0; -} - -static int64_t getutime(void) -{ -#if HAVE_GETRUSAGE - struct rusage rusage; - - getrusage(RUSAGE_SELF, &rusage); - return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec; -#elif HAVE_GETPROCESSTIMES - HANDLE proc; - FILETIME c, e, k, u; - proc = GetCurrentProcess(); - GetProcessTimes(proc, &c, &e, &k, &u); - return ((int64_t) u.dwHighDateTime << 32 | u.dwLowDateTime) / 10; -#else - return av_gettime(); -#endif -} - -static int64_t getmaxrss(void) -{ -#if HAVE_GETRUSAGE && HAVE_STRUCT_RUSAGE_RU_MAXRSS - struct rusage rusage; - getrusage(RUSAGE_SELF, &rusage); - return (int64_t)rusage.ru_maxrss * 1024; -#elif HAVE_GETPROCESSMEMORYINFO - HANDLE proc; - PROCESS_MEMORY_COUNTERS memcounters; - proc = GetCurrentProcess(); - memcounters.cb = sizeof(memcounters); - GetProcessMemoryInfo(proc, &memcounters, sizeof(memcounters)); - return memcounters.PeakPagefileUsage; -#else - return 0; -#endif -} - -static int opt_audio_qscale(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "q:a", arg, options); -} - -static void show_usage(void) -{ - printf("Hyper fast Audio and Video encoder\n"); - printf("usage: %s [options] [[infile options] -i infile]... {[outfile options] outfile}...\n", program_name); - printf("\n"); -} - -static void show_help(void) -{ - int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM; - av_log_set_callback(log_callback_help); - show_usage(); - show_help_options(options, "Main options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB, 0); - show_help_options(options, "\nAdvanced options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB, - OPT_EXPERT); - show_help_options(options, "\nVideo options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, - OPT_VIDEO); - show_help_options(options, "\nAdvanced Video options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, - OPT_VIDEO | OPT_EXPERT); - show_help_options(options, "\nAudio options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, - OPT_AUDIO); - show_help_options(options, "\nAdvanced Audio options:\n", - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, - OPT_AUDIO | OPT_EXPERT); - show_help_options(options, "\nSubtitle options:\n", - OPT_SUBTITLE | OPT_GRAB, - OPT_SUBTITLE); - show_help_options(options, "\nAudio/Video grab options:\n", - OPT_GRAB, - OPT_GRAB); - printf("\n"); - show_help_children(avcodec_get_class(), flags); - show_help_children(avformat_get_class(), flags); - show_help_children(sws_get_class(), flags); -} - -static int opt_target(OptionsContext *o, const char *opt, const char *arg) -{ - enum { PAL, NTSC, FILM, UNKNOWN } norm = UNKNOWN; - static const char *const frame_rates[] = { "25", "30000/1001", "24000/1001" }; - - if (!strncmp(arg, "pal-", 4)) { - norm = PAL; - arg += 4; - } else if (!strncmp(arg, "ntsc-", 5)) { - norm = NTSC; - arg += 5; - } else if (!strncmp(arg, "film-", 5)) { - norm = FILM; - arg += 5; - } else { - /* Try to determine PAL/NTSC by peeking in the input files */ - if (nb_input_files) { - int i, j, fr; - for (j = 0; j < nb_input_files; j++) { - for (i = 0; i < input_files[j]->nb_streams; i++) { - AVCodecContext *c = input_files[j]->ctx->streams[i]->codec; - if (c->codec_type != AVMEDIA_TYPE_VIDEO) - continue; - fr = c->time_base.den * 1000 / c->time_base.num; - if (fr == 25000) { - norm = PAL; - break; - } else if ((fr == 29970) || (fr == 23976)) { - norm = NTSC; - break; - } - } - if (norm != UNKNOWN) - break; - } - } - if (norm != UNKNOWN) - av_log(NULL, AV_LOG_INFO, "Assuming %s for target.\n", norm == PAL ? "PAL" : "NTSC"); - } - - if (norm == UNKNOWN) { - av_log(NULL, AV_LOG_FATAL, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n"); - av_log(NULL, AV_LOG_FATAL, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n"); - av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n"); - exit_program(1); - } - - if (!strcmp(arg, "vcd")) { - opt_video_codec(o, "c:v", "mpeg1video"); - opt_audio_codec(o, "c:a", "mp2"); - parse_option(o, "f", "vcd", options); - - parse_option(o, "s", norm == PAL ? "352x288" : "352x240", options); - parse_option(o, "r", frame_rates[norm], options); - opt_default("g", norm == PAL ? "15" : "18"); - - opt_default("b", "1150000"); - opt_default("maxrate", "1150000"); - opt_default("minrate", "1150000"); - opt_default("bufsize", "327680"); // 40*1024*8; - - opt_default("b:a", "224000"); - parse_option(o, "ar", "44100", options); - parse_option(o, "ac", "2", options); - - opt_default("packetsize", "2324"); - opt_default("muxrate", "1411200"); // 2352 * 75 * 8; - - /* We have to offset the PTS, so that it is consistent with the SCR. - SCR starts at 36000, but the first two packs contain only padding - and the first pack from the other stream, respectively, may also have - been written before. - So the real data starts at SCR 36000+3*1200. */ - o->mux_preload = (36000 + 3 * 1200) / 90000.0; // 0.44 - } else if (!strcmp(arg, "svcd")) { - - opt_video_codec(o, "c:v", "mpeg2video"); - opt_audio_codec(o, "c:a", "mp2"); - parse_option(o, "f", "svcd", options); - - parse_option(o, "s", norm == PAL ? "480x576" : "480x480", options); - parse_option(o, "r", frame_rates[norm], options); - opt_default("g", norm == PAL ? "15" : "18"); - - opt_default("b", "2040000"); - opt_default("maxrate", "2516000"); - opt_default("minrate", "0"); // 1145000; - opt_default("bufsize", "1835008"); // 224*1024*8; - opt_default("flags", "+scan_offset"); - - - opt_default("b:a", "224000"); - parse_option(o, "ar", "44100", options); - - opt_default("packetsize", "2324"); - - } else if (!strcmp(arg, "dvd")) { - - opt_video_codec(o, "c:v", "mpeg2video"); - opt_audio_codec(o, "c:a", "ac3"); - parse_option(o, "f", "dvd", options); - - parse_option(o, "s", norm == PAL ? "720x576" : "720x480", options); - parse_option(o, "r", frame_rates[norm], options); - opt_default("g", norm == PAL ? "15" : "18"); - - opt_default("b", "6000000"); - opt_default("maxrate", "9000000"); - opt_default("minrate", "0"); // 1500000; - opt_default("bufsize", "1835008"); // 224*1024*8; - - opt_default("packetsize", "2048"); // from www.mpucoder.com: DVD sectors contain 2048 bytes of data, this is also the size of one pack. - opt_default("muxrate", "10080000"); // from mplex project: data_rate = 1260000. mux_rate = data_rate * 8 - - opt_default("b:a", "448000"); - parse_option(o, "ar", "48000", options); - - } else if (!strncmp(arg, "dv", 2)) { - - parse_option(o, "f", "dv", options); - - parse_option(o, "s", norm == PAL ? "720x576" : "720x480", options); - parse_option(o, "pix_fmt", !strncmp(arg, "dv50", 4) ? "yuv422p" : - norm == PAL ? "yuv420p" : "yuv411p", options); - parse_option(o, "r", frame_rates[norm], options); - - parse_option(o, "ar", "48000", options); - parse_option(o, "ac", "2", options); - - } else { - av_log(NULL, AV_LOG_ERROR, "Unknown target: %s\n", arg); - return AVERROR(EINVAL); - } - return 0; -} - -static int opt_vstats_file(const char *opt, const char *arg) -{ - av_free (vstats_filename); - vstats_filename = av_strdup (arg); - return 0; -} - -static int opt_vstats(const char *opt, const char *arg) -{ - char filename[40]; - time_t today2 = time(NULL); - struct tm *today = localtime(&today2); - - snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, today->tm_min, - today->tm_sec); - return opt_vstats_file(opt, filename); -} - -static int opt_video_frames(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "frames:v", arg, options); -} - -static int opt_audio_frames(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "frames:a", arg, options); -} - -static int opt_data_frames(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "frames:d", arg, options); -} - -static int opt_video_tag(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "tag:v", arg, options); -} - -static int opt_audio_tag(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "tag:a", arg, options); -} - -static int opt_subtitle_tag(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "tag:s", arg, options); -} - -static int opt_video_filters(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "filter:v", arg, options); -} - -static int opt_audio_filters(OptionsContext *o, const char *opt, const char *arg) -{ - return parse_option(o, "filter:a", arg, options); -} - -static int opt_vsync(const char *opt, const char *arg) -{ - if (!av_strcasecmp(arg, "cfr")) video_sync_method = VSYNC_CFR; - else if (!av_strcasecmp(arg, "vfr")) video_sync_method = VSYNC_VFR; - else if (!av_strcasecmp(arg, "passthrough")) video_sync_method = VSYNC_PASSTHROUGH; - - if (video_sync_method == VSYNC_AUTO) - video_sync_method = parse_number_or_die("vsync", arg, OPT_INT, VSYNC_AUTO, VSYNC_VFR); - return 0; -} - -static int opt_deinterlace(const char *opt, const char *arg) -{ - av_log(NULL, AV_LOG_WARNING, "-%s is deprecated, use -filter:v yadif instead\n", opt); - do_deinterlace = 1; - return 0; -} - -static int opt_cpuflags(const char *opt, const char *arg) -{ - int flags = av_parse_cpu_flags(arg); - - if (flags < 0) - return flags; - - av_set_cpu_flags_mask(flags); - return 0; -} - -static void parse_cpuflags(int argc, char **argv, const OptionDef *options) -{ - int idx = locate_option(argc, argv, options, "cpuflags"); - if (idx && argv[idx + 1]) - opt_cpuflags("cpuflags", argv[idx + 1]); -} - -static int opt_channel_layout(OptionsContext *o, const char *opt, const char *arg) -{ - char layout_str[32]; - char *stream_str; - char *ac_str; - int ret, channels, ac_str_size; - uint64_t layout; - - layout = av_get_channel_layout(arg); - if (!layout) { - av_log(NULL, AV_LOG_ERROR, "Unknown channel layout: %s\n", arg); - return AVERROR(EINVAL); - } - snprintf(layout_str, sizeof(layout_str), "%"PRIu64, layout); - ret = opt_default(opt, layout_str); - if (ret < 0) - return ret; - - /* set 'ac' option based on channel layout */ - channels = av_get_channel_layout_nb_channels(layout); - snprintf(layout_str, sizeof(layout_str), "%d", channels); - stream_str = strchr(opt, ':'); - ac_str_size = 3 + (stream_str ? strlen(stream_str) : 0); - ac_str = av_mallocz(ac_str_size); - if (!ac_str) - return AVERROR(ENOMEM); - av_strlcpy(ac_str, "ac", 3); - if (stream_str) - av_strlcat(ac_str, stream_str, ac_str_size); - ret = parse_option(o, ac_str, layout_str, options); - av_free(ac_str); - - return ret; -} - -static int opt_filter_complex(const char *opt, const char *arg) -{ - filtergraphs = grow_array(filtergraphs, sizeof(*filtergraphs), - &nb_filtergraphs, nb_filtergraphs + 1); - if (!(filtergraphs[nb_filtergraphs - 1] = av_mallocz(sizeof(*filtergraphs[0])))) - return AVERROR(ENOMEM); - filtergraphs[nb_filtergraphs - 1]->index = nb_filtergraphs - 1; - filtergraphs[nb_filtergraphs - 1]->graph_desc = arg; - return 0; -} - -#define OFFSET(x) offsetof(OptionsContext, x) -static const OptionDef real_options[] = { - /* main options */ -#include "cmdutils_common_opts.h" - { "f", HAS_ARG | OPT_STRING | OPT_OFFSET, {.off = OFFSET(format)}, "force format", "fmt" }, - { "i", HAS_ARG | OPT_FUNC2, {(void*)opt_input_file}, "input file name", "filename" }, - { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" }, - { "c", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(codec_names)}, "codec name", "codec" }, - { "codec", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(codec_names)}, "codec name", "codec" }, - { "pre", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(presets)}, "preset name", "preset" }, - { "map", HAS_ARG | OPT_EXPERT | OPT_FUNC2, {(void*)opt_map}, "set input stream mapping", "[-]input_file_id[:stream_specifier][,sync_file_id[:stream_specifier]]" }, - { "map_metadata", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(metadata_map)}, "set metadata information of outfile from infile", - "outfile[,metadata]:infile[,metadata]" }, - { "map_chapters", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(chapters_input_file)}, "set chapters mapping", "input_file_index" }, - { "t", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(recording_time)}, "record or transcode \"duration\" seconds of audio/video", "duration" }, - { "fs", HAS_ARG | OPT_INT64 | OPT_OFFSET, {.off = OFFSET(limit_filesize)}, "set the limit file size in bytes", "limit_size" }, // - { "ss", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(start_time)}, "set the start time offset", "time_off" }, - { "itsoffset", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(input_ts_offset)}, "set the input ts offset", "time_off" }, - { "itsscale", HAS_ARG | OPT_DOUBLE | OPT_SPEC, {.off = OFFSET(ts_scale)}, "set the input ts scale", "scale" }, - { "metadata", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(metadata)}, "add metadata", "string=string" }, - { "dframes", HAS_ARG | OPT_FUNC2, {(void*)opt_data_frames}, "set the number of data frames to record", "number" }, - { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark}, - "add timings for benchmarking" }, - { "timelimit", HAS_ARG, {(void*)opt_timelimit}, "set max runtime in seconds", "limit" }, - { "dump", OPT_BOOL | OPT_EXPERT, {(void*)&do_pkt_dump}, - "dump each input packet" }, - { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, - "when dumping packets, also dump the payload" }, - { "re", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(rate_emu)}, "read input at native frame rate", "" }, - { "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" }, - { "vsync", HAS_ARG | OPT_EXPERT, {(void*)opt_vsync}, "video sync method", "" }, - { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" }, - { "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&audio_drift_threshold}, "audio drift threshold", "threshold" }, - { "copyts", OPT_BOOL | OPT_EXPERT, {(void*)©_ts}, "copy timestamps" }, - { "copytb", OPT_BOOL | OPT_EXPERT, {(void*)©_tb}, "copy input stream time base when stream copying" }, - { "shortest", OPT_BOOL | OPT_EXPERT, {(void*)&opt_shortest}, "finish encoding within shortest input" }, // - { "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&dts_delta_threshold}, "timestamp discontinuity delta threshold", "threshold" }, - { "xerror", OPT_BOOL, {(void*)&exit_on_error}, "exit on error", "error" }, - { "copyinkf", OPT_BOOL | OPT_EXPERT | OPT_SPEC, {.off = OFFSET(copy_initial_nonkeyframes)}, "copy initial non-keyframes" }, - { "frames", OPT_INT64 | HAS_ARG | OPT_SPEC, {.off = OFFSET(max_frames)}, "set the number of frames to record", "number" }, - { "tag", OPT_STRING | HAS_ARG | OPT_SPEC, {.off = OFFSET(codec_tags)}, "force codec tag/fourcc", "fourcc/tag" }, - { "q", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC, {.off = OFFSET(qscale)}, "use fixed quality scale (VBR)", "q" }, - { "qscale", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC, {.off = OFFSET(qscale)}, "use fixed quality scale (VBR)", "q" }, - { "filter", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(filters)}, "set stream filterchain", "filter_list" }, - { "filter_complex", HAS_ARG | OPT_EXPERT, {(void*)opt_filter_complex}, "create a complex filtergraph", "graph_description" }, - { "stats", OPT_BOOL, {&print_stats}, "print progress report during encoding", }, - { "attach", HAS_ARG | OPT_FUNC2, {(void*)opt_attach}, "add an attachment to the output file", "filename" }, - { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(dump_attachment)}, "extract an attachment into a file", "filename" }, - { "cpuflags", HAS_ARG | OPT_EXPERT, {(void*)opt_cpuflags}, "set CPU flags mask", "mask" }, - - /* video options */ - { "vframes", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_frames}, "set the number of video frames to record", "number" }, - { "r", HAS_ARG | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_rates)}, "set frame rate (Hz value, fraction or abbreviation)", "rate" }, - { "s", HAS_ARG | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_sizes)}, "set frame size (WxH or abbreviation)", "size" }, - { "aspect", HAS_ARG | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_aspect_ratios)}, "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" }, - { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_pix_fmts)}, "set pixel format", "format" }, - { "vn", OPT_BOOL | OPT_VIDEO | OPT_OFFSET, {.off = OFFSET(video_disable)}, "disable video" }, - { "vdt", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_discard}, "discard threshold", "n" }, - { "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(rc_overrides)}, "rate control override for specific intervals", "override" }, - { "vcodec", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" }, - { "same_quant", OPT_BOOL | OPT_VIDEO, {(void*)&same_quant}, - "use same quantizer as source (implies VBR)" }, - { "pass", HAS_ARG | OPT_VIDEO, {(void*)opt_pass}, "select the pass number (1 or 2)", "n" }, - { "passlogfile", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void*)&pass_logfilename_prefix}, "select two pass log file name prefix", "prefix" }, - { "deinterlace", OPT_EXPERT | OPT_VIDEO, {(void*)opt_deinterlace}, - "this option is deprecated, use the yadif filter instead" }, - { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, - { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, - { "vf", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_filters}, "video filters", "filter list" }, - { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(intra_matrices)}, "specify intra matrix coeffs", "matrix" }, - { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(inter_matrices)}, "specify inter matrix coeffs", "matrix" }, - { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_INT| OPT_SPEC, {.off = OFFSET(top_field_first)}, "top=1/bottom=0/auto=-1 field first", "" }, - { "dc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_dc_precision}, "intra_dc_precision", "precision" }, - { "vtag", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_tag}, "force video tag/fourcc", "fourcc/tag" }, - { "qphist", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&qp_hist }, "show QP histogram" }, - { "force_fps", OPT_BOOL | OPT_EXPERT | OPT_VIDEO | OPT_SPEC, {.off = OFFSET(force_fps)}, "force the selected framerate, disable the best supported framerate selection" }, - { "streamid", HAS_ARG | OPT_EXPERT | OPT_FUNC2, {(void*)opt_streamid}, "set the value of an outfile streamid", "streamIndex:value" }, - { "force_key_frames", OPT_STRING | HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_SPEC, {.off = OFFSET(forced_key_frames)}, "force key frames at specified timestamps", "timestamps" }, - - /* audio options */ - { "aframes", HAS_ARG | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_frames}, "set the number of audio frames to record", "number" }, - { "aq", HAS_ARG | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_qscale}, "set audio quality (codec-specific)", "quality", }, - { "ar", HAS_ARG | OPT_AUDIO | OPT_INT | OPT_SPEC, {.off = OFFSET(audio_sample_rate)}, "set audio sampling rate (in Hz)", "rate" }, - { "ac", HAS_ARG | OPT_AUDIO | OPT_INT | OPT_SPEC, {.off = OFFSET(audio_channels)}, "set number of audio channels", "channels" }, - { "an", OPT_BOOL | OPT_AUDIO | OPT_OFFSET, {.off = OFFSET(audio_disable)}, "disable audio" }, - { "acodec", HAS_ARG | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_codec}, "force audio codec ('copy' to copy stream)", "codec" }, - { "atag", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_tag}, "force audio tag/fourcc", "fourcc/tag" }, - { "vol", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&audio_volume}, "change audio volume (256=normal)" , "volume" }, // - { "sample_fmt", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_SPEC | OPT_STRING, {.off = OFFSET(sample_fmts)}, "set sample format", "format" }, - { "channel_layout", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_FUNC2, {(void*)opt_channel_layout}, "set channel layout", "layout" }, - { "af", HAS_ARG | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_filters}, "audio filters", "filter list" }, - - /* subtitle options */ - { "sn", OPT_BOOL | OPT_SUBTITLE | OPT_OFFSET, {.off = OFFSET(subtitle_disable)}, "disable subtitle" }, - { "scodec", HAS_ARG | OPT_SUBTITLE | OPT_FUNC2, {(void*)opt_subtitle_codec}, "force subtitle codec ('copy' to copy stream)", "codec" }, - { "stag", HAS_ARG | OPT_EXPERT | OPT_SUBTITLE | OPT_FUNC2, {(void*)opt_subtitle_tag}, "force subtitle tag/fourcc", "fourcc/tag" }, - - /* grab options */ - { "isync", OPT_BOOL | OPT_EXPERT | OPT_GRAB, {(void*)&input_sync}, "sync read on input", "" }, - - /* muxer options */ - { "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(mux_max_delay)}, "set the maximum demux-decode delay", "seconds" }, - { "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(mux_preload)}, "set the initial demux-decode delay", "seconds" }, - - { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(bitstream_filters)}, "A comma-separated list of bitstream filters", "bitstream_filters" }, - - /* data codec support */ - { "dcodec", HAS_ARG | OPT_DATA | OPT_FUNC2, {(void*)opt_data_codec}, "force data codec ('copy' to copy stream)", "codec" }, - - { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, - { NULL, }, -}; - int main(int argc, char **argv) { OptionsContext o = { 0 }; int64_t ti; - options = real_options; reset_options(&o); av_log_set_flags(AV_LOG_SKIP_REPEATED); diff --git a/avconv.h b/avconv.h new file mode 100644 index 0000000000..fb720d6259 --- /dev/null +++ b/avconv.h @@ -0,0 +1,360 @@ +/* + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCONV_H +#define AVCONV_H + +#include "config.h" + +#include +#include + +#if HAVE_PTHREADS +#include +#endif + +#include "cmdutils.h" + +#include "libavformat/avformat.h" +#include "libavformat/avio.h" + +#include "libavcodec/avcodec.h" + +#include "libavfilter/avfilter.h" +#include "libavfilter/avfiltergraph.h" + +#include "libavutil/avutil.h" +#include "libavutil/dict.h" +#include "libavutil/fifo.h" +#include "libavutil/pixfmt.h" +#include "libavutil/rational.h" + +#define VSYNC_AUTO -1 +#define VSYNC_PASSTHROUGH 0 +#define VSYNC_CFR 1 +#define VSYNC_VFR 2 + +/* select an input stream for an output stream */ +typedef struct StreamMap { + int disabled; /** 1 is this mapping is disabled by a negative map */ + int file_index; + int stream_index; + int sync_file_index; + int sync_stream_index; + char *linklabel; /** name of an output link, for mapping lavfi outputs */ +} StreamMap; + +/** + * select an input file for an output file + */ +typedef struct MetadataMap { + int file; ///< file index + char type; ///< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram + int index; ///< stream/chapter/program number +} MetadataMap; + +typedef struct OptionsContext { + /* input/output options */ + int64_t start_time; + const char *format; + + SpecifierOpt *codec_names; + int nb_codec_names; + SpecifierOpt *audio_channels; + int nb_audio_channels; + SpecifierOpt *audio_sample_rate; + int nb_audio_sample_rate; + SpecifierOpt *frame_rates; + int nb_frame_rates; + SpecifierOpt *frame_sizes; + int nb_frame_sizes; + SpecifierOpt *frame_pix_fmts; + int nb_frame_pix_fmts; + + /* input options */ + int64_t input_ts_offset; + int rate_emu; + + SpecifierOpt *ts_scale; + int nb_ts_scale; + SpecifierOpt *dump_attachment; + int nb_dump_attachment; + + /* output options */ + StreamMap *stream_maps; + int nb_stream_maps; + /* first item specifies output metadata, second is input */ + MetadataMap (*meta_data_maps)[2]; + int nb_meta_data_maps; + int metadata_global_manual; + int metadata_streams_manual; + int metadata_chapters_manual; + const char **attachments; + int nb_attachments; + + int chapters_input_file; + + int64_t recording_time; + uint64_t limit_filesize; + float mux_preload; + float mux_max_delay; + + int video_disable; + int audio_disable; + int subtitle_disable; + int data_disable; + + /* indexed by output file stream index */ + int *streamid_map; + int nb_streamid_map; + + SpecifierOpt *metadata; + int nb_metadata; + SpecifierOpt *max_frames; + int nb_max_frames; + SpecifierOpt *bitstream_filters; + int nb_bitstream_filters; + SpecifierOpt *codec_tags; + int nb_codec_tags; + SpecifierOpt *sample_fmts; + int nb_sample_fmts; + SpecifierOpt *qscale; + int nb_qscale; + SpecifierOpt *forced_key_frames; + int nb_forced_key_frames; + SpecifierOpt *force_fps; + int nb_force_fps; + SpecifierOpt *frame_aspect_ratios; + int nb_frame_aspect_ratios; + SpecifierOpt *rc_overrides; + int nb_rc_overrides; + SpecifierOpt *intra_matrices; + int nb_intra_matrices; + SpecifierOpt *inter_matrices; + int nb_inter_matrices; + SpecifierOpt *top_field_first; + int nb_top_field_first; + SpecifierOpt *metadata_map; + int nb_metadata_map; + SpecifierOpt *presets; + int nb_presets; + SpecifierOpt *copy_initial_nonkeyframes; + int nb_copy_initial_nonkeyframes; + SpecifierOpt *filters; + int nb_filters; +} OptionsContext; + +typedef struct InputFilter { + AVFilterContext *filter; + struct InputStream *ist; + struct FilterGraph *graph; + uint8_t *name; +} InputFilter; + +typedef struct OutputFilter { + AVFilterContext *filter; + struct OutputStream *ost; + struct FilterGraph *graph; + uint8_t *name; + + /* temporary storage until stream maps are processed */ + AVFilterInOut *out_tmp; +} OutputFilter; + +typedef struct FilterGraph { + int index; + const char *graph_desc; + + AVFilterGraph *graph; + + InputFilter **inputs; + int nb_inputs; + OutputFilter **outputs; + int nb_outputs; +} FilterGraph; + +typedef struct InputStream { + int file_index; + AVStream *st; + int discard; /* true if stream data should be discarded */ + int decoding_needed; /* true if the packets must be decoded in 'raw_fifo' */ + AVCodec *dec; + AVFrame *decoded_frame; + + int64_t start; /* time when read started */ + /* predicted dts of the next packet read for this stream or (when there are + * several frames in a packet) of the next frame in current packet */ + int64_t next_dts; + /* dts of the last packet read for this stream */ + int64_t last_dts; + PtsCorrectionContext pts_ctx; + double ts_scale; + int is_start; /* is 1 at the start and after a discontinuity */ + int showed_multi_packet_warning; + AVDictionary *opts; + AVRational framerate; /* framerate forced with -r */ + + int resample_height; + int resample_width; + int resample_pix_fmt; + + int resample_sample_fmt; + int resample_sample_rate; + int resample_channels; + uint64_t resample_channel_layout; + + /* a pool of free buffers for decoded data */ + FrameBuffer *buffer_pool; + + /* decoded data from this stream goes into all those filters + * currently video and audio only */ + InputFilter **filters; + int nb_filters; +} InputStream; + +typedef struct InputFile { + AVFormatContext *ctx; + int eof_reached; /* true if eof reached */ + int ist_index; /* index of first stream in ist_table */ + int buffer_size; /* current total buffer size */ + int64_t ts_offset; + int nb_streams; /* number of stream that avconv is aware of; may be different + from ctx.nb_streams if new streams appear during av_read_frame() */ + int rate_emu; + +#if HAVE_PTHREADS + pthread_t thread; /* thread reading from this file */ + int finished; /* the thread has exited */ + int joined; /* the thread has been joined */ + pthread_mutex_t fifo_lock; /* lock for access to fifo */ + pthread_cond_t fifo_cond; /* the main thread will signal on this cond after reading from fifo */ + AVFifoBuffer *fifo; /* demuxed packets are stored here; freed by the main thread */ +#endif +} InputFile; + +typedef struct OutputStream { + int file_index; /* file index */ + int index; /* stream index in the output file */ + int source_index; /* InputStream index */ + AVStream *st; /* stream in the output file */ + int encoding_needed; /* true if encoding needed for this stream */ + int frame_number; + /* input pts and corresponding output pts + for A/V sync */ + // double sync_ipts; /* dts from the AVPacket of the demuxer in second units */ + struct InputStream *sync_ist; /* input stream to sync against */ + int64_t sync_opts; /* output frame counter, could be changed to some true timestamp */ // FIXME look at frame_number + /* pts of the first frame encoded for this stream, used for limiting + * recording time */ + int64_t first_pts; + AVBitStreamFilterContext *bitstream_filters; + AVCodec *enc; + int64_t max_frames; + AVFrame *filtered_frame; + + /* video only */ + AVRational frame_rate; + int force_fps; + int top_field_first; + + float frame_aspect_ratio; + float last_quality; + + /* forced key frames */ + int64_t *forced_kf_pts; + int forced_kf_count; + int forced_kf_index; + char *forced_keyframes; + + FILE *logfile; + + OutputFilter *filter; + char *avfilter; + + int64_t sws_flags; + AVDictionary *opts; + int is_past_recording_time; + int stream_copy; + const char *attachment_filename; + int copy_initial_nonkeyframes; + + enum PixelFormat pix_fmts[2]; +} OutputStream; + +typedef struct OutputFile { + AVFormatContext *ctx; + AVDictionary *opts; + int ost_index; /* index of the first stream in output_streams */ + int64_t recording_time; /* desired length of the resulting file in microseconds */ + int64_t start_time; /* start time in microseconds */ + uint64_t limit_filesize; +} OutputFile; + +extern InputStream **input_streams; +extern int nb_input_streams; +extern InputFile **input_files; +extern int nb_input_files; + +extern OutputStream **output_streams; +extern int nb_output_streams; +extern OutputFile **output_files; +extern int nb_output_files; + +extern FilterGraph **filtergraphs; +extern int nb_filtergraphs; + +extern char *pass_logfilename_prefix; +extern char *vstats_filename; + +extern float audio_drift_threshold; +extern float dts_delta_threshold; + +extern int audio_volume; +extern int audio_sync_method; +extern int video_sync_method; +extern int do_benchmark; +extern int do_deinterlace; +extern int do_hex_dump; +extern int do_pkt_dump; +extern int copy_ts; +extern int copy_tb; +extern int opt_shortest; +extern int exit_on_error; +extern int print_stats; +extern int qp_hist; +extern int same_quant; + +extern const AVIOInterruptCB int_cb; + +extern const OptionDef options[]; + +void reset_options(OptionsContext *o); +void show_usage(void); + +int opt_cpuflags(const char *opt, const char *arg); + +void opt_output_file(void *optctx, const char *filename); + +void assert_avoptions(AVDictionary *m); + +int guess_input_channel_layout(InputStream *ist); + +int configure_filtergraph(FilterGraph *fg); +int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out); + +#endif /* AVCONV_H */ diff --git a/avconv_opt.c b/avconv_opt.c new file mode 100644 index 0000000000..7b86d7613c --- /dev/null +++ b/avconv_opt.c @@ -0,0 +1,1915 @@ +/* + * avconv option parsing + * + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "avconv.h" +#include "cmdutils.h" + +#include "libavformat/avformat.h" + +#include "libavcodec/avcodec.h" + +#include "libavfilter/avfilter.h" +#include "libavfilter/avfiltergraph.h" + +#include "libavutil/audioconvert.h" +#include "libavutil/avassert.h" +#include "libavutil/avstring.h" +#include "libavutil/avutil.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/fifo.h" +#include "libavutil/mathematics.h" +#include "libavutil/opt.h" +#include "libavutil/parseutils.h" +#include "libavutil/pixdesc.h" +#include "libavutil/pixfmt.h" + +#define MATCH_PER_STREAM_OPT(name, type, outvar, fmtctx, st)\ +{\ + int i, ret;\ + for (i = 0; i < o->nb_ ## name; i++) {\ + char *spec = o->name[i].specifier;\ + if ((ret = check_stream_specifier(fmtctx, st, spec)) > 0)\ + outvar = o->name[i].u.type;\ + else if (ret < 0)\ + exit_program(1);\ + }\ +} + +char *pass_logfilename_prefix = NULL; +char *vstats_filename; + +float audio_drift_threshold = 0.1; +float dts_delta_threshold = 10; + +int audio_volume = 256; +int audio_sync_method = 0; +int video_sync_method = VSYNC_AUTO; +int do_deinterlace = 0; +int do_benchmark = 0; +int do_hex_dump = 0; +int do_pkt_dump = 0; +int copy_ts = 0; +int copy_tb = 1; +int opt_shortest = 0; +int exit_on_error = 0; +int print_stats = 1; +int qp_hist = 0; +int same_quant = 0; + +static int file_overwrite = 0; +static int video_discard = 0; +static int intra_dc_precision = 8; +static int do_pass = 0; +static int using_stdin = 0; +static int input_sync; + +void reset_options(OptionsContext *o) +{ + const OptionDef *po = options; + int i; + + /* all OPT_SPEC and OPT_STRING can be freed in generic way */ + while (po->name) { + void *dst = (uint8_t*)o + po->u.off; + + if (po->flags & OPT_SPEC) { + SpecifierOpt **so = dst; + int i, *count = (int*)(so + 1); + for (i = 0; i < *count; i++) { + av_freep(&(*so)[i].specifier); + if (po->flags & OPT_STRING) + av_freep(&(*so)[i].u.str); + } + av_freep(so); + *count = 0; + } else if (po->flags & OPT_OFFSET && po->flags & OPT_STRING) + av_freep(dst); + po++; + } + + for (i = 0; i < o->nb_stream_maps; i++) + av_freep(&o->stream_maps[i].linklabel); + av_freep(&o->stream_maps); + av_freep(&o->meta_data_maps); + av_freep(&o->streamid_map); + + memset(o, 0, sizeof(*o)); + + o->mux_max_delay = 0.7; + o->recording_time = INT64_MAX; + o->limit_filesize = UINT64_MAX; + o->chapters_input_file = INT_MAX; + + uninit_opts(); + init_opts(); +} + + +static double parse_frame_aspect_ratio(const char *arg) +{ + int x = 0, y = 0; + double ar = 0; + const char *p; + char *end; + + p = strchr(arg, ':'); + if (p) { + x = strtol(arg, &end, 10); + if (end == p) + y = strtol(end + 1, &end, 10); + if (x > 0 && y > 0) + ar = (double)x / (double)y; + } else + ar = strtod(arg, NULL); + + if (!ar) { + av_log(NULL, AV_LOG_FATAL, "Incorrect aspect ratio specification.\n"); + exit_program(1); + } + return ar; +} + +static int opt_audio_codec(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "codec:a", arg, options); +} + +static int opt_video_codec(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "codec:v", arg, options); +} + +static int opt_subtitle_codec(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "codec:s", arg, options); +} + +static int opt_data_codec(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "codec:d", arg, options); +} + +static int opt_map(OptionsContext *o, const char *opt, const char *arg) +{ + StreamMap *m = NULL; + int i, negative = 0, file_idx; + int sync_file_idx = -1, sync_stream_idx; + char *p, *sync; + char *map; + + if (*arg == '-') { + negative = 1; + arg++; + } + map = av_strdup(arg); + + /* parse sync stream first, just pick first matching stream */ + if (sync = strchr(map, ',')) { + *sync = 0; + sync_file_idx = strtol(sync + 1, &sync, 0); + if (sync_file_idx >= nb_input_files || sync_file_idx < 0) { + av_log(NULL, AV_LOG_FATAL, "Invalid sync file index: %d.\n", sync_file_idx); + exit_program(1); + } + if (*sync) + sync++; + for (i = 0; i < input_files[sync_file_idx]->nb_streams; i++) + if (check_stream_specifier(input_files[sync_file_idx]->ctx, + input_files[sync_file_idx]->ctx->streams[i], sync) == 1) { + sync_stream_idx = i; + break; + } + if (i == input_files[sync_file_idx]->nb_streams) { + av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s does not " + "match any streams.\n", arg); + exit_program(1); + } + } + + + if (map[0] == '[') { + /* this mapping refers to lavfi output */ + const char *c = map + 1; + o->stream_maps = grow_array(o->stream_maps, sizeof(*o->stream_maps), + &o->nb_stream_maps, o->nb_stream_maps + 1); + m = &o->stream_maps[o->nb_stream_maps - 1]; + m->linklabel = av_get_token(&c, "]"); + if (!m->linklabel) { + av_log(NULL, AV_LOG_ERROR, "Invalid output link label: %s.\n", map); + exit_program(1); + } + } else { + file_idx = strtol(map, &p, 0); + if (file_idx >= nb_input_files || file_idx < 0) { + av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx); + exit_program(1); + } + if (negative) + /* disable some already defined maps */ + for (i = 0; i < o->nb_stream_maps; i++) { + m = &o->stream_maps[i]; + if (file_idx == m->file_index && + check_stream_specifier(input_files[m->file_index]->ctx, + input_files[m->file_index]->ctx->streams[m->stream_index], + *p == ':' ? p + 1 : p) > 0) + m->disabled = 1; + } + else + for (i = 0; i < input_files[file_idx]->nb_streams; i++) { + if (check_stream_specifier(input_files[file_idx]->ctx, input_files[file_idx]->ctx->streams[i], + *p == ':' ? p + 1 : p) <= 0) + continue; + o->stream_maps = grow_array(o->stream_maps, sizeof(*o->stream_maps), + &o->nb_stream_maps, o->nb_stream_maps + 1); + m = &o->stream_maps[o->nb_stream_maps - 1]; + + m->file_index = file_idx; + m->stream_index = i; + + if (sync_file_idx >= 0) { + m->sync_file_index = sync_file_idx; + m->sync_stream_index = sync_stream_idx; + } else { + m->sync_file_index = file_idx; + m->sync_stream_index = i; + } + } + } + + if (!m) { + av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n", arg); + exit_program(1); + } + + av_freep(&map); + return 0; +} + +static int opt_attach(OptionsContext *o, const char *opt, const char *arg) +{ + o->attachments = grow_array(o->attachments, sizeof(*o->attachments), + &o->nb_attachments, o->nb_attachments + 1); + o->attachments[o->nb_attachments - 1] = arg; + return 0; +} + +/** + * Parse a metadata specifier in arg. + * @param type metadata type is written here -- g(lobal)/s(tream)/c(hapter)/p(rogram) + * @param index for type c/p, chapter/program index is written here + * @param stream_spec for type s, the stream specifier is written here + */ +static void parse_meta_type(char *arg, char *type, int *index, const char **stream_spec) +{ + if (*arg) { + *type = *arg; + switch (*arg) { + case 'g': + break; + case 's': + if (*(++arg) && *arg != ':') { + av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", arg); + exit_program(1); + } + *stream_spec = *arg == ':' ? arg + 1 : ""; + break; + case 'c': + case 'p': + if (*(++arg) == ':') + *index = strtol(++arg, NULL, 0); + break; + default: + av_log(NULL, AV_LOG_FATAL, "Invalid metadata type %c.\n", *arg); + exit_program(1); + } + } else + *type = 'g'; +} + +static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFormatContext *ic, OptionsContext *o) +{ + AVDictionary **meta_in = NULL; + AVDictionary **meta_out; + int i, ret = 0; + char type_in, type_out; + const char *istream_spec = NULL, *ostream_spec = NULL; + int idx_in = 0, idx_out = 0; + + parse_meta_type(inspec, &type_in, &idx_in, &istream_spec); + parse_meta_type(outspec, &type_out, &idx_out, &ostream_spec); + + if (type_in == 'g' || type_out == 'g') + o->metadata_global_manual = 1; + if (type_in == 's' || type_out == 's') + o->metadata_streams_manual = 1; + if (type_in == 'c' || type_out == 'c') + o->metadata_chapters_manual = 1; + +#define METADATA_CHECK_INDEX(index, nb_elems, desc)\ + if ((index) < 0 || (index) >= (nb_elems)) {\ + av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps.\n",\ + (desc), (index));\ + exit_program(1);\ + } + +#define SET_DICT(type, meta, context, index)\ + switch (type) {\ + case 'g':\ + meta = &context->metadata;\ + break;\ + case 'c':\ + METADATA_CHECK_INDEX(index, context->nb_chapters, "chapter")\ + meta = &context->chapters[index]->metadata;\ + break;\ + case 'p':\ + METADATA_CHECK_INDEX(index, context->nb_programs, "program")\ + meta = &context->programs[index]->metadata;\ + break;\ + default: av_assert0(0);\ + }\ + + SET_DICT(type_in, meta_in, ic, idx_in); + SET_DICT(type_out, meta_out, oc, idx_out); + + /* for input streams choose first matching stream */ + if (type_in == 's') { + for (i = 0; i < ic->nb_streams; i++) { + if ((ret = check_stream_specifier(ic, ic->streams[i], istream_spec)) > 0) { + meta_in = &ic->streams[i]->metadata; + break; + } else if (ret < 0) + exit_program(1); + } + if (!meta_in) { + av_log(NULL, AV_LOG_FATAL, "Stream specifier %s does not match any streams.\n", istream_spec); + exit_program(1); + } + } + + if (type_out == 's') { + for (i = 0; i < oc->nb_streams; i++) { + if ((ret = check_stream_specifier(oc, oc->streams[i], ostream_spec)) > 0) { + meta_out = &oc->streams[i]->metadata; + av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE); + } else if (ret < 0) + exit_program(1); + } + } else + av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE); + + return 0; +} + +static AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder) +{ + const char *codec_string = encoder ? "encoder" : "decoder"; + AVCodec *codec; + + codec = encoder ? + avcodec_find_encoder_by_name(name) : + avcodec_find_decoder_by_name(name); + if (!codec) { + av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name); + exit_program(1); + } + if (codec->type != type) { + av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name); + exit_program(1); + } + return codec; +} + +static AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVStream *st) +{ + char *codec_name = NULL; + + MATCH_PER_STREAM_OPT(codec_names, str, codec_name, s, st); + if (codec_name) { + AVCodec *codec = find_codec_or_die(codec_name, st->codec->codec_type, 0); + st->codec->codec_id = codec->id; + return codec; + } else + return avcodec_find_decoder(st->codec->codec_id); +} + +/** + * Add all the streams from the given input file to the global + * list of input streams. + */ +static void add_input_streams(OptionsContext *o, AVFormatContext *ic) +{ + int i; + + for (i = 0; i < ic->nb_streams; i++) { + AVStream *st = ic->streams[i]; + AVCodecContext *dec = st->codec; + InputStream *ist = av_mallocz(sizeof(*ist)); + char *framerate = NULL; + + if (!ist) + exit_program(1); + + input_streams = grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1); + input_streams[nb_input_streams - 1] = ist; + + ist->st = st; + ist->file_index = nb_input_files; + ist->discard = 1; + st->discard = AVDISCARD_ALL; + ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st, NULL); + + ist->ts_scale = 1.0; + MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); + + ist->dec = choose_decoder(o, ic, st); + + switch (dec->codec_type) { + case AVMEDIA_TYPE_VIDEO: + ist->resample_height = dec->height; + ist->resample_width = dec->width; + ist->resample_pix_fmt = dec->pix_fmt; + + MATCH_PER_STREAM_OPT(frame_rates, str, framerate, ic, st); + if (framerate && av_parse_video_rate(&ist->framerate, + framerate) < 0) { + av_log(NULL, AV_LOG_ERROR, "Error parsing framerate %s.\n", + framerate); + exit_program(1); + } + + break; + case AVMEDIA_TYPE_AUDIO: + guess_input_channel_layout(ist); + + ist->resample_sample_fmt = dec->sample_fmt; + ist->resample_sample_rate = dec->sample_rate; + ist->resample_channels = dec->channels; + ist->resample_channel_layout = dec->channel_layout; + + break; + case AVMEDIA_TYPE_DATA: + case AVMEDIA_TYPE_SUBTITLE: + case AVMEDIA_TYPE_ATTACHMENT: + case AVMEDIA_TYPE_UNKNOWN: + break; + default: + abort(); + } + } +} + +static void assert_file_overwrite(const char *filename) +{ + if (!file_overwrite && + (strchr(filename, ':') == NULL || filename[1] == ':' || + av_strstart(filename, "file:", NULL))) { + if (avio_check(filename, 0) == 0) { + if (!using_stdin) { + fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename); + fflush(stderr); + if (!read_yesno()) { + fprintf(stderr, "Not overwriting - exiting\n"); + exit_program(1); + } + } + else { + fprintf(stderr,"File '%s' already exists. Exiting.\n", filename); + exit_program(1); + } + } + } +} + +static void dump_attachment(AVStream *st, const char *filename) +{ + int ret; + AVIOContext *out = NULL; + AVDictionaryEntry *e; + + if (!st->codec->extradata_size) { + av_log(NULL, AV_LOG_WARNING, "No extradata to dump in stream #%d:%d.\n", + nb_input_files - 1, st->index); + return; + } + if (!*filename && (e = av_dict_get(st->metadata, "filename", NULL, 0))) + filename = e->value; + if (!*filename) { + av_log(NULL, AV_LOG_FATAL, "No filename specified and no 'filename' tag" + "in stream #%d:%d.\n", nb_input_files - 1, st->index); + exit_program(1); + } + + assert_file_overwrite(filename); + + if ((ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, &int_cb, NULL)) < 0) { + av_log(NULL, AV_LOG_FATAL, "Could not open file %s for writing.\n", + filename); + exit_program(1); + } + + avio_write(out, st->codec->extradata, st->codec->extradata_size); + avio_flush(out); + avio_close(out); +} + +static int opt_input_file(OptionsContext *o, const char *opt, const char *filename) +{ + AVFormatContext *ic; + AVInputFormat *file_iformat = NULL; + int err, i, ret; + int64_t timestamp; + uint8_t buf[128]; + AVDictionary **opts; + int orig_nb_streams; // number of streams before avformat_find_stream_info + + if (o->format) { + if (!(file_iformat = av_find_input_format(o->format))) { + av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format); + exit_program(1); + } + } + + if (!strcmp(filename, "-")) + filename = "pipe:"; + + using_stdin |= !strncmp(filename, "pipe:", 5) || + !strcmp(filename, "/dev/stdin"); + + /* get default parameters from command line */ + ic = avformat_alloc_context(); + if (!ic) { + print_error(filename, AVERROR(ENOMEM)); + exit_program(1); + } + if (o->nb_audio_sample_rate) { + snprintf(buf, sizeof(buf), "%d", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i); + av_dict_set(&format_opts, "sample_rate", buf, 0); + } + if (o->nb_audio_channels) { + /* because we set audio_channels based on both the "ac" and + * "channel_layout" options, we need to check that the specified + * demuxer actually has the "channels" option before setting it */ + if (file_iformat && file_iformat->priv_class && + av_opt_find(&file_iformat->priv_class, "channels", NULL, 0, + AV_OPT_SEARCH_FAKE_OBJ)) { + snprintf(buf, sizeof(buf), "%d", + o->audio_channels[o->nb_audio_channels - 1].u.i); + av_dict_set(&format_opts, "channels", buf, 0); + } + } + if (o->nb_frame_rates) { + /* set the format-level framerate option; + * this is important for video grabbers, e.g. x11 */ + if (file_iformat && file_iformat->priv_class && + av_opt_find(&file_iformat->priv_class, "framerate", NULL, 0, + AV_OPT_SEARCH_FAKE_OBJ)) { + av_dict_set(&format_opts, "framerate", + o->frame_rates[o->nb_frame_rates - 1].u.str, 0); + } + } + if (o->nb_frame_sizes) { + av_dict_set(&format_opts, "video_size", o->frame_sizes[o->nb_frame_sizes - 1].u.str, 0); + } + if (o->nb_frame_pix_fmts) + av_dict_set(&format_opts, "pixel_format", o->frame_pix_fmts[o->nb_frame_pix_fmts - 1].u.str, 0); + + ic->flags |= AVFMT_FLAG_NONBLOCK; + ic->interrupt_callback = int_cb; + + /* open the input file with generic libav function */ + err = avformat_open_input(&ic, filename, file_iformat, &format_opts); + if (err < 0) { + print_error(filename, err); + exit_program(1); + } + assert_avoptions(format_opts); + + /* apply forced codec ids */ + for (i = 0; i < ic->nb_streams; i++) + choose_decoder(o, ic, ic->streams[i]); + + /* Set AVCodecContext options for avformat_find_stream_info */ + opts = setup_find_stream_info_opts(ic, codec_opts); + orig_nb_streams = ic->nb_streams; + + /* If not enough info to get the stream parameters, we decode the + first frames to get it. (used in mpeg case for example) */ + ret = avformat_find_stream_info(ic, opts); + if (ret < 0) { + av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename); + avformat_close_input(&ic); + exit_program(1); + } + + timestamp = o->start_time; + /* add the stream start time */ + if (ic->start_time != AV_NOPTS_VALUE) + timestamp += ic->start_time; + + /* if seeking requested, we execute it */ + if (o->start_time != 0) { + ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD); + if (ret < 0) { + av_log(NULL, AV_LOG_WARNING, "%s: could not seek to position %0.3f\n", + filename, (double)timestamp / AV_TIME_BASE); + } + } + + /* update the current parameters so that they match the one of the input stream */ + add_input_streams(o, ic); + + /* dump the file content */ + av_dump_format(ic, nb_input_files, filename, 0); + + input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1); + if (!(input_files[nb_input_files - 1] = av_mallocz(sizeof(*input_files[0])))) + exit_program(1); + + input_files[nb_input_files - 1]->ctx = ic; + input_files[nb_input_files - 1]->ist_index = nb_input_streams - ic->nb_streams; + input_files[nb_input_files - 1]->ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp); + input_files[nb_input_files - 1]->nb_streams = ic->nb_streams; + input_files[nb_input_files - 1]->rate_emu = o->rate_emu; + + for (i = 0; i < o->nb_dump_attachment; i++) { + int j; + + for (j = 0; j < ic->nb_streams; j++) { + AVStream *st = ic->streams[j]; + + if (check_stream_specifier(ic, st, o->dump_attachment[i].specifier) == 1) + dump_attachment(st, o->dump_attachment[i].u.str); + } + } + + for (i = 0; i < orig_nb_streams; i++) + av_dict_free(&opts[i]); + av_freep(&opts); + + reset_options(o); + return 0; +} + +static uint8_t *get_line(AVIOContext *s) +{ + AVIOContext *line; + uint8_t *buf; + char c; + + if (avio_open_dyn_buf(&line) < 0) { + av_log(NULL, AV_LOG_FATAL, "Could not alloc buffer for reading preset.\n"); + exit_program(1); + } + + while ((c = avio_r8(s)) && c != '\n') + avio_w8(line, c); + avio_w8(line, 0); + avio_close_dyn_buf(line, &buf); + + return buf; +} + +static int get_preset_file_2(const char *preset_name, const char *codec_name, AVIOContext **s) +{ + int i, ret = 1; + char filename[1000]; + const char *base[3] = { getenv("AVCONV_DATADIR"), + getenv("HOME"), + AVCONV_DATADIR, + }; + + for (i = 0; i < FF_ARRAY_ELEMS(base) && ret; i++) { + if (!base[i]) + continue; + if (codec_name) { + snprintf(filename, sizeof(filename), "%s%s/%s-%s.avpreset", base[i], + i != 1 ? "" : "/.avconv", codec_name, preset_name); + ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL); + } + if (ret) { + snprintf(filename, sizeof(filename), "%s%s/%s.avpreset", base[i], + i != 1 ? "" : "/.avconv", preset_name); + ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL); + } + } + return ret; +} + +static void choose_encoder(OptionsContext *o, AVFormatContext *s, OutputStream *ost) +{ + char *codec_name = NULL; + + MATCH_PER_STREAM_OPT(codec_names, str, codec_name, s, ost->st); + if (!codec_name) { + ost->st->codec->codec_id = av_guess_codec(s->oformat, NULL, s->filename, + NULL, ost->st->codec->codec_type); + ost->enc = avcodec_find_encoder(ost->st->codec->codec_id); + } else if (!strcmp(codec_name, "copy")) + ost->stream_copy = 1; + else { + ost->enc = find_codec_or_die(codec_name, ost->st->codec->codec_type, 1); + ost->st->codec->codec_id = ost->enc->id; + } +} + +static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, enum AVMediaType type) +{ + OutputStream *ost; + AVStream *st = avformat_new_stream(oc, NULL); + int idx = oc->nb_streams - 1, ret = 0; + char *bsf = NULL, *next, *codec_tag = NULL; + AVBitStreamFilterContext *bsfc, *bsfc_prev = NULL; + double qscale = -1; + char *buf = NULL, *arg = NULL, *preset = NULL; + AVIOContext *s = NULL; + + if (!st) { + av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n"); + exit_program(1); + } + + if (oc->nb_streams - 1 < o->nb_streamid_map) + st->id = o->streamid_map[oc->nb_streams - 1]; + + output_streams = grow_array(output_streams, sizeof(*output_streams), &nb_output_streams, + nb_output_streams + 1); + if (!(ost = av_mallocz(sizeof(*ost)))) + exit_program(1); + output_streams[nb_output_streams - 1] = ost; + + ost->file_index = nb_output_files; + ost->index = idx; + ost->st = st; + st->codec->codec_type = type; + choose_encoder(o, oc, ost); + if (ost->enc) { + ost->opts = filter_codec_opts(codec_opts, ost->enc->id, oc, st, ost->enc); + } + + avcodec_get_context_defaults3(st->codec, ost->enc); + st->codec->codec_type = type; // XXX hack, avcodec_get_context_defaults2() sets type to unknown for stream copy + + MATCH_PER_STREAM_OPT(presets, str, preset, oc, st); + if (preset && (!(ret = get_preset_file_2(preset, ost->enc->name, &s)))) { + do { + buf = get_line(s); + if (!buf[0] || buf[0] == '#') { + av_free(buf); + continue; + } + if (!(arg = strchr(buf, '='))) { + av_log(NULL, AV_LOG_FATAL, "Invalid line found in the preset file.\n"); + exit_program(1); + } + *arg++ = 0; + av_dict_set(&ost->opts, buf, arg, AV_DICT_DONT_OVERWRITE); + av_free(buf); + } while (!s->eof_reached); + avio_close(s); + } + if (ret) { + av_log(NULL, AV_LOG_FATAL, + "Preset %s specified for stream %d:%d, but could not be opened.\n", + preset, ost->file_index, ost->index); + exit_program(1); + } + + ost->max_frames = INT64_MAX; + MATCH_PER_STREAM_OPT(max_frames, i64, ost->max_frames, oc, st); + + MATCH_PER_STREAM_OPT(bitstream_filters, str, bsf, oc, st); + while (bsf) { + if (next = strchr(bsf, ',')) + *next++ = 0; + if (!(bsfc = av_bitstream_filter_init(bsf))) { + av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf); + exit_program(1); + } + if (bsfc_prev) + bsfc_prev->next = bsfc; + else + ost->bitstream_filters = bsfc; + + bsfc_prev = bsfc; + bsf = next; + } + + MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, oc, st); + if (codec_tag) { + uint32_t tag = strtol(codec_tag, &next, 0); + if (*next) + tag = AV_RL32(codec_tag); + st->codec->codec_tag = tag; + } + + MATCH_PER_STREAM_OPT(qscale, dbl, qscale, oc, st); + if (qscale >= 0 || same_quant) { + st->codec->flags |= CODEC_FLAG_QSCALE; + st->codec->global_quality = FF_QP2LAMBDA * qscale; + } + + if (oc->oformat->flags & AVFMT_GLOBALHEADER) + st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER; + + av_opt_get_int(sws_opts, "sws_flags", 0, &ost->sws_flags); + + ost->pix_fmts[0] = ost->pix_fmts[1] = PIX_FMT_NONE; + + return ost; +} + +static void parse_matrix_coeffs(uint16_t *dest, const char *str) +{ + int i; + const char *p = str; + for (i = 0;; i++) { + dest[i] = atoi(p); + if (i == 63) + break; + p = strchr(p, ','); + if (!p) { + av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i); + exit_program(1); + } + p++; + } +} + +static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) +{ + AVStream *st; + OutputStream *ost; + AVCodecContext *video_enc; + + ost = new_output_stream(o, oc, AVMEDIA_TYPE_VIDEO); + st = ost->st; + video_enc = st->codec; + + if (!ost->stream_copy) { + const char *p = NULL; + char *frame_rate = NULL, *frame_size = NULL; + char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL; + char *intra_matrix = NULL, *inter_matrix = NULL; + const char *filters = "null"; + int i; + + MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st); + if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) { + av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate); + exit_program(1); + } + + MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st); + if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) { + av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size); + exit_program(1); + } + + MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st); + if (frame_aspect_ratio) + ost->frame_aspect_ratio = parse_frame_aspect_ratio(frame_aspect_ratio); + + MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st); + if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == PIX_FMT_NONE) { + av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt); + exit_program(1); + } + st->sample_aspect_ratio = video_enc->sample_aspect_ratio; + + MATCH_PER_STREAM_OPT(intra_matrices, str, intra_matrix, oc, st); + if (intra_matrix) { + if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) { + av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n"); + exit_program(1); + } + parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix); + } + MATCH_PER_STREAM_OPT(inter_matrices, str, inter_matrix, oc, st); + if (inter_matrix) { + if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) { + av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for inter matrix.\n"); + exit_program(1); + } + parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix); + } + + MATCH_PER_STREAM_OPT(rc_overrides, str, p, oc, st); + for (i = 0; p; i++) { + int start, end, q; + int e = sscanf(p, "%d,%d,%d", &start, &end, &q); + if (e != 3) { + av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n"); + exit_program(1); + } + video_enc->rc_override = + av_realloc(video_enc->rc_override, + sizeof(RcOverride) * (i + 1)); + video_enc->rc_override[i].start_frame = start; + video_enc->rc_override[i].end_frame = end; + if (q > 0) { + video_enc->rc_override[i].qscale = q; + video_enc->rc_override[i].quality_factor = 1.0; + } + else { + video_enc->rc_override[i].qscale = 0; + video_enc->rc_override[i].quality_factor = -q/100.0; + } + p = strchr(p, '/'); + if (p) p++; + } + video_enc->rc_override_count = i; + if (!video_enc->rc_initial_buffer_occupancy) + video_enc->rc_initial_buffer_occupancy = video_enc->rc_buffer_size * 3 / 4; + video_enc->intra_dc_precision = intra_dc_precision - 8; + + /* two pass mode */ + if (do_pass) { + if (do_pass == 1) { + video_enc->flags |= CODEC_FLAG_PASS1; + } else { + video_enc->flags |= CODEC_FLAG_PASS2; + } + } + + MATCH_PER_STREAM_OPT(forced_key_frames, str, ost->forced_keyframes, oc, st); + if (ost->forced_keyframes) + ost->forced_keyframes = av_strdup(ost->forced_keyframes); + + MATCH_PER_STREAM_OPT(force_fps, i, ost->force_fps, oc, st); + + ost->top_field_first = -1; + MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, st); + + MATCH_PER_STREAM_OPT(filters, str, filters, oc, st); + ost->avfilter = av_strdup(filters); + } else { + MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st); + } + + return ost; +} + +static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc) +{ + AVStream *st; + OutputStream *ost; + AVCodecContext *audio_enc; + + ost = new_output_stream(o, oc, AVMEDIA_TYPE_AUDIO); + st = ost->st; + + audio_enc = st->codec; + audio_enc->codec_type = AVMEDIA_TYPE_AUDIO; + + if (!ost->stream_copy) { + char *sample_fmt = NULL; + const char *filters = "anull"; + + MATCH_PER_STREAM_OPT(audio_channels, i, audio_enc->channels, oc, st); + + MATCH_PER_STREAM_OPT(sample_fmts, str, sample_fmt, oc, st); + if (sample_fmt && + (audio_enc->sample_fmt = av_get_sample_fmt(sample_fmt)) == AV_SAMPLE_FMT_NONE) { + av_log(NULL, AV_LOG_FATAL, "Invalid sample format '%s'\n", sample_fmt); + exit_program(1); + } + + MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st); + + MATCH_PER_STREAM_OPT(filters, str, filters, oc, st); + ost->avfilter = av_strdup(filters); + } + + return ost; +} + +static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc) +{ + OutputStream *ost; + + ost = new_output_stream(o, oc, AVMEDIA_TYPE_DATA); + if (!ost->stream_copy) { + av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n"); + exit_program(1); + } + + return ost; +} + +static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *oc) +{ + OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT); + ost->stream_copy = 1; + return ost; +} + +static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc) +{ + AVStream *st; + OutputStream *ost; + AVCodecContext *subtitle_enc; + + ost = new_output_stream(o, oc, AVMEDIA_TYPE_SUBTITLE); + st = ost->st; + subtitle_enc = st->codec; + + subtitle_enc->codec_type = AVMEDIA_TYPE_SUBTITLE; + + return ost; +} + +/* arg format is "output-stream-index:streamid-value". */ +static int opt_streamid(OptionsContext *o, const char *opt, const char *arg) +{ + int idx; + char *p; + char idx_str[16]; + + av_strlcpy(idx_str, arg, sizeof(idx_str)); + p = strchr(idx_str, ':'); + if (!p) { + av_log(NULL, AV_LOG_FATAL, + "Invalid value '%s' for option '%s', required syntax is 'index:value'\n", + arg, opt); + exit_program(1); + } + *p++ = '\0'; + idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, INT_MAX); + o->streamid_map = grow_array(o->streamid_map, sizeof(*o->streamid_map), &o->nb_streamid_map, idx+1); + o->streamid_map[idx] = parse_number_or_die(opt, p, OPT_INT, 0, INT_MAX); + return 0; +} + +static int copy_chapters(InputFile *ifile, OutputFile *ofile, int copy_metadata) +{ + AVFormatContext *is = ifile->ctx; + AVFormatContext *os = ofile->ctx; + int i; + + for (i = 0; i < is->nb_chapters; i++) { + AVChapter *in_ch = is->chapters[i], *out_ch; + int64_t ts_off = av_rescale_q(ofile->start_time - ifile->ts_offset, + AV_TIME_BASE_Q, in_ch->time_base); + int64_t rt = (ofile->recording_time == INT64_MAX) ? INT64_MAX : + av_rescale_q(ofile->recording_time, AV_TIME_BASE_Q, in_ch->time_base); + + + if (in_ch->end < ts_off) + continue; + if (rt != INT64_MAX && in_ch->start > rt + ts_off) + break; + + out_ch = av_mallocz(sizeof(AVChapter)); + if (!out_ch) + return AVERROR(ENOMEM); + + out_ch->id = in_ch->id; + out_ch->time_base = in_ch->time_base; + out_ch->start = FFMAX(0, in_ch->start - ts_off); + out_ch->end = FFMIN(rt, in_ch->end - ts_off); + + if (copy_metadata) + av_dict_copy(&out_ch->metadata, in_ch->metadata, 0); + + os->nb_chapters++; + os->chapters = av_realloc(os->chapters, sizeof(AVChapter) * os->nb_chapters); + if (!os->chapters) + return AVERROR(ENOMEM); + os->chapters[os->nb_chapters - 1] = out_ch; + } + return 0; +} + +static void init_output_filter(OutputFilter *ofilter, OptionsContext *o, + AVFormatContext *oc) +{ + OutputStream *ost; + + switch (avfilter_pad_get_type(ofilter->out_tmp->filter_ctx->output_pads, + ofilter->out_tmp->pad_idx)) { + case AVMEDIA_TYPE_VIDEO: ost = new_video_stream(o, oc); break; + case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream(o, oc); break; + default: + av_log(NULL, AV_LOG_FATAL, "Only video and audio filters are supported " + "currently.\n"); + exit_program(1); + } + + ost->source_index = -1; + ost->filter = ofilter; + + ofilter->ost = ost; + + if (ost->stream_copy) { + av_log(NULL, AV_LOG_ERROR, "Streamcopy requested for output stream %d:%d, " + "which is fed from a complex filtergraph. Filtering and streamcopy " + "cannot be used together.\n", ost->file_index, ost->index); + exit_program(1); + } + + if (configure_output_filter(ofilter->graph, ofilter, ofilter->out_tmp) < 0) { + av_log(NULL, AV_LOG_FATAL, "Error configuring filter.\n"); + exit_program(1); + } + avfilter_inout_free(&ofilter->out_tmp); +} + +static int configure_complex_filters(void) +{ + int i, ret = 0; + + for (i = 0; i < nb_filtergraphs; i++) + if (!filtergraphs[i]->graph && + (ret = configure_filtergraph(filtergraphs[i])) < 0) + return ret; + return 0; +} + +void opt_output_file(void *optctx, const char *filename) +{ + OptionsContext *o = optctx; + AVFormatContext *oc; + int i, j, err; + AVOutputFormat *file_oformat; + OutputStream *ost; + InputStream *ist; + + if (configure_complex_filters() < 0) { + av_log(NULL, AV_LOG_FATAL, "Error configuring filters.\n"); + exit_program(1); + } + + if (!strcmp(filename, "-")) + filename = "pipe:"; + + oc = avformat_alloc_context(); + if (!oc) { + print_error(filename, AVERROR(ENOMEM)); + exit_program(1); + } + + if (o->format) { + file_oformat = av_guess_format(o->format, NULL, NULL); + if (!file_oformat) { + av_log(NULL, AV_LOG_FATAL, "Requested output format '%s' is not a suitable output format\n", o->format); + exit_program(1); + } + } else { + file_oformat = av_guess_format(NULL, filename, NULL); + if (!file_oformat) { + av_log(NULL, AV_LOG_FATAL, "Unable to find a suitable output format for '%s'\n", + filename); + exit_program(1); + } + } + + oc->oformat = file_oformat; + oc->interrupt_callback = int_cb; + av_strlcpy(oc->filename, filename, sizeof(oc->filename)); + + /* create streams for all unlabeled output pads */ + for (i = 0; i < nb_filtergraphs; i++) { + FilterGraph *fg = filtergraphs[i]; + for (j = 0; j < fg->nb_outputs; j++) { + OutputFilter *ofilter = fg->outputs[j]; + + if (!ofilter->out_tmp || ofilter->out_tmp->name) + continue; + + switch (avfilter_pad_get_type(ofilter->out_tmp->filter_ctx->output_pads, + ofilter->out_tmp->pad_idx)) { + case AVMEDIA_TYPE_VIDEO: o->video_disable = 1; break; + case AVMEDIA_TYPE_AUDIO: o->audio_disable = 1; break; + case AVMEDIA_TYPE_SUBTITLE: o->subtitle_disable = 1; break; + } + init_output_filter(ofilter, o, oc); + } + } + + if (!o->nb_stream_maps) { + /* pick the "best" stream of each type */ +#define NEW_STREAM(type, index)\ + if (index >= 0) {\ + ost = new_ ## type ## _stream(o, oc);\ + ost->source_index = index;\ + ost->sync_ist = input_streams[index];\ + input_streams[index]->discard = 0;\ + input_streams[index]->st->discard = AVDISCARD_NONE;\ + } + + /* video: highest resolution */ + if (!o->video_disable && oc->oformat->video_codec != AV_CODEC_ID_NONE) { + int area = 0, idx = -1; + for (i = 0; i < nb_input_streams; i++) { + ist = input_streams[i]; + if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && + ist->st->codec->width * ist->st->codec->height > area) { + area = ist->st->codec->width * ist->st->codec->height; + idx = i; + } + } + NEW_STREAM(video, idx); + } + + /* audio: most channels */ + if (!o->audio_disable && oc->oformat->audio_codec != AV_CODEC_ID_NONE) { + int channels = 0, idx = -1; + for (i = 0; i < nb_input_streams; i++) { + ist = input_streams[i]; + if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO && + ist->st->codec->channels > channels) { + channels = ist->st->codec->channels; + idx = i; + } + } + NEW_STREAM(audio, idx); + } + + /* subtitles: pick first */ + if (!o->subtitle_disable && oc->oformat->subtitle_codec != AV_CODEC_ID_NONE) { + for (i = 0; i < nb_input_streams; i++) + if (input_streams[i]->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { + NEW_STREAM(subtitle, i); + break; + } + } + /* do something with data? */ + } else { + for (i = 0; i < o->nb_stream_maps; i++) { + StreamMap *map = &o->stream_maps[i]; + + if (map->disabled) + continue; + + if (map->linklabel) { + FilterGraph *fg; + OutputFilter *ofilter = NULL; + int j, k; + + for (j = 0; j < nb_filtergraphs; j++) { + fg = filtergraphs[j]; + for (k = 0; k < fg->nb_outputs; k++) { + AVFilterInOut *out = fg->outputs[k]->out_tmp; + if (out && !strcmp(out->name, map->linklabel)) { + ofilter = fg->outputs[k]; + goto loop_end; + } + } + } +loop_end: + if (!ofilter) { + av_log(NULL, AV_LOG_FATAL, "Output with label '%s' does not exist " + "in any defined filter graph.\n", map->linklabel); + exit_program(1); + } + init_output_filter(ofilter, o, oc); + } else { + ist = input_streams[input_files[map->file_index]->ist_index + map->stream_index]; + switch (ist->st->codec->codec_type) { + case AVMEDIA_TYPE_VIDEO: ost = new_video_stream(o, oc); break; + case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream(o, oc); break; + case AVMEDIA_TYPE_SUBTITLE: ost = new_subtitle_stream(o, oc); break; + case AVMEDIA_TYPE_DATA: ost = new_data_stream(o, oc); break; + case AVMEDIA_TYPE_ATTACHMENT: ost = new_attachment_stream(o, oc); break; + default: + av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d:%d - unsupported type.\n", + map->file_index, map->stream_index); + exit_program(1); + } + + ost->source_index = input_files[map->file_index]->ist_index + map->stream_index; + ost->sync_ist = input_streams[input_files[map->sync_file_index]->ist_index + + map->sync_stream_index]; + ist->discard = 0; + ist->st->discard = AVDISCARD_NONE; + } + } + } + + /* handle attached files */ + for (i = 0; i < o->nb_attachments; i++) { + AVIOContext *pb; + uint8_t *attachment; + const char *p; + int64_t len; + + if ((err = avio_open2(&pb, o->attachments[i], AVIO_FLAG_READ, &int_cb, NULL)) < 0) { + av_log(NULL, AV_LOG_FATAL, "Could not open attachment file %s.\n", + o->attachments[i]); + exit_program(1); + } + if ((len = avio_size(pb)) <= 0) { + av_log(NULL, AV_LOG_FATAL, "Could not get size of the attachment %s.\n", + o->attachments[i]); + exit_program(1); + } + if (!(attachment = av_malloc(len))) { + av_log(NULL, AV_LOG_FATAL, "Attachment %s too large to fit into memory.\n", + o->attachments[i]); + exit_program(1); + } + avio_read(pb, attachment, len); + + ost = new_attachment_stream(o, oc); + ost->stream_copy = 0; + ost->source_index = -1; + ost->attachment_filename = o->attachments[i]; + ost->st->codec->extradata = attachment; + ost->st->codec->extradata_size = len; + + p = strrchr(o->attachments[i], '/'); + av_dict_set(&ost->st->metadata, "filename", (p && *p) ? p + 1 : o->attachments[i], AV_DICT_DONT_OVERWRITE); + avio_close(pb); + } + + output_files = grow_array(output_files, sizeof(*output_files), &nb_output_files, nb_output_files + 1); + if (!(output_files[nb_output_files - 1] = av_mallocz(sizeof(*output_files[0])))) + exit_program(1); + + output_files[nb_output_files - 1]->ctx = oc; + output_files[nb_output_files - 1]->ost_index = nb_output_streams - oc->nb_streams; + output_files[nb_output_files - 1]->recording_time = o->recording_time; + if (o->recording_time != INT64_MAX) + oc->duration = o->recording_time; + output_files[nb_output_files - 1]->start_time = o->start_time; + output_files[nb_output_files - 1]->limit_filesize = o->limit_filesize; + av_dict_copy(&output_files[nb_output_files - 1]->opts, format_opts, 0); + + /* check filename in case of an image number is expected */ + if (oc->oformat->flags & AVFMT_NEEDNUMBER) { + if (!av_filename_number_test(oc->filename)) { + print_error(oc->filename, AVERROR(EINVAL)); + exit_program(1); + } + } + + if (!(oc->oformat->flags & AVFMT_NOFILE)) { + /* test if it already exists to avoid losing precious files */ + assert_file_overwrite(filename); + + /* open the file */ + if ((err = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE, + &oc->interrupt_callback, + &output_files[nb_output_files - 1]->opts)) < 0) { + print_error(filename, err); + exit_program(1); + } + } + + if (o->mux_preload) { + uint8_t buf[64]; + snprintf(buf, sizeof(buf), "%d", (int)(o->mux_preload*AV_TIME_BASE)); + av_dict_set(&output_files[nb_output_files - 1]->opts, "preload", buf, 0); + } + oc->max_delay = (int)(o->mux_max_delay * AV_TIME_BASE); + oc->flags |= AVFMT_FLAG_NONBLOCK; + + /* copy metadata */ + for (i = 0; i < o->nb_metadata_map; i++) { + char *p; + int in_file_index = strtol(o->metadata_map[i].u.str, &p, 0); + + if (in_file_index < 0) + continue; + if (in_file_index >= nb_input_files) { + av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d while processing metadata maps\n", in_file_index); + exit_program(1); + } + copy_metadata(o->metadata_map[i].specifier, *p ? p + 1 : p, oc, input_files[in_file_index]->ctx, o); + } + + /* copy chapters */ + if (o->chapters_input_file >= nb_input_files) { + if (o->chapters_input_file == INT_MAX) { + /* copy chapters from the first input file that has them*/ + o->chapters_input_file = -1; + for (i = 0; i < nb_input_files; i++) + if (input_files[i]->ctx->nb_chapters) { + o->chapters_input_file = i; + break; + } + } else { + av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n", + o->chapters_input_file); + exit_program(1); + } + } + if (o->chapters_input_file >= 0) + copy_chapters(input_files[o->chapters_input_file], output_files[nb_output_files - 1], + !o->metadata_chapters_manual); + + /* copy global metadata by default */ + if (!o->metadata_global_manual && nb_input_files) + av_dict_copy(&oc->metadata, input_files[0]->ctx->metadata, + AV_DICT_DONT_OVERWRITE); + if (!o->metadata_streams_manual) + for (i = output_files[nb_output_files - 1]->ost_index; i < nb_output_streams; i++) { + InputStream *ist; + if (output_streams[i]->source_index < 0) /* this is true e.g. for attached files */ + continue; + ist = input_streams[output_streams[i]->source_index]; + av_dict_copy(&output_streams[i]->st->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE); + } + + /* process manually set metadata */ + for (i = 0; i < o->nb_metadata; i++) { + AVDictionary **m; + char type, *val; + const char *stream_spec; + int index = 0, j, ret; + + val = strchr(o->metadata[i].u.str, '='); + if (!val) { + av_log(NULL, AV_LOG_FATAL, "No '=' character in metadata string %s.\n", + o->metadata[i].u.str); + exit_program(1); + } + *val++ = 0; + + parse_meta_type(o->metadata[i].specifier, &type, &index, &stream_spec); + if (type == 's') { + for (j = 0; j < oc->nb_streams; j++) { + if ((ret = check_stream_specifier(oc, oc->streams[j], stream_spec)) > 0) { + av_dict_set(&oc->streams[j]->metadata, o->metadata[i].u.str, *val ? val : NULL, 0); + } else if (ret < 0) + exit_program(1); + } + } + else { + switch (type) { + case 'g': + m = &oc->metadata; + break; + case 'c': + if (index < 0 || index >= oc->nb_chapters) { + av_log(NULL, AV_LOG_FATAL, "Invalid chapter index %d in metadata specifier.\n", index); + exit_program(1); + } + m = &oc->chapters[index]->metadata; + break; + default: + av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", o->metadata[i].specifier); + exit_program(1); + } + av_dict_set(m, o->metadata[i].u.str, *val ? val : NULL, 0); + } + } + + reset_options(o); +} + +/* same option as mencoder */ +static int opt_pass(const char *opt, const char *arg) +{ + do_pass = parse_number_or_die(opt, arg, OPT_INT, 1, 2); + return 0; +} + + +static int opt_target(OptionsContext *o, const char *opt, const char *arg) +{ + enum { PAL, NTSC, FILM, UNKNOWN } norm = UNKNOWN; + static const char *const frame_rates[] = { "25", "30000/1001", "24000/1001" }; + + if (!strncmp(arg, "pal-", 4)) { + norm = PAL; + arg += 4; + } else if (!strncmp(arg, "ntsc-", 5)) { + norm = NTSC; + arg += 5; + } else if (!strncmp(arg, "film-", 5)) { + norm = FILM; + arg += 5; + } else { + /* Try to determine PAL/NTSC by peeking in the input files */ + if (nb_input_files) { + int i, j, fr; + for (j = 0; j < nb_input_files; j++) { + for (i = 0; i < input_files[j]->nb_streams; i++) { + AVCodecContext *c = input_files[j]->ctx->streams[i]->codec; + if (c->codec_type != AVMEDIA_TYPE_VIDEO) + continue; + fr = c->time_base.den * 1000 / c->time_base.num; + if (fr == 25000) { + norm = PAL; + break; + } else if ((fr == 29970) || (fr == 23976)) { + norm = NTSC; + break; + } + } + if (norm != UNKNOWN) + break; + } + } + if (norm != UNKNOWN) + av_log(NULL, AV_LOG_INFO, "Assuming %s for target.\n", norm == PAL ? "PAL" : "NTSC"); + } + + if (norm == UNKNOWN) { + av_log(NULL, AV_LOG_FATAL, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n"); + av_log(NULL, AV_LOG_FATAL, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n"); + av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n"); + exit_program(1); + } + + if (!strcmp(arg, "vcd")) { + opt_video_codec(o, "c:v", "mpeg1video"); + opt_audio_codec(o, "c:a", "mp2"); + parse_option(o, "f", "vcd", options); + + parse_option(o, "s", norm == PAL ? "352x288" : "352x240", options); + parse_option(o, "r", frame_rates[norm], options); + opt_default("g", norm == PAL ? "15" : "18"); + + opt_default("b", "1150000"); + opt_default("maxrate", "1150000"); + opt_default("minrate", "1150000"); + opt_default("bufsize", "327680"); // 40*1024*8; + + opt_default("b:a", "224000"); + parse_option(o, "ar", "44100", options); + parse_option(o, "ac", "2", options); + + opt_default("packetsize", "2324"); + opt_default("muxrate", "1411200"); // 2352 * 75 * 8; + + /* We have to offset the PTS, so that it is consistent with the SCR. + SCR starts at 36000, but the first two packs contain only padding + and the first pack from the other stream, respectively, may also have + been written before. + So the real data starts at SCR 36000+3*1200. */ + o->mux_preload = (36000 + 3 * 1200) / 90000.0; // 0.44 + } else if (!strcmp(arg, "svcd")) { + + opt_video_codec(o, "c:v", "mpeg2video"); + opt_audio_codec(o, "c:a", "mp2"); + parse_option(o, "f", "svcd", options); + + parse_option(o, "s", norm == PAL ? "480x576" : "480x480", options); + parse_option(o, "r", frame_rates[norm], options); + opt_default("g", norm == PAL ? "15" : "18"); + + opt_default("b", "2040000"); + opt_default("maxrate", "2516000"); + opt_default("minrate", "0"); // 1145000; + opt_default("bufsize", "1835008"); // 224*1024*8; + opt_default("flags", "+scan_offset"); + + + opt_default("b:a", "224000"); + parse_option(o, "ar", "44100", options); + + opt_default("packetsize", "2324"); + + } else if (!strcmp(arg, "dvd")) { + + opt_video_codec(o, "c:v", "mpeg2video"); + opt_audio_codec(o, "c:a", "ac3"); + parse_option(o, "f", "dvd", options); + + parse_option(o, "s", norm == PAL ? "720x576" : "720x480", options); + parse_option(o, "r", frame_rates[norm], options); + opt_default("g", norm == PAL ? "15" : "18"); + + opt_default("b", "6000000"); + opt_default("maxrate", "9000000"); + opt_default("minrate", "0"); // 1500000; + opt_default("bufsize", "1835008"); // 224*1024*8; + + opt_default("packetsize", "2048"); // from www.mpucoder.com: DVD sectors contain 2048 bytes of data, this is also the size of one pack. + opt_default("muxrate", "10080000"); // from mplex project: data_rate = 1260000. mux_rate = data_rate * 8 + + opt_default("b:a", "448000"); + parse_option(o, "ar", "48000", options); + + } else if (!strncmp(arg, "dv", 2)) { + + parse_option(o, "f", "dv", options); + + parse_option(o, "s", norm == PAL ? "720x576" : "720x480", options); + parse_option(o, "pix_fmt", !strncmp(arg, "dv50", 4) ? "yuv422p" : + norm == PAL ? "yuv420p" : "yuv411p", options); + parse_option(o, "r", frame_rates[norm], options); + + parse_option(o, "ar", "48000", options); + parse_option(o, "ac", "2", options); + + } else { + av_log(NULL, AV_LOG_ERROR, "Unknown target: %s\n", arg); + return AVERROR(EINVAL); + } + return 0; +} + +static int opt_vstats_file(const char *opt, const char *arg) +{ + av_free (vstats_filename); + vstats_filename = av_strdup (arg); + return 0; +} + +static int opt_vstats(const char *opt, const char *arg) +{ + char filename[40]; + time_t today2 = time(NULL); + struct tm *today = localtime(&today2); + + snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, today->tm_min, + today->tm_sec); + return opt_vstats_file(opt, filename); +} + +static int opt_video_frames(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "frames:v", arg, options); +} + +static int opt_audio_frames(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "frames:a", arg, options); +} + +static int opt_data_frames(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "frames:d", arg, options); +} + +static int opt_video_tag(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "tag:v", arg, options); +} + +static int opt_audio_tag(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "tag:a", arg, options); +} + +static int opt_subtitle_tag(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "tag:s", arg, options); +} + +static int opt_video_filters(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "filter:v", arg, options); +} + +static int opt_audio_filters(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "filter:a", arg, options); +} + +static int opt_vsync(const char *opt, const char *arg) +{ + if (!av_strcasecmp(arg, "cfr")) video_sync_method = VSYNC_CFR; + else if (!av_strcasecmp(arg, "vfr")) video_sync_method = VSYNC_VFR; + else if (!av_strcasecmp(arg, "passthrough")) video_sync_method = VSYNC_PASSTHROUGH; + + if (video_sync_method == VSYNC_AUTO) + video_sync_method = parse_number_or_die("vsync", arg, OPT_INT, VSYNC_AUTO, VSYNC_VFR); + return 0; +} + +static int opt_deinterlace(const char *opt, const char *arg) +{ + av_log(NULL, AV_LOG_WARNING, "-%s is deprecated, use -filter:v yadif instead\n", opt); + do_deinterlace = 1; + return 0; +} + +int opt_cpuflags(const char *opt, const char *arg) +{ + int flags = av_parse_cpu_flags(arg); + + if (flags < 0) + return flags; + + av_set_cpu_flags_mask(flags); + return 0; +} + +static int opt_channel_layout(OptionsContext *o, const char *opt, const char *arg) +{ + char layout_str[32]; + char *stream_str; + char *ac_str; + int ret, channels, ac_str_size; + uint64_t layout; + + layout = av_get_channel_layout(arg); + if (!layout) { + av_log(NULL, AV_LOG_ERROR, "Unknown channel layout: %s\n", arg); + return AVERROR(EINVAL); + } + snprintf(layout_str, sizeof(layout_str), "%"PRIu64, layout); + ret = opt_default(opt, layout_str); + if (ret < 0) + return ret; + + /* set 'ac' option based on channel layout */ + channels = av_get_channel_layout_nb_channels(layout); + snprintf(layout_str, sizeof(layout_str), "%d", channels); + stream_str = strchr(opt, ':'); + ac_str_size = 3 + (stream_str ? strlen(stream_str) : 0); + ac_str = av_mallocz(ac_str_size); + if (!ac_str) + return AVERROR(ENOMEM); + av_strlcpy(ac_str, "ac", 3); + if (stream_str) + av_strlcat(ac_str, stream_str, ac_str_size); + ret = parse_option(o, ac_str, layout_str, options); + av_free(ac_str); + + return ret; +} + +static int opt_audio_qscale(OptionsContext *o, const char *opt, const char *arg) +{ + return parse_option(o, "q:a", arg, options); +} + +static int opt_filter_complex(const char *opt, const char *arg) +{ + filtergraphs = grow_array(filtergraphs, sizeof(*filtergraphs), + &nb_filtergraphs, nb_filtergraphs + 1); + if (!(filtergraphs[nb_filtergraphs - 1] = av_mallocz(sizeof(*filtergraphs[0])))) + return AVERROR(ENOMEM); + filtergraphs[nb_filtergraphs - 1]->index = nb_filtergraphs - 1; + filtergraphs[nb_filtergraphs - 1]->graph_desc = arg; + return 0; +} + +static void show_help(void) +{ + int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM; + av_log_set_callback(log_callback_help); + show_usage(); + show_help_options(options, "Main options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB, 0); + show_help_options(options, "\nAdvanced options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB, + OPT_EXPERT); + show_help_options(options, "\nVideo options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_VIDEO); + show_help_options(options, "\nAdvanced Video options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_VIDEO | OPT_EXPERT); + show_help_options(options, "\nAudio options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_AUDIO); + show_help_options(options, "\nAdvanced Audio options:\n", + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, + OPT_AUDIO | OPT_EXPERT); + show_help_options(options, "\nSubtitle options:\n", + OPT_SUBTITLE | OPT_GRAB, + OPT_SUBTITLE); + show_help_options(options, "\nAudio/Video grab options:\n", + OPT_GRAB, + OPT_GRAB); + printf("\n"); + show_help_children(avcodec_get_class(), flags); + show_help_children(avformat_get_class(), flags); + show_help_children(sws_get_class(), flags); +} + +void show_usage(void) +{ + printf("Hyper fast Audio and Video encoder\n"); + printf("usage: %s [options] [[infile options] -i infile]... {[outfile options] outfile}...\n", program_name); + printf("\n"); +} + + +#define OFFSET(x) offsetof(OptionsContext, x) +const OptionDef options[] = { + /* main options */ +#include "cmdutils_common_opts.h" + { "f", HAS_ARG | OPT_STRING | OPT_OFFSET, {.off = OFFSET(format)}, "force format", "fmt" }, + { "i", HAS_ARG | OPT_FUNC2, {(void*)opt_input_file}, "input file name", "filename" }, + { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" }, + { "c", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(codec_names)}, "codec name", "codec" }, + { "codec", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(codec_names)}, "codec name", "codec" }, + { "pre", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(presets)}, "preset name", "preset" }, + { "map", HAS_ARG | OPT_EXPERT | OPT_FUNC2, {(void*)opt_map}, "set input stream mapping", "[-]input_file_id[:stream_specifier][,sync_file_id[:stream_specifier]]" }, + { "map_metadata", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(metadata_map)}, "set metadata information of outfile from infile", + "outfile[,metadata]:infile[,metadata]" }, + { "map_chapters", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(chapters_input_file)}, "set chapters mapping", "input_file_index" }, + { "t", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(recording_time)}, "record or transcode \"duration\" seconds of audio/video", "duration" }, + { "fs", HAS_ARG | OPT_INT64 | OPT_OFFSET, {.off = OFFSET(limit_filesize)}, "set the limit file size in bytes", "limit_size" }, // + { "ss", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(start_time)}, "set the start time offset", "time_off" }, + { "itsoffset", HAS_ARG | OPT_TIME | OPT_OFFSET, {.off = OFFSET(input_ts_offset)}, "set the input ts offset", "time_off" }, + { "itsscale", HAS_ARG | OPT_DOUBLE | OPT_SPEC, {.off = OFFSET(ts_scale)}, "set the input ts scale", "scale" }, + { "metadata", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(metadata)}, "add metadata", "string=string" }, + { "dframes", HAS_ARG | OPT_FUNC2, {(void*)opt_data_frames}, "set the number of data frames to record", "number" }, + { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark}, + "add timings for benchmarking" }, + { "timelimit", HAS_ARG, {(void*)opt_timelimit}, "set max runtime in seconds", "limit" }, + { "dump", OPT_BOOL | OPT_EXPERT, {(void*)&do_pkt_dump}, + "dump each input packet" }, + { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, + "when dumping packets, also dump the payload" }, + { "re", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(rate_emu)}, "read input at native frame rate", "" }, + { "target", HAS_ARG | OPT_FUNC2, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" }, + { "vsync", HAS_ARG | OPT_EXPERT, {(void*)opt_vsync}, "video sync method", "" }, + { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" }, + { "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&audio_drift_threshold}, "audio drift threshold", "threshold" }, + { "copyts", OPT_BOOL | OPT_EXPERT, {(void*)©_ts}, "copy timestamps" }, + { "copytb", OPT_BOOL | OPT_EXPERT, {(void*)©_tb}, "copy input stream time base when stream copying" }, + { "shortest", OPT_BOOL | OPT_EXPERT, {(void*)&opt_shortest}, "finish encoding within shortest input" }, // + { "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&dts_delta_threshold}, "timestamp discontinuity delta threshold", "threshold" }, + { "xerror", OPT_BOOL, {(void*)&exit_on_error}, "exit on error", "error" }, + { "copyinkf", OPT_BOOL | OPT_EXPERT | OPT_SPEC, {.off = OFFSET(copy_initial_nonkeyframes)}, "copy initial non-keyframes" }, + { "frames", OPT_INT64 | HAS_ARG | OPT_SPEC, {.off = OFFSET(max_frames)}, "set the number of frames to record", "number" }, + { "tag", OPT_STRING | HAS_ARG | OPT_SPEC, {.off = OFFSET(codec_tags)}, "force codec tag/fourcc", "fourcc/tag" }, + { "q", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC, {.off = OFFSET(qscale)}, "use fixed quality scale (VBR)", "q" }, + { "qscale", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC, {.off = OFFSET(qscale)}, "use fixed quality scale (VBR)", "q" }, + { "filter", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(filters)}, "set stream filterchain", "filter_list" }, + { "filter_complex", HAS_ARG | OPT_EXPERT, {(void*)opt_filter_complex}, "create a complex filtergraph", "graph_description" }, + { "stats", OPT_BOOL, {&print_stats}, "print progress report during encoding", }, + { "attach", HAS_ARG | OPT_FUNC2, {(void*)opt_attach}, "add an attachment to the output file", "filename" }, + { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(dump_attachment)}, "extract an attachment into a file", "filename" }, + { "cpuflags", HAS_ARG | OPT_EXPERT, {(void*)opt_cpuflags}, "set CPU flags mask", "mask" }, + + /* video options */ + { "vframes", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_frames}, "set the number of video frames to record", "number" }, + { "r", HAS_ARG | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_rates)}, "set frame rate (Hz value, fraction or abbreviation)", "rate" }, + { "s", HAS_ARG | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_sizes)}, "set frame size (WxH or abbreviation)", "size" }, + { "aspect", HAS_ARG | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_aspect_ratios)}, "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" }, + { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(frame_pix_fmts)}, "set pixel format", "format" }, + { "vn", OPT_BOOL | OPT_VIDEO | OPT_OFFSET, {.off = OFFSET(video_disable)}, "disable video" }, + { "vdt", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_discard}, "discard threshold", "n" }, + { "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(rc_overrides)}, "rate control override for specific intervals", "override" }, + { "vcodec", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" }, + { "same_quant", OPT_BOOL | OPT_VIDEO, {(void*)&same_quant}, + "use same quantizer as source (implies VBR)" }, + { "pass", HAS_ARG | OPT_VIDEO, {(void*)opt_pass}, "select the pass number (1 or 2)", "n" }, + { "passlogfile", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void*)&pass_logfilename_prefix}, "select two pass log file name prefix", "prefix" }, + { "deinterlace", OPT_EXPERT | OPT_VIDEO, {(void*)opt_deinterlace}, + "this option is deprecated, use the yadif filter instead" }, + { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, + { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, + { "vf", HAS_ARG | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_filters}, "video filters", "filter list" }, + { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(intra_matrices)}, "specify intra matrix coeffs", "matrix" }, + { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_STRING | OPT_SPEC, {.off = OFFSET(inter_matrices)}, "specify inter matrix coeffs", "matrix" }, + { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_INT| OPT_SPEC, {.off = OFFSET(top_field_first)}, "top=1/bottom=0/auto=-1 field first", "" }, + { "dc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_dc_precision}, "intra_dc_precision", "precision" }, + { "vtag", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_FUNC2, {(void*)opt_video_tag}, "force video tag/fourcc", "fourcc/tag" }, + { "qphist", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&qp_hist }, "show QP histogram" }, + { "force_fps", OPT_BOOL | OPT_EXPERT | OPT_VIDEO | OPT_SPEC, {.off = OFFSET(force_fps)}, "force the selected framerate, disable the best supported framerate selection" }, + { "streamid", HAS_ARG | OPT_EXPERT | OPT_FUNC2, {(void*)opt_streamid}, "set the value of an outfile streamid", "streamIndex:value" }, + { "force_key_frames", OPT_STRING | HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_SPEC, {.off = OFFSET(forced_key_frames)}, "force key frames at specified timestamps", "timestamps" }, + + /* audio options */ + { "aframes", HAS_ARG | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_frames}, "set the number of audio frames to record", "number" }, + { "aq", HAS_ARG | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_qscale}, "set audio quality (codec-specific)", "quality", }, + { "ar", HAS_ARG | OPT_AUDIO | OPT_INT | OPT_SPEC, {.off = OFFSET(audio_sample_rate)}, "set audio sampling rate (in Hz)", "rate" }, + { "ac", HAS_ARG | OPT_AUDIO | OPT_INT | OPT_SPEC, {.off = OFFSET(audio_channels)}, "set number of audio channels", "channels" }, + { "an", OPT_BOOL | OPT_AUDIO | OPT_OFFSET, {.off = OFFSET(audio_disable)}, "disable audio" }, + { "acodec", HAS_ARG | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_codec}, "force audio codec ('copy' to copy stream)", "codec" }, + { "atag", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_tag}, "force audio tag/fourcc", "fourcc/tag" }, + { "vol", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&audio_volume}, "change audio volume (256=normal)" , "volume" }, // + { "sample_fmt", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_SPEC | OPT_STRING, {.off = OFFSET(sample_fmts)}, "set sample format", "format" }, + { "channel_layout", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_FUNC2, {(void*)opt_channel_layout}, "set channel layout", "layout" }, + { "af", HAS_ARG | OPT_AUDIO | OPT_FUNC2, {(void*)opt_audio_filters}, "audio filters", "filter list" }, + + /* subtitle options */ + { "sn", OPT_BOOL | OPT_SUBTITLE | OPT_OFFSET, {.off = OFFSET(subtitle_disable)}, "disable subtitle" }, + { "scodec", HAS_ARG | OPT_SUBTITLE | OPT_FUNC2, {(void*)opt_subtitle_codec}, "force subtitle codec ('copy' to copy stream)", "codec" }, + { "stag", HAS_ARG | OPT_EXPERT | OPT_SUBTITLE | OPT_FUNC2, {(void*)opt_subtitle_tag}, "force subtitle tag/fourcc", "fourcc/tag" }, + + /* grab options */ + { "isync", OPT_BOOL | OPT_EXPERT | OPT_GRAB, {(void*)&input_sync}, "sync read on input", "" }, + + /* muxer options */ + { "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(mux_max_delay)}, "set the maximum demux-decode delay", "seconds" }, + { "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(mux_preload)}, "set the initial demux-decode delay", "seconds" }, + + { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(bitstream_filters)}, "A comma-separated list of bitstream filters", "bitstream_filters" }, + + /* data codec support */ + { "dcodec", HAS_ARG | OPT_DATA | OPT_FUNC2, {(void*)opt_data_codec}, "force data codec ('copy' to copy stream)", "codec" }, + + { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, + { NULL, }, +}; -- cgit v1.2.3 From fe2147e93612cdcb4101b3b087f9a9f1835dba11 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 2 Aug 2012 08:24:02 +0200 Subject: avconv: split configuring filter configuration to a separate file. --- Makefile | 2 +- avconv.c | 529 ---------------------------------------------------- avconv.h | 2 + avconv_filter.c | 560 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 563 insertions(+), 530 deletions(-) create mode 100644 avconv_filter.c diff --git a/Makefile b/Makefile index 6477059c3f..1a4858d08d 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ PROGS-$(CONFIG_AVSERVER) += avserver PROGS := $(PROGS-yes:%=%$(EXESUF)) OBJS = cmdutils.o -OBJS-avconv = avconv_opt.o +OBJS-avconv = avconv_opt.o avconv_filter.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options TOOLS = qt-faststart trasher diff --git a/avconv.c b/avconv.c index ad4a975a1c..3b50dd4db1 100644 --- a/avconv.c +++ b/avconv.c @@ -111,535 +111,6 @@ int nb_output_files = 0; FilterGraph **filtergraphs; int nb_filtergraphs; -/** - * Define a function for building a string containing a list of - * allowed formats, - */ -#define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name, separator) \ -static char *choose_ ## var ## s(OutputStream *ost) \ -{ \ - if (ost->st->codec->var != none) { \ - get_name(ost->st->codec->var); \ - return av_strdup(name); \ - } else if (ost->enc->supported_list) { \ - const type *p; \ - AVIOContext *s = NULL; \ - uint8_t *ret; \ - int len; \ - \ - if (avio_open_dyn_buf(&s) < 0) \ - exit_program(1); \ - \ - for (p = ost->enc->supported_list; *p != none; p++) { \ - get_name(*p); \ - avio_printf(s, "%s" separator, name); \ - } \ - len = avio_close_dyn_buf(s, &ret); \ - ret[len - 1] = 0; \ - return ret; \ - } else \ - return NULL; \ -} - -#define GET_PIX_FMT_NAME(pix_fmt)\ - const char *name = av_get_pix_fmt_name(pix_fmt); - -DEF_CHOOSE_FORMAT(enum PixelFormat, pix_fmt, pix_fmts, PIX_FMT_NONE, - GET_PIX_FMT_NAME, ":") - -#define GET_SAMPLE_FMT_NAME(sample_fmt)\ - const char *name = av_get_sample_fmt_name(sample_fmt) - -DEF_CHOOSE_FORMAT(enum AVSampleFormat, sample_fmt, sample_fmts, - AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME, ",") - -#define GET_SAMPLE_RATE_NAME(rate)\ - char name[16];\ - snprintf(name, sizeof(name), "%d", rate); - -DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0, - GET_SAMPLE_RATE_NAME, ",") - -#define GET_CH_LAYOUT_NAME(ch_layout)\ - char name[16];\ - snprintf(name, sizeof(name), "0x%"PRIx64, ch_layout); - -DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0, - GET_CH_LAYOUT_NAME, ",") - -static FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost) -{ - FilterGraph *fg = av_mallocz(sizeof(*fg)); - - if (!fg) - exit_program(1); - fg->index = nb_filtergraphs; - - fg->outputs = grow_array(fg->outputs, sizeof(*fg->outputs), &fg->nb_outputs, - fg->nb_outputs + 1); - if (!(fg->outputs[0] = av_mallocz(sizeof(*fg->outputs[0])))) - exit_program(1); - fg->outputs[0]->ost = ost; - fg->outputs[0]->graph = fg; - - ost->filter = fg->outputs[0]; - - fg->inputs = grow_array(fg->inputs, sizeof(*fg->inputs), &fg->nb_inputs, - fg->nb_inputs + 1); - if (!(fg->inputs[0] = av_mallocz(sizeof(*fg->inputs[0])))) - exit_program(1); - fg->inputs[0]->ist = ist; - fg->inputs[0]->graph = fg; - - ist->filters = grow_array(ist->filters, sizeof(*ist->filters), - &ist->nb_filters, ist->nb_filters + 1); - ist->filters[ist->nb_filters - 1] = fg->inputs[0]; - - filtergraphs = grow_array(filtergraphs, sizeof(*filtergraphs), - &nb_filtergraphs, nb_filtergraphs + 1); - filtergraphs[nb_filtergraphs - 1] = fg; - - return fg; -} - -static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) -{ - InputStream *ist = NULL; - enum AVMediaType type = avfilter_pad_get_type(in->filter_ctx->input_pads, in->pad_idx); - int i; - - // TODO: support other filter types - if (type != AVMEDIA_TYPE_VIDEO && type != AVMEDIA_TYPE_AUDIO) { - av_log(NULL, AV_LOG_FATAL, "Only video and audio filters supported " - "currently.\n"); - exit_program(1); - } - - if (in->name) { - AVFormatContext *s; - AVStream *st = NULL; - char *p; - int file_idx = strtol(in->name, &p, 0); - - if (file_idx < 0 || file_idx >= nb_input_files) { - av_log(NULL, AV_LOG_FATAL, "Invalid file index %d in filtegraph description %s.\n", - file_idx, fg->graph_desc); - exit_program(1); - } - s = input_files[file_idx]->ctx; - - for (i = 0; i < s->nb_streams; i++) { - if (s->streams[i]->codec->codec_type != type) - continue; - if (check_stream_specifier(s, s->streams[i], *p == ':' ? p + 1 : p) == 1) { - st = s->streams[i]; - break; - } - } - if (!st) { - av_log(NULL, AV_LOG_FATAL, "Stream specifier '%s' in filtergraph description %s " - "matches no streams.\n", p, fg->graph_desc); - exit_program(1); - } - ist = input_streams[input_files[file_idx]->ist_index + st->index]; - } else { - /* find the first unused stream of corresponding type */ - for (i = 0; i < nb_input_streams; i++) { - ist = input_streams[i]; - if (ist->st->codec->codec_type == type && ist->discard) - break; - } - if (i == nb_input_streams) { - av_log(NULL, AV_LOG_FATAL, "Cannot find a matching stream for " - "unlabeled input pad %d on filter %s", in->pad_idx, - in->filter_ctx->name); - exit_program(1); - } - } - av_assert0(ist); - - ist->discard = 0; - ist->decoding_needed = 1; - ist->st->discard = AVDISCARD_NONE; - - fg->inputs = grow_array(fg->inputs, sizeof(*fg->inputs), - &fg->nb_inputs, fg->nb_inputs + 1); - if (!(fg->inputs[fg->nb_inputs - 1] = av_mallocz(sizeof(*fg->inputs[0])))) - exit_program(1); - fg->inputs[fg->nb_inputs - 1]->ist = ist; - fg->inputs[fg->nb_inputs - 1]->graph = fg; - - ist->filters = grow_array(ist->filters, sizeof(*ist->filters), - &ist->nb_filters, ist->nb_filters + 1); - ist->filters[ist->nb_filters - 1] = fg->inputs[fg->nb_inputs - 1]; -} - -static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) -{ - char *pix_fmts; - OutputStream *ost = ofilter->ost; - AVCodecContext *codec = ost->st->codec; - AVFilterContext *last_filter = out->filter_ctx; - int pad_idx = out->pad_idx; - int ret; - char name[255]; - - snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index); - ret = avfilter_graph_create_filter(&ofilter->filter, - avfilter_get_by_name("buffersink"), - name, NULL, pix_fmts, fg->graph); - if (ret < 0) - return ret; - - if (codec->width || codec->height) { - char args[255]; - AVFilterContext *filter; - - snprintf(args, sizeof(args), "%d:%d:flags=0x%X", - codec->width, - codec->height, - (unsigned)ost->sws_flags); - snprintf(name, sizeof(name), "scaler for output stream %d:%d", - ost->file_index, ost->index); - if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"), - name, args, NULL, fg->graph)) < 0) - return ret; - if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0) - return ret; - - last_filter = filter; - pad_idx = 0; - } - - if ((pix_fmts = choose_pix_fmts(ost))) { - AVFilterContext *filter; - snprintf(name, sizeof(name), "pixel format for output stream %d:%d", - ost->file_index, ost->index); - if ((ret = avfilter_graph_create_filter(&filter, - avfilter_get_by_name("format"), - "format", pix_fmts, NULL, - fg->graph)) < 0) - return ret; - if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0) - return ret; - - last_filter = filter; - pad_idx = 0; - av_freep(&pix_fmts); - } - - if (ost->frame_rate.num) { - AVFilterContext *fps; - char args[255]; - - snprintf(args, sizeof(args), "fps=%d/%d", ost->frame_rate.num, - ost->frame_rate.den); - snprintf(name, sizeof(name), "fps for output stream %d:%d", - ost->file_index, ost->index); - ret = avfilter_graph_create_filter(&fps, avfilter_get_by_name("fps"), - name, args, NULL, fg->graph); - if (ret < 0) - return ret; - - ret = avfilter_link(last_filter, pad_idx, fps, 0); - if (ret < 0) - return ret; - last_filter = fps; - pad_idx = 0; - } - - if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0) - return ret; - - return 0; -} - -static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) -{ - OutputStream *ost = ofilter->ost; - AVCodecContext *codec = ost->st->codec; - AVFilterContext *last_filter = out->filter_ctx; - int pad_idx = out->pad_idx; - char *sample_fmts, *sample_rates, *channel_layouts; - char name[255]; - int ret; - - - snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index); - ret = avfilter_graph_create_filter(&ofilter->filter, - avfilter_get_by_name("abuffersink"), - name, NULL, NULL, fg->graph); - if (ret < 0) - return ret; - - if (codec->channels && !codec->channel_layout) - codec->channel_layout = av_get_default_channel_layout(codec->channels); - - sample_fmts = choose_sample_fmts(ost); - sample_rates = choose_sample_rates(ost); - channel_layouts = choose_channel_layouts(ost); - if (sample_fmts || sample_rates || channel_layouts) { - AVFilterContext *format; - char args[256]; - int len = 0; - - if (sample_fmts) - len += snprintf(args + len, sizeof(args) - len, "sample_fmts=%s:", - sample_fmts); - if (sample_rates) - len += snprintf(args + len, sizeof(args) - len, "sample_rates=%s:", - sample_rates); - if (channel_layouts) - len += snprintf(args + len, sizeof(args) - len, "channel_layouts=%s:", - channel_layouts); - args[len - 1] = 0; - - av_freep(&sample_fmts); - av_freep(&sample_rates); - av_freep(&channel_layouts); - - snprintf(name, sizeof(name), "audio format for output stream %d:%d", - ost->file_index, ost->index); - ret = avfilter_graph_create_filter(&format, - avfilter_get_by_name("aformat"), - name, args, NULL, fg->graph); - if (ret < 0) - return ret; - - ret = avfilter_link(last_filter, pad_idx, format, 0); - if (ret < 0) - return ret; - - last_filter = format; - pad_idx = 0; - } - - if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0) - return ret; - - return 0; -} - -#define DESCRIBE_FILTER_LINK(f, inout, in) \ -{ \ - AVFilterContext *ctx = inout->filter_ctx; \ - AVFilterPad *pads = in ? ctx->input_pads : ctx->output_pads; \ - int nb_pads = in ? ctx->input_count : ctx->output_count; \ - AVIOContext *pb; \ - \ - if (avio_open_dyn_buf(&pb) < 0) \ - exit_program(1); \ - \ - avio_printf(pb, "%s", ctx->filter->name); \ - if (nb_pads > 1) \ - avio_printf(pb, ":%s", avfilter_pad_get_name(pads, inout->pad_idx));\ - avio_w8(pb, 0); \ - avio_close_dyn_buf(pb, &f->name); \ -} - -int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) -{ - av_freep(&ofilter->name); - DESCRIBE_FILTER_LINK(ofilter, out, 0); - - switch (avfilter_pad_get_type(out->filter_ctx->output_pads, out->pad_idx)) { - case AVMEDIA_TYPE_VIDEO: return configure_output_video_filter(fg, ofilter, out); - case AVMEDIA_TYPE_AUDIO: return configure_output_audio_filter(fg, ofilter, out); - default: av_assert0(0); - } -} - -static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, - AVFilterInOut *in) -{ - AVFilterContext *first_filter = in->filter_ctx; - AVFilter *filter = avfilter_get_by_name("buffer"); - InputStream *ist = ifilter->ist; - AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) : - ist->st->time_base; - AVRational sar; - char args[255], name[255]; - int pad_idx = in->pad_idx; - int ret; - - sar = ist->st->sample_aspect_ratio.num ? - ist->st->sample_aspect_ratio : - ist->st->codec->sample_aspect_ratio; - snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, - ist->st->codec->height, ist->st->codec->pix_fmt, - tb.num, tb.den, sar.num, sar.den); - snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, - ist->file_index, ist->st->index); - - if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, name, - args, NULL, fg->graph)) < 0) - return ret; - - if (ist->framerate.num) { - AVFilterContext *setpts; - - snprintf(name, sizeof(name), "force CFR for input from stream %d:%d", - ist->file_index, ist->st->index); - if ((ret = avfilter_graph_create_filter(&setpts, - avfilter_get_by_name("setpts"), - name, "N", NULL, - fg->graph)) < 0) - return ret; - - if ((ret = avfilter_link(setpts, 0, first_filter, pad_idx)) < 0) - return ret; - - first_filter = setpts; - pad_idx = 0; - } - - if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0) - return ret; - return 0; -} - -static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, - AVFilterInOut *in) -{ - AVFilterContext *first_filter = in->filter_ctx; - AVFilter *filter = avfilter_get_by_name("abuffer"); - InputStream *ist = ifilter->ist; - int pad_idx = in->pad_idx; - char args[255], name[255]; - int ret; - - snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s" - ":channel_layout=0x%"PRIx64, - 1, ist->st->codec->sample_rate, - ist->st->codec->sample_rate, - av_get_sample_fmt_name(ist->st->codec->sample_fmt), - ist->st->codec->channel_layout); - snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, - ist->file_index, ist->st->index); - - if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, - name, args, NULL, - fg->graph)) < 0) - return ret; - - if (audio_sync_method > 0) { - AVFilterContext *async; - char args[256]; - int len = 0; - - av_log(NULL, AV_LOG_WARNING, "-async has been deprecated. Used the " - "asyncts audio filter instead.\n"); - - if (audio_sync_method > 1) - len += snprintf(args + len, sizeof(args) - len, "compensate=1:" - "max_comp=%d:", audio_sync_method); - snprintf(args + len, sizeof(args) - len, "min_delta=%f", - audio_drift_threshold); - - snprintf(name, sizeof(name), "graph %d audio sync for input stream %d:%d", - fg->index, ist->file_index, ist->st->index); - ret = avfilter_graph_create_filter(&async, - avfilter_get_by_name("asyncts"), - name, args, NULL, fg->graph); - if (ret < 0) - return ret; - - ret = avfilter_link(async, 0, first_filter, pad_idx); - if (ret < 0) - return ret; - - first_filter = async; - pad_idx = 0; - } - if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0) - return ret; - - return 0; -} - -static int configure_input_filter(FilterGraph *fg, InputFilter *ifilter, - AVFilterInOut *in) -{ - av_freep(&ifilter->name); - DESCRIBE_FILTER_LINK(ifilter, in, 1); - - switch (avfilter_pad_get_type(in->filter_ctx->input_pads, in->pad_idx)) { - case AVMEDIA_TYPE_VIDEO: return configure_input_video_filter(fg, ifilter, in); - case AVMEDIA_TYPE_AUDIO: return configure_input_audio_filter(fg, ifilter, in); - default: av_assert0(0); - } -} - -int configure_filtergraph(FilterGraph *fg) -{ - AVFilterInOut *inputs, *outputs, *cur; - int ret, i, init = !fg->graph, simple = !fg->graph_desc; - const char *graph_desc = simple ? fg->outputs[0]->ost->avfilter : - fg->graph_desc; - - avfilter_graph_free(&fg->graph); - if (!(fg->graph = avfilter_graph_alloc())) - return AVERROR(ENOMEM); - - if (simple) { - OutputStream *ost = fg->outputs[0]->ost; - char args[255]; - snprintf(args, sizeof(args), "flags=0x%X", (unsigned)ost->sws_flags); - fg->graph->scale_sws_opts = av_strdup(args); - } - - if ((ret = avfilter_graph_parse2(fg->graph, graph_desc, &inputs, &outputs)) < 0) - return ret; - - if (simple && (!inputs || inputs->next || !outputs || outputs->next)) { - av_log(NULL, AV_LOG_ERROR, "Simple filtergraph '%s' does not have " - "exactly one input and output.\n", graph_desc); - return AVERROR(EINVAL); - } - - for (cur = inputs; !simple && init && cur; cur = cur->next) - init_input_filter(fg, cur); - - for (cur = inputs, i = 0; cur; cur = cur->next, i++) - if ((ret = configure_input_filter(fg, fg->inputs[i], cur)) < 0) - return ret; - avfilter_inout_free(&inputs); - - if (!init || simple) { - /* we already know the mappings between lavfi outputs and output streams, - * so we can finish the setup */ - for (cur = outputs, i = 0; cur; cur = cur->next, i++) - configure_output_filter(fg, fg->outputs[i], cur); - avfilter_inout_free(&outputs); - - if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0) - return ret; - } else { - /* wait until output mappings are processed */ - for (cur = outputs; cur;) { - fg->outputs = grow_array(fg->outputs, sizeof(*fg->outputs), - &fg->nb_outputs, fg->nb_outputs + 1); - if (!(fg->outputs[fg->nb_outputs - 1] = av_mallocz(sizeof(*fg->outputs[0])))) - exit_program(1); - fg->outputs[fg->nb_outputs - 1]->graph = fg; - fg->outputs[fg->nb_outputs - 1]->out_tmp = cur; - cur = cur->next; - fg->outputs[fg->nb_outputs - 1]->out_tmp->next = NULL; - } - } - - return 0; -} - -static int ist_in_filtergraph(FilterGraph *fg, InputStream *ist) -{ - int i; - for (i = 0; i < fg->nb_inputs; i++) - if (fg->inputs[i]->ist == ist) - return 1; - return 0; -} - static void term_exit(void) { av_log(NULL, AV_LOG_QUIET, ""); diff --git a/avconv.h b/avconv.h index fb720d6259..d8bf78b419 100644 --- a/avconv.h +++ b/avconv.h @@ -356,5 +356,7 @@ int guess_input_channel_layout(InputStream *ist); int configure_filtergraph(FilterGraph *fg); int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out); +int ist_in_filtergraph(FilterGraph *fg, InputStream *ist); +FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost); #endif /* AVCONV_H */ diff --git a/avconv_filter.c b/avconv_filter.c new file mode 100644 index 0000000000..d0ab4dcaf8 --- /dev/null +++ b/avconv_filter.c @@ -0,0 +1,560 @@ +/* + * avconv filter configuration + * + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avconv.h" + +#include "libavfilter/avfilter.h" +#include "libavfilter/avfiltergraph.h" + +#include "libavutil/audioconvert.h" +#include "libavutil/avassert.h" +#include "libavutil/pixdesc.h" +#include "libavutil/pixfmt.h" +#include "libavutil/samplefmt.h" + +/** + * Define a function for building a string containing a list of + * allowed formats, + */ +#define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name, separator)\ +static char *choose_ ## var ## s(OutputStream *ost) \ +{ \ + if (ost->st->codec->var != none) { \ + get_name(ost->st->codec->var); \ + return av_strdup(name); \ + } else if (ost->enc->supported_list) { \ + const type *p; \ + AVIOContext *s = NULL; \ + uint8_t *ret; \ + int len; \ + \ + if (avio_open_dyn_buf(&s) < 0) \ + exit_program(1); \ + \ + for (p = ost->enc->supported_list; *p != none; p++) { \ + get_name(*p); \ + avio_printf(s, "%s" separator, name); \ + } \ + len = avio_close_dyn_buf(s, &ret); \ + ret[len - 1] = 0; \ + return ret; \ + } else \ + return NULL; \ +} + +#define GET_PIX_FMT_NAME(pix_fmt)\ + const char *name = av_get_pix_fmt_name(pix_fmt); + +DEF_CHOOSE_FORMAT(enum PixelFormat, pix_fmt, pix_fmts, PIX_FMT_NONE, + GET_PIX_FMT_NAME, ":") + +#define GET_SAMPLE_FMT_NAME(sample_fmt)\ + const char *name = av_get_sample_fmt_name(sample_fmt) + +DEF_CHOOSE_FORMAT(enum AVSampleFormat, sample_fmt, sample_fmts, + AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME, ",") + +#define GET_SAMPLE_RATE_NAME(rate)\ + char name[16];\ + snprintf(name, sizeof(name), "%d", rate); + +DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0, + GET_SAMPLE_RATE_NAME, ",") + +#define GET_CH_LAYOUT_NAME(ch_layout)\ + char name[16];\ + snprintf(name, sizeof(name), "0x%"PRIx64, ch_layout); + +DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0, + GET_CH_LAYOUT_NAME, ",") + +FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost) +{ + FilterGraph *fg = av_mallocz(sizeof(*fg)); + + if (!fg) + exit_program(1); + fg->index = nb_filtergraphs; + + fg->outputs = grow_array(fg->outputs, sizeof(*fg->outputs), &fg->nb_outputs, + fg->nb_outputs + 1); + if (!(fg->outputs[0] = av_mallocz(sizeof(*fg->outputs[0])))) + exit_program(1); + fg->outputs[0]->ost = ost; + fg->outputs[0]->graph = fg; + + ost->filter = fg->outputs[0]; + + fg->inputs = grow_array(fg->inputs, sizeof(*fg->inputs), &fg->nb_inputs, + fg->nb_inputs + 1); + if (!(fg->inputs[0] = av_mallocz(sizeof(*fg->inputs[0])))) + exit_program(1); + fg->inputs[0]->ist = ist; + fg->inputs[0]->graph = fg; + + ist->filters = grow_array(ist->filters, sizeof(*ist->filters), + &ist->nb_filters, ist->nb_filters + 1); + ist->filters[ist->nb_filters - 1] = fg->inputs[0]; + + filtergraphs = grow_array(filtergraphs, sizeof(*filtergraphs), + &nb_filtergraphs, nb_filtergraphs + 1); + filtergraphs[nb_filtergraphs - 1] = fg; + + return fg; +} + +static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) +{ + InputStream *ist = NULL; + enum AVMediaType type = avfilter_pad_get_type(in->filter_ctx->input_pads, in->pad_idx); + int i; + + // TODO: support other filter types + if (type != AVMEDIA_TYPE_VIDEO && type != AVMEDIA_TYPE_AUDIO) { + av_log(NULL, AV_LOG_FATAL, "Only video and audio filters supported " + "currently.\n"); + exit_program(1); + } + + if (in->name) { + AVFormatContext *s; + AVStream *st = NULL; + char *p; + int file_idx = strtol(in->name, &p, 0); + + if (file_idx < 0 || file_idx >= nb_input_files) { + av_log(NULL, AV_LOG_FATAL, "Invalid file index %d in filtegraph description %s.\n", + file_idx, fg->graph_desc); + exit_program(1); + } + s = input_files[file_idx]->ctx; + + for (i = 0; i < s->nb_streams; i++) { + if (s->streams[i]->codec->codec_type != type) + continue; + if (check_stream_specifier(s, s->streams[i], *p == ':' ? p + 1 : p) == 1) { + st = s->streams[i]; + break; + } + } + if (!st) { + av_log(NULL, AV_LOG_FATAL, "Stream specifier '%s' in filtergraph description %s " + "matches no streams.\n", p, fg->graph_desc); + exit_program(1); + } + ist = input_streams[input_files[file_idx]->ist_index + st->index]; + } else { + /* find the first unused stream of corresponding type */ + for (i = 0; i < nb_input_streams; i++) { + ist = input_streams[i]; + if (ist->st->codec->codec_type == type && ist->discard) + break; + } + if (i == nb_input_streams) { + av_log(NULL, AV_LOG_FATAL, "Cannot find a matching stream for " + "unlabeled input pad %d on filter %s", in->pad_idx, + in->filter_ctx->name); + exit_program(1); + } + } + av_assert0(ist); + + ist->discard = 0; + ist->decoding_needed = 1; + ist->st->discard = AVDISCARD_NONE; + + fg->inputs = grow_array(fg->inputs, sizeof(*fg->inputs), + &fg->nb_inputs, fg->nb_inputs + 1); + if (!(fg->inputs[fg->nb_inputs - 1] = av_mallocz(sizeof(*fg->inputs[0])))) + exit_program(1); + fg->inputs[fg->nb_inputs - 1]->ist = ist; + fg->inputs[fg->nb_inputs - 1]->graph = fg; + + ist->filters = grow_array(ist->filters, sizeof(*ist->filters), + &ist->nb_filters, ist->nb_filters + 1); + ist->filters[ist->nb_filters - 1] = fg->inputs[fg->nb_inputs - 1]; +} + +static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) +{ + char *pix_fmts; + OutputStream *ost = ofilter->ost; + AVCodecContext *codec = ost->st->codec; + AVFilterContext *last_filter = out->filter_ctx; + int pad_idx = out->pad_idx; + int ret; + char name[255]; + + snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index); + ret = avfilter_graph_create_filter(&ofilter->filter, + avfilter_get_by_name("buffersink"), + name, NULL, pix_fmts, fg->graph); + if (ret < 0) + return ret; + + if (codec->width || codec->height) { + char args[255]; + AVFilterContext *filter; + + snprintf(args, sizeof(args), "%d:%d:flags=0x%X", + codec->width, + codec->height, + (unsigned)ost->sws_flags); + snprintf(name, sizeof(name), "scaler for output stream %d:%d", + ost->file_index, ost->index); + if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"), + name, args, NULL, fg->graph)) < 0) + return ret; + if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0) + return ret; + + last_filter = filter; + pad_idx = 0; + } + + if ((pix_fmts = choose_pix_fmts(ost))) { + AVFilterContext *filter; + snprintf(name, sizeof(name), "pixel format for output stream %d:%d", + ost->file_index, ost->index); + if ((ret = avfilter_graph_create_filter(&filter, + avfilter_get_by_name("format"), + "format", pix_fmts, NULL, + fg->graph)) < 0) + return ret; + if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0) + return ret; + + last_filter = filter; + pad_idx = 0; + av_freep(&pix_fmts); + } + + if (ost->frame_rate.num) { + AVFilterContext *fps; + char args[255]; + + snprintf(args, sizeof(args), "fps=%d/%d", ost->frame_rate.num, + ost->frame_rate.den); + snprintf(name, sizeof(name), "fps for output stream %d:%d", + ost->file_index, ost->index); + ret = avfilter_graph_create_filter(&fps, avfilter_get_by_name("fps"), + name, args, NULL, fg->graph); + if (ret < 0) + return ret; + + ret = avfilter_link(last_filter, pad_idx, fps, 0); + if (ret < 0) + return ret; + last_filter = fps; + pad_idx = 0; + } + + if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0) + return ret; + + return 0; +} + +static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) +{ + OutputStream *ost = ofilter->ost; + AVCodecContext *codec = ost->st->codec; + AVFilterContext *last_filter = out->filter_ctx; + int pad_idx = out->pad_idx; + char *sample_fmts, *sample_rates, *channel_layouts; + char name[255]; + int ret; + + + snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index); + ret = avfilter_graph_create_filter(&ofilter->filter, + avfilter_get_by_name("abuffersink"), + name, NULL, NULL, fg->graph); + if (ret < 0) + return ret; + + if (codec->channels && !codec->channel_layout) + codec->channel_layout = av_get_default_channel_layout(codec->channels); + + sample_fmts = choose_sample_fmts(ost); + sample_rates = choose_sample_rates(ost); + channel_layouts = choose_channel_layouts(ost); + if (sample_fmts || sample_rates || channel_layouts) { + AVFilterContext *format; + char args[256]; + int len = 0; + + if (sample_fmts) + len += snprintf(args + len, sizeof(args) - len, "sample_fmts=%s:", + sample_fmts); + if (sample_rates) + len += snprintf(args + len, sizeof(args) - len, "sample_rates=%s:", + sample_rates); + if (channel_layouts) + len += snprintf(args + len, sizeof(args) - len, "channel_layouts=%s:", + channel_layouts); + args[len - 1] = 0; + + av_freep(&sample_fmts); + av_freep(&sample_rates); + av_freep(&channel_layouts); + + snprintf(name, sizeof(name), "audio format for output stream %d:%d", + ost->file_index, ost->index); + ret = avfilter_graph_create_filter(&format, + avfilter_get_by_name("aformat"), + name, args, NULL, fg->graph); + if (ret < 0) + return ret; + + ret = avfilter_link(last_filter, pad_idx, format, 0); + if (ret < 0) + return ret; + + last_filter = format; + pad_idx = 0; + } + + if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0) + return ret; + + return 0; +} + +#define DESCRIBE_FILTER_LINK(f, inout, in) \ +{ \ + AVFilterContext *ctx = inout->filter_ctx; \ + AVFilterPad *pads = in ? ctx->input_pads : ctx->output_pads; \ + int nb_pads = in ? ctx->input_count : ctx->output_count; \ + AVIOContext *pb; \ + \ + if (avio_open_dyn_buf(&pb) < 0) \ + exit_program(1); \ + \ + avio_printf(pb, "%s", ctx->filter->name); \ + if (nb_pads > 1) \ + avio_printf(pb, ":%s", avfilter_pad_get_name(pads, inout->pad_idx));\ + avio_w8(pb, 0); \ + avio_close_dyn_buf(pb, &f->name); \ +} + +int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) +{ + av_freep(&ofilter->name); + DESCRIBE_FILTER_LINK(ofilter, out, 0); + + switch (avfilter_pad_get_type(out->filter_ctx->output_pads, out->pad_idx)) { + case AVMEDIA_TYPE_VIDEO: return configure_output_video_filter(fg, ofilter, out); + case AVMEDIA_TYPE_AUDIO: return configure_output_audio_filter(fg, ofilter, out); + default: av_assert0(0); + } +} + +static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, + AVFilterInOut *in) +{ + AVFilterContext *first_filter = in->filter_ctx; + AVFilter *filter = avfilter_get_by_name("buffer"); + InputStream *ist = ifilter->ist; + AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) : + ist->st->time_base; + AVRational sar; + char args[255], name[255]; + int pad_idx = in->pad_idx; + int ret; + + sar = ist->st->sample_aspect_ratio.num ? + ist->st->sample_aspect_ratio : + ist->st->codec->sample_aspect_ratio; + snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, + ist->st->codec->height, ist->st->codec->pix_fmt, + tb.num, tb.den, sar.num, sar.den); + snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, + ist->file_index, ist->st->index); + + if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, name, + args, NULL, fg->graph)) < 0) + return ret; + + if (ist->framerate.num) { + AVFilterContext *setpts; + + snprintf(name, sizeof(name), "force CFR for input from stream %d:%d", + ist->file_index, ist->st->index); + if ((ret = avfilter_graph_create_filter(&setpts, + avfilter_get_by_name("setpts"), + name, "N", NULL, + fg->graph)) < 0) + return ret; + + if ((ret = avfilter_link(setpts, 0, first_filter, pad_idx)) < 0) + return ret; + + first_filter = setpts; + pad_idx = 0; + } + + if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0) + return ret; + return 0; +} + +static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, + AVFilterInOut *in) +{ + AVFilterContext *first_filter = in->filter_ctx; + AVFilter *filter = avfilter_get_by_name("abuffer"); + InputStream *ist = ifilter->ist; + int pad_idx = in->pad_idx; + char args[255], name[255]; + int ret; + + snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s" + ":channel_layout=0x%"PRIx64, + 1, ist->st->codec->sample_rate, + ist->st->codec->sample_rate, + av_get_sample_fmt_name(ist->st->codec->sample_fmt), + ist->st->codec->channel_layout); + snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, + ist->file_index, ist->st->index); + + if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, + name, args, NULL, + fg->graph)) < 0) + return ret; + + if (audio_sync_method > 0) { + AVFilterContext *async; + char args[256]; + int len = 0; + + av_log(NULL, AV_LOG_WARNING, "-async has been deprecated. Used the " + "asyncts audio filter instead.\n"); + + if (audio_sync_method > 1) + len += snprintf(args + len, sizeof(args) - len, "compensate=1:" + "max_comp=%d:", audio_sync_method); + snprintf(args + len, sizeof(args) - len, "min_delta=%f", + audio_drift_threshold); + + snprintf(name, sizeof(name), "graph %d audio sync for input stream %d:%d", + fg->index, ist->file_index, ist->st->index); + ret = avfilter_graph_create_filter(&async, + avfilter_get_by_name("asyncts"), + name, args, NULL, fg->graph); + if (ret < 0) + return ret; + + ret = avfilter_link(async, 0, first_filter, pad_idx); + if (ret < 0) + return ret; + + first_filter = async; + pad_idx = 0; + } + if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0) + return ret; + + return 0; +} + +static int configure_input_filter(FilterGraph *fg, InputFilter *ifilter, + AVFilterInOut *in) +{ + av_freep(&ifilter->name); + DESCRIBE_FILTER_LINK(ifilter, in, 1); + + switch (avfilter_pad_get_type(in->filter_ctx->input_pads, in->pad_idx)) { + case AVMEDIA_TYPE_VIDEO: return configure_input_video_filter(fg, ifilter, in); + case AVMEDIA_TYPE_AUDIO: return configure_input_audio_filter(fg, ifilter, in); + default: av_assert0(0); + } +} + +int configure_filtergraph(FilterGraph *fg) +{ + AVFilterInOut *inputs, *outputs, *cur; + int ret, i, init = !fg->graph, simple = !fg->graph_desc; + const char *graph_desc = simple ? fg->outputs[0]->ost->avfilter : + fg->graph_desc; + + avfilter_graph_free(&fg->graph); + if (!(fg->graph = avfilter_graph_alloc())) + return AVERROR(ENOMEM); + + if (simple) { + OutputStream *ost = fg->outputs[0]->ost; + char args[255]; + snprintf(args, sizeof(args), "flags=0x%X", (unsigned)ost->sws_flags); + fg->graph->scale_sws_opts = av_strdup(args); + } + + if ((ret = avfilter_graph_parse2(fg->graph, graph_desc, &inputs, &outputs)) < 0) + return ret; + + if (simple && (!inputs || inputs->next || !outputs || outputs->next)) { + av_log(NULL, AV_LOG_ERROR, "Simple filtergraph '%s' does not have " + "exactly one input and output.\n", graph_desc); + return AVERROR(EINVAL); + } + + for (cur = inputs; !simple && init && cur; cur = cur->next) + init_input_filter(fg, cur); + + for (cur = inputs, i = 0; cur; cur = cur->next, i++) + if ((ret = configure_input_filter(fg, fg->inputs[i], cur)) < 0) + return ret; + avfilter_inout_free(&inputs); + + if (!init || simple) { + /* we already know the mappings between lavfi outputs and output streams, + * so we can finish the setup */ + for (cur = outputs, i = 0; cur; cur = cur->next, i++) + configure_output_filter(fg, fg->outputs[i], cur); + avfilter_inout_free(&outputs); + + if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0) + return ret; + } else { + /* wait until output mappings are processed */ + for (cur = outputs; cur;) { + fg->outputs = grow_array(fg->outputs, sizeof(*fg->outputs), + &fg->nb_outputs, fg->nb_outputs + 1); + if (!(fg->outputs[fg->nb_outputs - 1] = av_mallocz(sizeof(*fg->outputs[0])))) + exit_program(1); + fg->outputs[fg->nb_outputs - 1]->graph = fg; + fg->outputs[fg->nb_outputs - 1]->out_tmp = cur; + cur = cur->next; + fg->outputs[fg->nb_outputs - 1]->out_tmp->next = NULL; + } + } + + return 0; +} + +int ist_in_filtergraph(FilterGraph *fg, InputStream *ist) +{ + int i; + for (i = 0; i < fg->nb_inputs; i++) + if (fg->inputs[i]->ist == ist) + return 1; + return 0; +} + -- cgit v1.2.3 From 1a4b55678665b4222766db8ef116256abc3fd013 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Wed, 8 Aug 2012 12:30:47 +0400 Subject: avplay: fix build with lavfi disabled. Issue introduced in 67339f6e. Signed-off-by: Anton Khirnov --- avplay.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/avplay.c b/avplay.c index ee069b58dd..3f2c4256c2 100644 --- a/avplay.c +++ b/avplay.c @@ -2236,7 +2236,9 @@ static void stream_component_close(VideoState *is, int stream_index) ic->streams[stream_index]->discard = AVDISCARD_ALL; avcodec_close(avctx); +#if CONFIG_AVFILTER free_buffer_pool(&is->buffer_pool); +#endif switch (avctx->codec_type) { case AVMEDIA_TYPE_AUDIO: is->audio_st = NULL; -- cgit v1.2.3 From 385ec296f1b39a2f49d1e897a2606c29da173f6a Mon Sep 17 00:00:00 2001 From: Mohammad Alsaleh Date: Tue, 7 Aug 2012 21:31:51 +0000 Subject: id3v2: Support v2.2 PIC id3 v2.2 uses image format ("JPG","PNG") instead of mimetypes. Currently, the attached picture is skipped because the format string does not match a known picture mimetype. This patch fixes this behaviour. Signed-off-by: Mohammad Alsaleh Signed-off-by: Anton Khirnov --- libavformat/id3v2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 7a229d20fc..650dd596a4 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -118,6 +118,8 @@ const CodecMime ff_id3v2_mime_tags[] = { {"image/png" , AV_CODEC_ID_PNG}, {"image/tiff", AV_CODEC_ID_TIFF}, {"image/bmp", AV_CODEC_ID_BMP}, + {"JPG", AV_CODEC_ID_MJPEG}, /* ID3v2.2 */ + {"PNG" , AV_CODEC_ID_PNG}, /* ID3v2.2 */ {"", AV_CODEC_ID_NONE}, }; -- cgit v1.2.3 From f86b2f36612debf10a07300acadba08f7b092bcb Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Mon, 6 Aug 2012 20:25:16 +0200 Subject: g723_1: use all LPC vectors in formant postfilter Due to some mistake LPC vector for the first subframe was used for all subframes instead of their own LPC vectors. --- libavcodec/g723_1.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index 9770dd6cf7..aabb03d447 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -946,6 +946,7 @@ static void formant_postfilter(G723_1_Context *p, int16_t *lpc, int16_t *buf) } iir_filter(filter_coef[0], filter_coef[1], buf + i, filter_signal + i); + lpc += LPC_ORDER; } memcpy(p->fir_mem, buf + FRAME_LEN, LPC_ORDER * sizeof(*p->fir_mem)); -- cgit v1.2.3 From e78e6c37efc98189c4c3d89acd3265d7a7ba6d05 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Tue, 7 Aug 2012 19:32:20 +0200 Subject: g723_1: clip argument for 15-bit version of normalize_bits() It expects maximum value to be 32767 but calculations in scale_vector() which uses this function can give it ABS(-32768) which leads to wrong result and thus clipping is needed. --- libavcodec/g723_1.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index aabb03d447..e917f5a50c 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -290,6 +290,7 @@ static int scale_vector(int16_t *vector, int length) for (i = 0; i < length; i++) max = FFMAX(max, FFABS(vector[i])); + max = FFMIN(max, 0x7FFF); bits = normalize_bits(max, 15); scale = (bits == 15) ? 0x7FFF : (1 << bits); -- cgit v1.2.3 From 82613564cfae459796642b22fc0163927d7f49e0 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 8 Aug 2012 11:49:02 +0200 Subject: rtmp: send check_bw as notification Set the transactionId to 0 to signal the server a return _result/_error is not expected. Solves the problems experienced with strict rtmp servers. --- libavformat/rtmp.h | 9 +++++++++ libavformat/rtmpproto.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libavformat/rtmp.h b/libavformat/rtmp.h index b9c5f1e430..c9aa67e056 100644 --- a/libavformat/rtmp.h +++ b/libavformat/rtmp.h @@ -32,6 +32,15 @@ #define HMAC_IPAD_VAL 0x36 #define HMAC_OPAD_VAL 0x5C +/** + * A non-zero transaction id requires the server to send back + * a _result or _error response. + * Setting it to 0 marks the message as a notification not + * requiring feedback. + */ + +#define RTMP_NOTIFICATION 0 + /** * emulated Flash client version - 9.0.124.2 on Linux * @{ diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 19b6874791..f6607774c2 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -573,7 +573,7 @@ static int gen_check_bw(URLContext *s, RTMPContext *rt) p = pkt.data; ff_amf_write_string(&p, "_checkbw"); - ff_amf_write_number(&p, ++rt->nb_invokes); + ff_amf_write_number(&p, RTMP_NOTIFICATION); ff_amf_write_null(&p); ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, -- cgit v1.2.3 From 69ac6400b8b77b200bce50d04292ea65c0edeefa Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mon, 6 Aug 2012 19:43:36 +0200 Subject: fate: add test for RTjpeg in nuv with frameheader Renames the old test to allow using fate-nuv as group for all nuv tests. --- tests/fate/video.mak | 10 +++++++-- tests/ref/fate/nuv | 10 --------- tests/ref/fate/nuv-rtjpeg | 10 +++++++++ tests/ref/fate/nuv-rtjpeg-fh | 51 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 12 deletions(-) delete mode 100644 tests/ref/fate/nuv create mode 100644 tests/ref/fate/nuv-rtjpeg create mode 100644 tests/ref/fate/nuv-rtjpeg-fh diff --git a/tests/fate/video.mak b/tests/fate/video.mak index e173c4a4b8..b36554f3b1 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -164,8 +164,14 @@ FATE_SAMPLES_AVCONV += fate-mpeg2-field-enc fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an # FIXME dropped frames in this test because of coarse timebase -FATE_SAMPLES_AVCONV += fate-nuv -fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an +FATE_NUV += fate-nuv-rtjpeg +fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an + +FATE_NUV += fate-nuv-rtjpeg-fh +fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/rtjpeg_frameheader.nuv -an + +FATE_SAMPLES_AVCONV += $(FATE_NUV) +fate-nuv: $(FATE_NUV) FATE_SAMPLES_AVCONV += fate-qpeg fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24 diff --git a/tests/ref/fate/nuv b/tests/ref/fate/nuv deleted file mode 100644 index e9286d6a6d..0000000000 --- a/tests/ref/fate/nuv +++ /dev/null @@ -1,10 +0,0 @@ -#tb 0: 1/1000 -0, 118, 118, 0, 460800, 0x54aedafe -0, 152, 152, 0, 460800, 0xb7aa8b56 -0, 177, 177, 0, 460800, 0x283ea3b5 -0, 202, 202, 0, 460800, 0x283ea3b5 -0, 235, 235, 0, 460800, 0x10e577de -0, 269, 269, 0, 460800, 0x4e091ee2 -0, 302, 302, 0, 460800, 0x2ea88828 -0, 335, 335, 0, 460800, 0x4b7f4df0 -0, 369, 369, 0, 460800, 0xb30eb322 diff --git a/tests/ref/fate/nuv-rtjpeg b/tests/ref/fate/nuv-rtjpeg new file mode 100644 index 0000000000..e9286d6a6d --- /dev/null +++ b/tests/ref/fate/nuv-rtjpeg @@ -0,0 +1,10 @@ +#tb 0: 1/1000 +0, 118, 118, 0, 460800, 0x54aedafe +0, 152, 152, 0, 460800, 0xb7aa8b56 +0, 177, 177, 0, 460800, 0x283ea3b5 +0, 202, 202, 0, 460800, 0x283ea3b5 +0, 235, 235, 0, 460800, 0x10e577de +0, 269, 269, 0, 460800, 0x4e091ee2 +0, 302, 302, 0, 460800, 0x2ea88828 +0, 335, 335, 0, 460800, 0x4b7f4df0 +0, 369, 369, 0, 460800, 0xb30eb322 diff --git a/tests/ref/fate/nuv-rtjpeg-fh b/tests/ref/fate/nuv-rtjpeg-fh new file mode 100644 index 0000000000..92aa122ac3 --- /dev/null +++ b/tests/ref/fate/nuv-rtjpeg-fh @@ -0,0 +1,51 @@ +#tb 0: 1/1000 +0, 0, 0, 0, 221184, 0xf48c94f6 +0, 40, 40, 0, 221184, 0x89b625b2 +0, 60, 60, 0, 221184, 0x37e04714 +0, 80, 80, 0, 221184, 0x4f4c5224 +0, 100, 100, 0, 221184, 0x9193c9f1 +0, 120, 120, 0, 221184, 0x5d1a6197 +0, 140, 140, 0, 221184, 0x40cd51e7 +0, 160, 160, 0, 221184, 0xb2c1a729 +0, 200, 200, 0, 221184, 0x998d6144 +0, 220, 220, 0, 221184, 0xf5d52311 +0, 240, 240, 0, 221184, 0xea9dd6bf +0, 260, 260, 0, 221184, 0x0e2ed854 +0, 280, 280, 0, 221184, 0xe295ba58 +0, 300, 300, 0, 221184, 0x8aedbb69 +0, 320, 320, 0, 221184, 0x253c9aaa +0, 340, 340, 0, 221184, 0x5eaf9fb1 +0, 360, 360, 0, 221184, 0xcdb5a0cb +0, 380, 380, 0, 221184, 0xcdb5a0cb +0, 400, 400, 0, 221184, 0x23f89994 +0, 420, 420, 0, 221184, 0x23f89994 +0, 440, 440, 0, 221184, 0x10dc98d6 +0, 460, 460, 0, 221184, 0x799b9d98 +0, 480, 480, 0, 221184, 0xb226996c +0, 500, 500, 0, 221184, 0x0ac59a42 +0, 520, 520, 0, 221184, 0x87c2a654 +0, 540, 540, 0, 221184, 0xf4c1a711 +0, 560, 560, 0, 221184, 0xf60fa72e +0, 580, 580, 0, 221184, 0xc8f8b6fc +0, 600, 600, 0, 221184, 0xd709b813 +0, 620, 620, 0, 221184, 0x5fdfb76b +0, 640, 640, 0, 221184, 0x5798b0aa +0, 660, 660, 0, 221184, 0xf572b1c3 +0, 680, 680, 0, 221184, 0x14b0afdf +0, 700, 700, 0, 221184, 0x0a66b5b8 +0, 720, 720, 0, 221184, 0xe316c620 +0, 740, 740, 0, 221184, 0xbc76c5c2 +0, 760, 760, 0, 221184, 0x77c7c5e5 +0, 780, 780, 0, 221184, 0xfc7ac63e +0, 800, 800, 0, 221184, 0x05a29ffe +0, 820, 820, 0, 221184, 0x9bffbf6c +0, 840, 840, 0, 221184, 0x3c55be40 +0, 860, 860, 0, 221184, 0x6f46c14e +0, 880, 880, 0, 221184, 0x9cf4ae70 +0, 900, 900, 0, 221184, 0xf205b2f8 +0, 920, 920, 0, 221184, 0x7180aff8 +0, 940, 940, 0, 221184, 0x125eaffe +0, 960, 960, 0, 221184, 0x6970a32d +0, 980, 980, 0, 221184, 0xaea79f62 +0, 1000, 1000, 0, 221184, 0x48d2a093 +0, 1020, 1020, 0, 221184, 0x10a59eb5 -- cgit v1.2.3 From 197439c1efc84b8698904590b69bd36db86e1c24 Mon Sep 17 00:00:00 2001 From: Dave Yeo Date: Tue, 7 Aug 2012 21:46:33 -0700 Subject: x86: pngdsp: Fix assembly for OS/2 The a.out object format does not allow aligning sections. On OS/2 LD aligns sections to 16 bytes. Signed-off-by: Diego Biurrun --- libavcodec/x86/pngdsp.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/x86/pngdsp.asm b/libavcodec/x86/pngdsp.asm index d6e6374c89..970f3db6f1 100644 --- a/libavcodec/x86/pngdsp.asm +++ b/libavcodec/x86/pngdsp.asm @@ -28,7 +28,7 @@ SECTION_RODATA cextern pw_255 -section .text align=16 +SECTION_TEXT ; %1 = nr. of xmm registers used %macro ADD_BYTES_FN 1 -- cgit v1.2.3 From 5864eb427f2f05342136f3bc9727d826e68d8dbf Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 8 Aug 2012 02:41:57 +0200 Subject: build: cosmetics: Reorder some lists in a more logical fashion --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1a4858d08d..7d4ca8f56c 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ vpath %.texi $(SRC_PATH) ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) -BRIEF = CC AS YASM AR LD HOSTCC -SILENT = DEPCC DEPAS DEPHOSTCC DEPYASM RM RANLIB +BRIEF = CC HOSTCC AS YASM AR LD +SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM MSG = $@ M = @$(call ECHO,$(TAG),$@); $(foreach VAR,$(BRIEF), \ @@ -103,8 +103,9 @@ config.h: .config SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ - ALTIVEC-OBJS ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS MMI-OBJS \ - MMX-OBJS NEON-OBJS VIS-OBJS YASM-OBJS \ + ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS \ + MMI-OBJS ALTIVEC-OBJS VIS-OBJS \ + MMX-OBJS YASM-OBJS \ OBJS TESTOBJS define RESET -- cgit v1.2.3