September 2017 - ffmpeg-cvslog

Merge commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f'
by James Almer 28 Sep '17

28 Sep '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Sep 28 19:08:37 2017 -0300| [d4b00a23c6828098205bd71c571522d4fee9e20b] | committer: James Almer Merge commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f' * commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f': build: Drop leftover reference to old EXAMPLES logic Merged-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4b00a23c68280982… --- Makefile | 2 +- doc/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 29870d7710..e4eb050226 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ ffbuild/.config: $(CONFIGURABLE_COMPONENTS) @-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n' @-tput sgr0 2>/dev/null -SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ +SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \ HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \ ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS \ diff --git a/doc/Makefile b/doc/Makefile index b670f0bd4c..b83f2d52fa 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -128,7 +128,7 @@ $(DOCS) doc/doxy/html: | doc/ $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples OBJDIRS += doc/examples -DOXY_INPUT = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c) +DOXY_INPUT = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak doc/doxy/html: TAG = DOXY ====================================================================== diff --cc Makefile index 29870d7710,b14b29d76a..e4eb050226 --- a/Makefile +++ b/Makefile @@@ -95,12 -131,11 +95,12 @@@ ffbuild/.config: $(CONFIGURABLE_COMPONE @-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n' @-tput sgr0 2>/dev/null - SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ + SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \ HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \ - ALTIVEC-OBJS VSX-OBJS MMX-OBJS YASM-OBJS \ - OBJS HOSTOBJS TESTOBJS + ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS \ + MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \ + MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS define RESET $(1) := diff --cc doc/Makefile index b670f0bd4c,bd5c2e4b7f..b83f2d52fa --- a/doc/Makefile +++ b/doc/Makefile @@@ -128,29 -73,19 +128,29 @@@ $(DOCS) doc/doxy/html: | doc $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples OBJDIRS += doc/examples - DOXY_INPUT = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c) -DOXY_INPUT = $(addprefix $(SRC_PATH)/, $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c)) -DOXY_TEMPLATES = doxy_stylesheet.css footer.html header.html -DOXY_TEMPLATES := $(addprefix $(SRC_PATH)/doc/doxy/, $(DOXY_TEMPLATES)) ++DOXY_INPUT = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) +DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak + +doc/doxy/html: TAG = DOXY +doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS) + $(M)OUT_DIR=$$PWD/doc/doxy; cd $(SRC_PATH); ./doc/doxy-wrapper.sh $$OUT_DIR $< $(DOXYGEN) $(DOXY_INPUT); + +install-doc: install-html install-man + +install-html: -doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_INPUT) $(DOXY_TEMPLATES) - $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXY_INPUT) +install-man: -install-progs-$(CONFIG_POD2MAN): install-man -install-progs-$(CONFIG_TEXI2HTML): install-doc +ifdef CONFIG_HTMLPAGES +install-progs-$(CONFIG_DOC): install-html -install-doc: $(HTMLPAGES) +install-html: $(HTMLPAGES) $(Q)mkdir -p "$(DOCDIR)" $(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)" +endif + +ifdef CONFIG_MANPAGES +install-progs-$(CONFIG_DOC): install-man install-man: $(MANPAGES) $(Q)mkdir -p "$(MANDIR)/man1"

1 0

build: Drop leftover reference to old EXAMPLES logic
by Diego Biurrun 28 Sep '17

28 Sep '17

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Mon Feb 6 20:07:02 2017 +0100| [533339bdcc3b39bbd708c723b3cd0b5898350f0f] | committer: Diego Biurrun build: Drop leftover reference to old EXAMPLES logic > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=533339bdcc3b39bbd… --- Makefile | 2 +- doc/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 98eb3ab1d9..b14b29d76a 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ avbuild/.config: $(CONFIGURABLE_COMPONENTS) @-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n' @-tput sgr0 2>/dev/null -SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ +SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \ HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \ ALTIVEC-OBJS VSX-OBJS MMX-OBJS YASM-OBJS \ diff --git a/doc/Makefile b/doc/Makefile index bda815307c..bd5c2e4b7f 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -73,7 +73,7 @@ $(DOCS) doc/doxy/html: | doc/ $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples OBJDIRS += doc/examples -DOXY_INPUT = $(addprefix $(SRC_PATH)/, $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c)) +DOXY_INPUT = $(addprefix $(SRC_PATH)/, $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c)) DOXY_TEMPLATES = doxy_stylesheet.css footer.html header.html DOXY_TEMPLATES := $(addprefix $(SRC_PATH)/doc/doxy/, $(DOXY_TEMPLATES))

1 0

lavf/mov: Allow reading very large files.
by Pablo Montilla 28 Sep '17

28 Sep '17

ffmpeg | branch: master | Pablo Montilla <melkor(a)odyssey.com.uy> | Thu Sep 28 23:46:57 2017 +0200| [1015982f45d832ee926a81460121673a97292333] | committer: Carl Eugen Hoyos lavf/mov: Allow reading very large files. The Sample count in the time-to-sample table is defined as 32-bit unsigned integer by the QT specification. Fixes ticket #6700. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1015982f45d832ee9… --- libavformat/isom.h | 2 +- libavformat/mov.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 9aea629293..b9380e9dcc 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -52,7 +52,7 @@ struct AVAESCTR; */ typedef struct MOVStts { - int count; + unsigned int count; int duration; } MOVStts; diff --git a/libavformat/mov.c b/libavformat/mov.c index ede9cda9d3..899690d920 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2663,15 +2663,11 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom) for (i = 0; i < entries && !pb->eof_reached; i++) { int sample_duration; - int sample_count; + unsigned int sample_count; sample_count=avio_rb32(pb); sample_duration = avio_rb32(pb); - if (sample_count < 0) { - av_log(c->fc, AV_LOG_ERROR, "Invalid sample_count=%d\n", sample_count); - return AVERROR_INVALIDDATA; - } sc->stts_data[i].count= sample_count; sc->stts_data[i].duration= sample_duration;

1 0

opus_pvq: make max_den a float
by Rostislav Pehlivanov 28 Sep '17

28 Sep '17

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Thu Sep 28 22:39:36 2017 +0100| [05dfa21d47f35f394938653abcab8b3baa3bc999] | committer: Rostislav Pehlivanov opus_pvq: make max_den a float Prevents int->float conversions on every loop. Performance gain on synthetic benchmarks: 13%. Suggested by kamedo2. Signed-off-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05dfa21d47f35f394… --- libavcodec/opus_pvq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/opus_pvq.c b/libavcodec/opus_pvq.c index 2fb276099b..f98b85d36f 100644 --- a/libavcodec/opus_pvq.c +++ b/libavcodec/opus_pvq.c @@ -381,8 +381,9 @@ static float ppp_pvq_search_c(float *X, int *y, int K, int N) } while (K) { - int max_idx = 0, max_den = 1, phase = FFSIGN(K); + int max_idx = 0, phase = FFSIGN(K); float max_num = 0.0f; + float max_den = 1.0f; y_norm += 1.0f; for (i = 0; i < N; i++) {

1 0

Merge commit '7208e5b5d638d4b9c2784036b4fc5728f32233c7'
by James Almer 28 Sep '17

28 Sep '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Sep 28 18:36:27 2017 -0300| [d81b34069e80cb04160689ef5a160b9aee858257] | committer: James Almer Merge commit '7208e5b5d638d4b9c2784036b4fc5728f32233c7' * commit '7208e5b5d638d4b9c2784036b4fc5728f32233c7': configure: Restructure the way check_pkg_config() operates Merged-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d81b34069e80cb041… --- configure | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/configure b/configure index ce2c8ea345..c2f5fc2c98 100755 --- a/configure +++ b/configure @@ -1268,15 +1268,18 @@ check_lib_cpp(){ check_pkg_config(){ log check_pkg_config "$@" - pkg_version="$1" - pkg="${1%% *}" - headers="$2" - funcs="$3" - shift 3 + name="$1" + pkg_version="$2" + pkg="${2%% *}" + headers="$3" + funcs="$4" + shift 4 + disable $name check_cmd $pkg_config --exists --print-errors $pkg_version || return pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg) pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg) check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" && + enable $name && set_safe "${pkg}_cflags" $pkg_cflags && set_safe "${pkg}_extralibs" $pkg_libs } @@ -1391,16 +1394,15 @@ require_cpp_condition(){ use_pkg_config(){ log use_pkg_config "$@" - name="$1" - shift - pkg_version="$1" - pkg="${1%% *}" + pkg="${2%% *}" check_pkg_config "$@" || return 1 add_cflags $(get_safe "${pkg}_cflags") add_extralibs $(get_safe "${pkg}_extralibs") } require_pkg_config(){ + log require_pkg_config "$@" + pkg_version="$2" use_pkg_config "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message" } @@ -6000,21 +6002,21 @@ enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h enabled libvpx && { enabled libvpx_vp8_decoder && { - use_pkg_config libvpx "vpx >= 0.9.1" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || + use_pkg_config libvpx_vp8_decoder "vpx >= 0.9.1" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx || die "ERROR: libvpx decoder version must be >=0.9.1"; } enabled libvpx_vp8_encoder && { - use_pkg_config libvpx "vpx >= 0.9.7" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || + use_pkg_config libvpx_vp8_encoder "vpx >= 0.9.7" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VP8E_SET_MAX_INTRA_BITRATE_PCT" -lvpx || die "ERROR: libvpx encoder version must be >=0.9.7"; } enabled libvpx_vp9_decoder && { - use_pkg_config libvpx "vpx >= 1.3.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || + use_pkg_config libvpx_vp9_decoder "vpx >= 1.3.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx } enabled libvpx_vp9_encoder && { - use_pkg_config libvpx "vpx >= 1.3.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || + use_pkg_config libvpx_vp9_encoder "vpx >= 1.3.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx } if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then @@ -6025,7 +6027,7 @@ enabled libvpx && { enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack enabled libwebp && { enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion - enabled libwebp_anim_encoder && { use_pkg_config libwebpmux "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit || disable libwebp_anim_encoder; } } + enabled libwebp_anim_encoder && use_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } enabled libx264 && { use_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode || { require libx264 "stdint.h x264.h" x264_encoder_encode -lx264 && warn "using libx264 without pkg-config"; } } && @@ -6100,7 +6102,7 @@ fi if enabled sdl2; then SDL2_CONFIG="${cross_prefix}sdl2-config" - if check_pkg_config "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent; then + if check_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent; then check_func SDL_Init $sdl2_extralibs $sdl2_cflags || disable sdl2 elif "${SDL2_CONFIG}" --version > /dev/null 2>&1; then @@ -6110,8 +6112,6 @@ if enabled sdl2; then check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags && check_func SDL_Init $sdl2_extralibs $sdl2_cflags || disable sdl2 - else - disable sdl2 fi if test $target_os = "mingw32"; then sdl2_extralibs="$sdl2_extralibs -mconsole" @@ -6206,13 +6206,12 @@ if enabled libcdio; then die "ERROR: No usable libcdio/cdparanoia found" fi -enabled libxcb && check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || disable libxcb +enabled libxcb && check_pkg_config libxcb "xcb >= 1.4" xcb/xcb.h xcb_connect if enabled libxcb; then - - enabled libxcb_shm && check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach || disable libxcb_shm - enabled libxcb_shape && check_pkg_config xcb-shape xcb/shape.h xcb_shape_get_rectangles || disable libxcb_shape - enabled libxcb_xfixes && check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || disable libxcb_xfixes + enabled libxcb_shm && check_pkg_config libxcb_shm xcb-shm xcb/shm.h xcb_shm_attach + enabled libxcb_shape && check_pkg_config libxcb_shape xcb-shape xcb/shape.h xcb_shape_get_rectangles + enabled libxcb_xfixes && check_pkg_config libxcb_xfixes xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image add_cflags $xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags $xcb_shape_cflags add_extralibs $xcb_extralibs $xcb_shm_extralibs $xcb_xfixes_extralibs $xcb_shape_extralibs ====================================================================== diff --cc configure index ce2c8ea345,24e9fc337f..c2f5fc2c98 --- a/configure +++ b/configure @@@ -1258,27 -1018,22 +1258,30 @@@ check_lib() enable $name && add_extralibs "$@" } +check_lib_cpp(){ + log check_lib_cpp "$@" + headers="$1" + classes="$2" + shift 2 + check_class_headers_cpp "$headers" "$classes" "$@" && add_extralibs "$@" +} + check_pkg_config(){ log check_pkg_config "$@" - pkg_version="$1" - pkg="${1%% *}" - headers="$2" - funcs="$3" - shift 3 + name="$1" + pkg_version="$2" + pkg="${2%% *}" + headers="$3" + funcs="$4" + shift 4 + disable $name check_cmd $pkg_config --exists --print-errors $pkg_version || return pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg) pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg) check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" && + enable $name && - add_cflags "$pkg_cflags" && - add_extralibs "$pkg_libs" + set_safe "${pkg}_cflags" $pkg_cflags && + set_safe "${pkg}_extralibs" $pkg_libs } check_exec(){ @@@ -1389,19 -1136,10 +1392,18 @@@ require_cpp_condition() check_cpp_condition "$header" "$condition" "$@" || die "ERROR: $condition not satisfied" } +use_pkg_config(){ + log use_pkg_config "$@" - name="$1" - shift - pkg_version="$1" - pkg="${1%% *}" ++ pkg="${2%% *}" + check_pkg_config "$@" || return 1 + add_cflags $(get_safe "${pkg}_cflags") + add_extralibs $(get_safe "${pkg}_extralibs") +} + require_pkg_config(){ + log require_pkg_config "$@" + pkg_version="$2" - check_pkg_config "$@" || die "ERROR: $pkg_version not found" + use_pkg_config "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message" } hostcc_e(){ @@@ -5935,100 -4665,44 +5937,100 @@@ enabled libgme && { use_pkg_ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break; done || die "ERROR: libgsm not found"; } -enabled libhdcd && require_pkg_config libhdcd libhdcd "hdcd/hdcd_simple.h" hdcd_new enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kvazaar.h kvz_api_get -enabled libmfx && require_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit +# While it may appear that require is being used as a pkg-config +# fallback for libmfx, it is actually being used to detect a different +# installation route altogether. If libmfx is installed via the Intel +# Media SDK or Intel Media Server Studio, these don't come with +# pkg-config support. Instead, users should make sure that the build +# can find the libraries and headers through other means. +enabled libmfx && { use_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit || + { require libmfx "mfx/mfxvideo.h" MFXInit -llibmfx && warn "using libmfx without pkg-config"; } } +enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame -enabled libnpp && require libnpp npp.h nppGetLibVersion -lnppi -lnppc +enabled libmysofa && require libmysofa "mysofa.h" mysofa_load -lmysofa +enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc || + check_lib libnpp npp.h nppGetLibVersion -lnppi -lnppc || + die "ERROR: libnpp not found"; } enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb -enabled libopencv && require_pkg_config libopencv opencv opencv/cv.h cvCreateImageHeader +enabled libopencv && { check_header opencv2/core/core_c.h && + { use_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader || + require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || + require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; } enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion -enabled libopenjpeg && { check_lib libopenjpeg openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || - require_pkg_config libopenjpeg libopenjpeg1 openjpeg.h opj_version -DOPJ_STATIC; } -enabled libopus && require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create -enabled libpulse && require_pkg_config libpulse libpulse-simple pulse/simple.h pa_simple_new +enabled libopenjpeg && { { check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || + check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version -lopenjp2 || + { check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || + check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || + { check_lib libopenjpeg openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || + { check_lib libopenjpeg openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || + { check_lib libopenjpeg openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || + die "ERROR: libopenjpeg not found"; } +enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create +enabled libopus && { + enabled libopus_decoder && { + require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create + } + enabled libopus_encoder && { + require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create + } +} +enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new +enabled librsvg && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo enabled librtmp && require_pkg_config librtmp librtmp librtmp/rtmp.h RTMP_Socket -enabled libschroedinger && require_pkg_config libschroedinger schroedinger-1.0 schroedinger/schro.h schro_init +enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new +enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer +enabled libsmbclient && { use_pkg_config libsmbclient smbclient libsmbclient.h smbc_init || + require smbclient libsmbclient.h smbc_init -lsmbclient; } enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy +enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr" +enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init -lspeex +enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg -enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame -enabled libvo_aacenc && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc +enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame && + { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame || + die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; } +enabled libv4l2 && require_pkg_config libv4l2 libv4l2 libv4l2.h v4l2_ioctl +enabled libvidstab && require_pkg_config libvidstab "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit +enabled libvmaf && require_pkg_config libvmaf libvmaf libvmaf.h compute_vmaf enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc -enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg -enabled libvpx && require_pkg_config libvpx "vpx >= 1.3.0" vpx/vpx_codec.h vpx_codec_version && - { enabled libvpx_vp8_decoder && - check_pkg_config libvpx_vp8_decoder vpx "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx - enabled libvpx_vp8_encoder && - check_pkg_config libvpx_vp8_encoder vpx "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx - enabled libvpx_vp9_decoder && - check_pkg_config libvpx_vp9_decoder vpx "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx - enabled libvpx_vp9_encoder && - check_pkg_config libvpx_vp9_encoder vpx "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx - disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder && - die "libvpx enabled but no supported decoders/encoders found" - } +enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init && + require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init + +enabled libvpx && { + enabled libvpx_vp8_decoder && { - use_pkg_config libvpx "vpx >= 0.9.1" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || ++ use_pkg_config libvpx_vp8_decoder "vpx >= 0.9.1" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || + check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx || + die "ERROR: libvpx decoder version must be >=0.9.1"; + } + enabled libvpx_vp8_encoder && { - use_pkg_config libvpx "vpx >= 0.9.7" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || ++ use_pkg_config libvpx_vp8_encoder "vpx >= 0.9.7" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || + check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VP8E_SET_MAX_INTRA_BITRATE_PCT" -lvpx || + die "ERROR: libvpx encoder version must be >=0.9.7"; + } + enabled libvpx_vp9_decoder && { - use_pkg_config libvpx "vpx >= 1.3.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || ++ use_pkg_config libvpx_vp9_decoder "vpx >= 1.3.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || + check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx + } + enabled libvpx_vp9_encoder && { - use_pkg_config libvpx "vpx >= 1.3.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || ++ use_pkg_config libvpx_vp9_encoder "vpx >= 1.3.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || + check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx + } + if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then + die "libvpx enabled but no supported decoders found" + fi +} + enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack -enabled libwebp && require_pkg_config libwebp libwebp webp/encode.h WebPGetEncoderVersion -enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && +enabled libwebp && { + enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion - enabled libwebp_anim_encoder && { use_pkg_config libwebpmux "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit || disable libwebp_anim_encoder; } } ++ enabled libwebp_anim_encoder && use_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } +enabled libx264 && { use_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode || + { require libx264 "stdint.h x264.h" x264_encoder_encode -lx264 && + warn "using libx264 without pkg-config"; } } && require_cpp_condition x264.h "X264_BUILD >= 118" && { check_cpp_condition x264.h "X264_MPEG2" && enable libx262; } @@@ -6077,94 -4727,26 +6079,92 @@@ enabled openssl && { use_pkg_ check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || die "ERROR: openssl not found"; } +enabled rkmpp && { { require_pkg_config rockchip_mpp rockchip_mpp rockchip/rk_mpi.h mpp_create || + die "ERROR : Rockchip MPP was not found."; } && + { check_func_headers rockchip/rk_mpi_cmd.h "MPP_DEC_GET_FREE_PACKET_SLOT_COUNT" || + die "ERROR: Rockchip MPP is outdated, please get a more recent one."; } && + { enabled libdrm || + die "ERROR: rkmpp requires --enable-libdrm"; } + } -enabled gnutls && check_lib gmp gmp.h mpz_export -lgmp - -if enabled nvenc; then - require_header nvEncodeAPI.h - require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6" +if enabled gcrypt; then + GCRYPT_CONFIG="${cross_prefix}libgcrypt-config" + if "${GCRYPT_CONFIG}" --version > /dev/null 2>&1; then + gcrypt_cflags=$("${GCRYPT_CONFIG}" --cflags) + gcrypt_extralibs=$("${GCRYPT_CONFIG}" --libs) + check_func_headers gcrypt.h gcry_mpi_new $gcrypt_cflags $gcrypt_extralibs || + die "ERROR: gcrypt not found" + add_cflags $gcrypt_cflags && add_extralibs $gcrypt_extralibs + else + require gcrypt gcrypt.h gcry_mpi_new -lgcrypt + fi fi -check_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent +if enabled sdl2; then + SDL2_CONFIG="${cross_prefix}sdl2-config" - if check_pkg_config "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent; then ++ if check_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent; then + check_func SDL_Init $sdl2_extralibs $sdl2_cflags || + disable sdl2 + elif "${SDL2_CONFIG}" --version > /dev/null 2>&1; then + sdl2_cflags=$("${SDL2_CONFIG}" --cflags) + sdl2_extralibs=$("${SDL2_CONFIG}" --libs) + check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags && + check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags && + check_func SDL_Init $sdl2_extralibs $sdl2_cflags || + disable sdl2 - else - disable sdl2 + fi + if test $target_os = "mingw32"; then + sdl2_extralibs="$sdl2_extralibs -mconsole" + fi +fi +enabled sdl2 && add_cflags $sdl2_cflags && add_extralibs $sdl2_extralibs -! disabled pod2man && check_cmd pod2man --help && enable pod2man || disable pod2man -! disabled texi2html && check_cmd texi2html -version && enable texi2html || disable texi2html +if enabled decklink; then + case $target_os in + mingw32*|mingw64*|win32|win64) + decklink_outdev_extralibs="$decklink_outdev_extralibs -lole32 -loleaut32" + decklink_indev_extralibs="$decklink_indev_extralibs -lole32 -loleaut32" + ;; + esac +fi +enabled securetransport && + check_func SecIdentityCreate "-Wl,-framework,CoreFoundation -Wl,-framework,Security" && + check_lib securetransport "Security/SecureTransport.h Security/Security.h" "SSLCreateContext SecItemImport" "-Wl,-framework,CoreFoundation -Wl,-framework,Security" || + disable securetransport + +enabled schannel && + check_func_headers "windows.h security.h" InitializeSecurityContext -DSECURITY_WIN32 -lsecur32 && + check_cpp_condition winerror.h "defined(SEC_I_CONTEXT_EXPIRED)" && + add_extralibs -lsecur32 || + disable schannel + +makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo +enabled makeinfo \ + && [ 0$(makeinfo --version | grep "texinfo" | sed 's/.*texinfo[^0-9]*$[0-9]*$\..*/\1/') -ge 5 ] \ + && enable makeinfo_html || disable makeinfo_html +disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html +perl -v > /dev/null 2>&1 && enable perl || disable perl +pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man +rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout + +# check V4L2 codecs available in the API check_header linux/fb.h check_header linux/videodev2.h -check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete - -check_header AVFoundation/AVFoundation.h +check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete +check_code cc linux/videodev2.h "int i = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_BUF_FLAG_LAST;" || disable v4l2_m2m +check_code cc linux/videodev2.h "int i = V4L2_PIX_FMT_VC1_ANNEX_G;" && enable vc1_v4l2_m2m +check_code cc linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG1;" && enable mpeg1_v4l2_m2m +check_code cc linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG2;" && enable mpeg2_v4l2_m2m +check_code cc linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG4;" && enable mpeg4_v4l2_m2m +check_code cc linux/videodev2.h "int i = V4L2_PIX_FMT_HEVC;" && enable hevc_v4l2_m2m +check_code cc linux/videodev2.h "int i = V4L2_PIX_FMT_H263;" && enable h263_v4l2_m2m +check_code cc linux/videodev2.h "int i = V4L2_PIX_FMT_H264;" && enable h264_v4l2_m2m +check_code cc linux/videodev2.h "int i = V4L2_PIX_FMT_VP8;" && enable vp8_v4l2_m2m +check_code cc linux/videodev2.h "int i = V4L2_PIX_FMT_VP9;" && enable vp9_v4l2_m2m check_header sys/videoio.h +check_code cc sys/videoio.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete check_lib user32 "windows.h winuser.h" GetShellWindow -luser32 check_lib vfw32 "windows.h vfw.h" capCreateCaptureWindow -lvfw32 @@@ -6206,37 -4780,19 +6206,36 @@@ if enabled libcdio; the die "ERROR: No usable libcdio/cdparanoia found" fi - enabled libxcb && check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || disable libxcb ++enabled libxcb && check_pkg_config libxcb "xcb >= 1.4" xcb/xcb.h xcb_connect + if enabled libxcb; then - - enabled libxcb_shm && check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach || disable libxcb_shm - enabled libxcb_shape && check_pkg_config xcb-shape xcb/shape.h xcb_shape_get_rectangles || disable libxcb_shape - enabled libxcb_xfixes && check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || disable libxcb_xfixes - require_pkg_config libxcb xcb xcb/xcb.h xcb_connect - require_pkg_config libxcb_shape xcb-shape xcb/shape.h xcb_shape_rectangles - disabled libxcb_shm || - check_pkg_config libxcb_shm xcb-shm xcb/shm.h xcb_shm_attach - disabled libxcb_xfixes || - check_pkg_config libxcb_xfixes xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image ++ enabled libxcb_shm && check_pkg_config libxcb_shm xcb-shm xcb/shm.h xcb_shm_attach ++ enabled libxcb_shape && check_pkg_config libxcb_shape xcb-shape xcb/shape.h xcb_shape_get_rectangles ++ enabled libxcb_xfixes && check_pkg_config libxcb_xfixes xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image + + add_cflags $xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags $xcb_shape_cflags + add_extralibs $xcb_extralibs $xcb_shm_extralibs $xcb_xfixes_extralibs $xcb_shape_extralibs fi -enabled dxva2 && - check_lib dxva2_lib windows.h CoTaskMemFree -lole32 +check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs" -enabled vaapi && require vaapi va/va.h vaInitialize -lva +# d3d11va requires linking directly to dxgi and d3d11 if not building for +# the desktop api partition +check_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11" +#ifdef WINAPI_FAMILY +#include <winapifamily.h> +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +#error desktop, not uwp +#else +// WINAPI_FAMILY_APP, WINAPI_FAMILY_PHONE_APP => UWP +#endif +#else +#error no family set +#endif +EOF + +enabled vaapi && + check_lib vaapi va/va.h vaInitialize -lva enabled vaapi && check_code cc "va/va.h" "vaCreateSurfaces(0, 0, 0, 0, 0, 0, 0, 0)" ||

1 0

configure: Restructure the way check_pkg_config() operates
by Diego Biurrun 28 Sep '17

28 Sep '17

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Sat Feb 11 13:09:27 2017 +0100| [7208e5b5d638d4b9c2784036b4fc5728f32233c7] | committer: Diego Biurrun configure: Restructure the way check_pkg_config() operates Have check_pkg_config() enable variables and set cflags and extralibs instead of relegating that task to require_pkg_config. This simplifies require_pkg_config(), is consistent with what other helper functions like check_lib() do and allows getting rid of some manual variable setting in places where check_pkg_config() is used. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7208e5b5d638d4b9c… --- configure | 70 +++++++++++++++++++++++++-------------------------------------- 1 file changed, 28 insertions(+), 42 deletions(-) diff --git a/configure b/configure index 287b1e5d41..24e9fc337f 100755 --- a/configure +++ b/configure @@ -1020,17 +1020,20 @@ check_lib(){ check_pkg_config(){ log check_pkg_config "$@" - pkg_version="$1" - pkg="${1%% *}" - headers="$2" - funcs="$3" - shift 3 + name="$1" + pkg_version="$2" + pkg="${2%% *}" + headers="$3" + funcs="$4" + shift 4 + disable $name check_cmd $pkg_config --exists --print-errors $pkg_version || return pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg) pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg) check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" && - set_safe "${pkg}_cflags" $pkg_cflags && - set_safe "${pkg}_extralibs" $pkg_libs + enable $name && + add_cflags "$pkg_cflags" && + add_extralibs "$pkg_libs" } check_exec(){ @@ -1135,13 +1138,8 @@ require_cpp_condition(){ require_pkg_config(){ log require_pkg_config "$@" - name="$1" - shift - pkg_version="$1" - pkg="${1%% *}" + pkg_version="$2" check_pkg_config "$@" || die "ERROR: $pkg_version not found" - add_cflags $(get_safe "${pkg}_cflags") - add_extralibs $(get_safe "${pkg}_extralibs") } hostcc_e(){ @@ -4690,27 +4688,18 @@ enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame enabled libvo_aacenc && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg -enabled libvpx && require_pkg_config libvpx "vpx >= 1.3.0" vpx/vpx_codec.h vpx_codec_version && { - enabled libvpx_vp8_decoder && { - check_pkg_config vpx "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || - disable libvpx_vp8_decoder; - } - enabled libvpx_vp8_encoder && { - check_pkg_config vpx "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || - disable libvpx_vp8_encoder; - } - enabled libvpx_vp9_decoder && { - check_pkg_config vpx "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || - disable libvpx_vp9_decoder; - } - enabled libvpx_vp9_encoder && { - check_pkg_config vpx "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || - disable libvpx_vp9_encoder; - } - if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then - die "libvpx enabled but no supported decoders found" - fi -} +enabled libvpx && require_pkg_config libvpx "vpx >= 1.3.0" vpx/vpx_codec.h vpx_codec_version && + { enabled libvpx_vp8_decoder && + check_pkg_config libvpx_vp8_decoder vpx "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx + enabled libvpx_vp8_encoder && + check_pkg_config libvpx_vp8_encoder vpx "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx + enabled libvpx_vp9_decoder && + check_pkg_config libvpx_vp9_decoder vpx "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx + enabled libvpx_vp9_encoder && + check_pkg_config libvpx_vp9_encoder vpx "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx + disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder && + die "libvpx enabled but no supported decoders/encoders found" + } enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack enabled libwebp && require_pkg_config libwebp libwebp webp/encode.h WebPGetEncoderVersion enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && @@ -4732,9 +4721,8 @@ enabled omx_rpi && { check_header OMX_Core.h || { ! enabled cross_compile && add_cflags -isystem/opt/vc/include/IL && check_header OMX_Core.h ; } || die "ERROR: OpenMAX IL headers not found"; } enabled omx && require_header OMX_Core.h -enabled openssl && { { check_pkg_config openssl openssl/ssl.h OPENSSL_init_ssl || - check_pkg_config openssl openssl/ssl.h SSL_library_init; } && { - add_cflags $openssl_cflags && add_extralibs $openssl_extralibs; } || +enabled openssl && { { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || + check_pkg_config openssl openssl openssl/ssl.h SSL_library_init; } || check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || @@ -4747,9 +4735,7 @@ if enabled nvenc; then require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6" fi -if check_pkg_config "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent; then - enable sdl -fi +check_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent ! disabled pod2man && check_cmd pod2man --help && enable pod2man || disable pod2man ! disabled texi2html && check_cmd texi2html -version && enable texi2html || disable texi2html @@ -4798,9 +4784,9 @@ if enabled libxcb; then require_pkg_config libxcb xcb xcb/xcb.h xcb_connect require_pkg_config libxcb_shape xcb-shape xcb/shape.h xcb_shape_rectangles disabled libxcb_shm || - require_pkg_config libxcb_shm xcb-shm xcb/shm.h xcb_shm_attach + check_pkg_config libxcb_shm xcb-shm xcb/shm.h xcb_shm_attach disabled libxcb_xfixes || - require_pkg_config libxcb_xfixes xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image + check_pkg_config libxcb_xfixes xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image fi enabled dxva2 &&

1 0

avcodec/decode: Pass on the Closed Captions Side Data
by Karthick J 28 Sep '17

28 Sep '17

ffmpeg | branch: master | Karthick J <kjeyapal(a)akamai.com> | Thu Aug 31 16:58:05 2017 +0530| [f7b7d51a37ddbd15be5611b86799fb6d3e443fff] | committer: Marton Balint avcodec/decode: Pass on the Closed Captions Side Data Signed-off-by: Karthick J <kjeyapal(a)akamai.com> Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7b7d51a37ddbd15b… --- libavcodec/decode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 892143c1d2..1337ffb527 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1490,6 +1490,7 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) { AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, + { AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC }, }; if (pkt) {

1 0

avdevice/decklink_dec: Added Closed caption decode from VANC
by Karthick J 28 Sep '17

28 Sep '17

ffmpeg | branch: master | Karthick J <kjeyapal(a)akamai.com> | Wed Aug 30 12:01:16 2017 +0530| [b6cf66ae1c4986f6d788a17233a6609b346c6aa6] | committer: Marton Balint avdevice/decklink_dec: Added Closed caption decode from VANC Signed-off-by: Karthick J <kjeyapal(a)akamai.com> Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6cf66ae1c4986f6d… --- doc/APIchanges | 3 + libavcodec/avcodec.h | 7 ++ libavcodec/avpacket.c | 1 + libavcodec/version.h | 2 +- libavdevice/decklink_dec.cpp | 196 +++++++++++++++++++++++++++++++++++++++---- 5 files changed, 191 insertions(+), 18 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 606ba7f6c0..5c6376243f 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2017-09-28 - xxxxxxx - lavc 57.106.104 - avcodec.h + Add AV_PKT_DATA_A53_CC packet side data, to export closed captions + 2017-09-27 - xxxxxxx - lavu 55.77.101 / lavu 55.31.1 - frame.h Allow passing the value of 0 (meaning "automatic") as the required alignment to av_frame_get_buffer(). diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b5bbc591ac..dd7c4b4ce5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1600,6 +1600,13 @@ enum AVPacketSideDataType { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, /** + * ATSC A53 Part 4 Closed Captions. This metadata should be associated with + * a video stream. A53 CC bitstream is stored as uint8_t in AVPacketSideData.data. + * The number of bytes of CC data is AVPacketSideData.size. + */ + AV_PKT_DATA_A53_CC, + + /** * The number of side data elements (in fact a bit more than it). * This is not part of the public API/ABI in the sense that it may * change when new side data types are added. diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index b07180eac8..d1f4ea9eb3 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -387,6 +387,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata"; case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: return "Content light level metadata"; case AV_PKT_DATA_SPHERICAL: return "Spherical Mapping"; + case AV_PKT_DATA_A53_CC: return "A53 Closed Captions"; } return NULL; } diff --git a/libavcodec/version.h b/libavcodec/version.h index 39d9ad992c..7aee6f9cf3 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 106 -#define LIBAVCODEC_VERSION_MICRO 103 +#define LIBAVCODEC_VERSION_MICRO 104 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 614bda0924..3ce2cab5f4 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -1,6 +1,7 @@ /* * Blackmagic DeckLink input * Copyright (c) 2013-2014 Luca Barbato, Deti Fliegl + * Copyright (c) 2014 Rafaël Carré * Copyright (c) 2017 Akamai Technologies, Inc. * * This file is part of FFmpeg. @@ -105,6 +106,42 @@ static int get_vanc_line_idx(BMDDisplayMode mode) return i - 1; } +static inline uint16_t parity (uint16_t x) +{ + uint16_t i; + for (i = 4 * sizeof (x); i > 0; i /= 2) + x ^= x >> i; + return x & 1; +} + +static inline void clear_parity_bits(uint16_t *buf, int len) { + int i; + for (i = 0; i < len; i++) + buf[i] &= 0xff; +} + +static int check_vanc_parity_checksum(uint16_t *buf, int len, uint16_t checksum) { + int i; + uint16_t vanc_sum = 0; + for (i = 3; i < len - 1; i++) { + uint16_t v = buf[i]; + int np = v >> 8; + int p = parity(v & 0xff); + if ((!!p ^ !!(v & 0x100)) || (np != 1 && np != 2)) { + // Parity check failed + return -1; + } + vanc_sum += v; + } + vanc_sum &= 0x1ff; + vanc_sum |= ((~vanc_sum & 0x100) << 1); + if (checksum != vanc_sum) { + // Checksum verification failed + return -1; + } + return 0; +} + /* The 10-bit VANC data is packed in V210, we only need the luma component. */ static void extract_luma_from_v210(uint16_t *dst, const uint8_t *src, int width) { @@ -232,19 +269,148 @@ static uint8_t* teletext_data_unit_from_ancillary_packet(uint16_t *py, uint16_t return tgt; } -static uint8_t* teletext_data_unit_from_vanc_data(uint16_t *py, uint8_t *tgt, int64_t wanted_lines) +uint8_t *vanc_to_cc(AVFormatContext *avctx, uint16_t *buf, size_t words, + unsigned &cc_count) { - uint16_t *pend = py + 1920; + size_t i, len = (buf[5] & 0xff) + 6 + 1; + uint8_t cdp_sum, rate; + uint16_t hdr, ftr; + uint8_t *cc; + uint16_t *cdp = &buf[6]; // CDP follows + if (cdp[0] != 0x96 || cdp[1] != 0x69) { + av_log(avctx, AV_LOG_WARNING, "Invalid CDP header 0x%.2x 0x%.2x\n", cdp[0], cdp[1]); + return NULL; + } - while (py < pend - 6) { - if (py[0] == 0 && py[1] == 0x3ff && py[2] == 0x3ff) { // ancillary data flag - py += 3; - tgt = teletext_data_unit_from_ancillary_packet(py, pend, tgt, wanted_lines, 0); - py += py[2] & 255; + len -= 7; // remove VANC header and checksum + + if (cdp[2] != len) { + av_log(avctx, AV_LOG_WARNING, "CDP len %d != %zu\n", cdp[2], len); + return NULL; + } + + cdp_sum = 0; + for (i = 0; i < len - 1; i++) + cdp_sum += cdp[i]; + cdp_sum = cdp_sum ? 256 - cdp_sum : 0; + if (cdp[len - 1] != cdp_sum) { + av_log(avctx, AV_LOG_WARNING, "CDP checksum invalid 0x%.4x != 0x%.4x\n", cdp_sum, cdp[len-1]); + return NULL; + } + + rate = cdp[3]; + if (!(rate & 0x0f)) { + av_log(avctx, AV_LOG_WARNING, "CDP frame rate invalid (0x%.2x)\n", rate); + return NULL; + } + rate >>= 4; + if (rate > 8) { + av_log(avctx, AV_LOG_WARNING, "CDP frame rate invalid (0x%.2x)\n", rate); + return NULL; + } + + if (!(cdp[4] & 0x43)) /* ccdata_present | caption_service_active | reserved */ { + av_log(avctx, AV_LOG_WARNING, "CDP flags invalid (0x%.2x)\n", cdp[4]); + return NULL; + } + + hdr = (cdp[5] << 8) | cdp[6]; + if (cdp[7] != 0x72) /* ccdata_id */ { + av_log(avctx, AV_LOG_WARNING, "Invalid ccdata_id 0x%.2x\n", cdp[7]); + return NULL; + } + + cc_count = cdp[8]; + if (!(cc_count & 0xe0)) { + av_log(avctx, AV_LOG_WARNING, "Invalid cc_count 0x%.2x\n", cc_count); + return NULL; + } + + cc_count &= 0x1f; + if ((len - 13) < cc_count * 3) { + av_log(avctx, AV_LOG_WARNING, "Invalid cc_count %d (> %zu)\n", cc_count * 3, len - 13); + return NULL; + } + + if (cdp[len - 4] != 0x74) /* footer id */ { + av_log(avctx, AV_LOG_WARNING, "Invalid footer id 0x%.2x\n", cdp[len-4]); + return NULL; + } + + ftr = (cdp[len - 3] << 8) | cdp[len - 2]; + if (ftr != hdr) { + av_log(avctx, AV_LOG_WARNING, "Header 0x%.4x != Footer 0x%.4x\n", hdr, ftr); + return NULL; + } + + cc = (uint8_t *)av_malloc(cc_count * 3); + if (cc == NULL) { + av_log(avctx, AV_LOG_WARNING, "CC - av_malloc failed for cc_count = %d\n", cc_count); + return NULL; + } + + for (size_t i = 0; i < cc_count; i++) { + cc[3*i + 0] = cdp[9 + 3*i+0] /* & 3 */; + cc[3*i + 1] = cdp[9 + 3*i+1]; + cc[3*i + 2] = cdp[9 + 3*i+2]; + } + + cc_count *= 3; + return cc; +} + +uint8_t *get_metadata(AVFormatContext *avctx, uint16_t *buf, size_t width, + uint8_t *tgt, size_t tgt_size, AVPacket *pkt) +{ + decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; + uint16_t *max_buf = buf + width; + + while (buf < max_buf - 6) { + int len; + uint16_t did = buf[3] & 0xFF; // data id + uint16_t sdid = buf[4] & 0xFF; // secondary data id + /* Check for VANC header */ + if (buf[0] != 0 || buf[1] != 0x3ff || buf[2] != 0x3ff) { + return tgt; + } + + len = (buf[5] & 0xff) + 6 + 1; + if (len > max_buf - buf) { + av_log(avctx, AV_LOG_WARNING, "Data Count (%d) > data left (%zu)\n", + len, max_buf - buf); + return tgt; + } + + if (did == 0x43 && (sdid == 0x02 || sdid == 0x03) && cctx->teletext_lines && + width == 1920 && tgt_size >= 1920) { + if (check_vanc_parity_checksum(buf, len, buf[len - 1]) < 0) { + av_log(avctx, AV_LOG_WARNING, "VANC parity or checksum incorrect\n"); + goto skip_packet; + } + tgt = teletext_data_unit_from_ancillary_packet(buf + 3, buf + len, tgt, cctx->teletext_lines, 0); + } else if (did == 0x61 && sdid == 0x01) { + unsigned int data_len; + uint8_t *data; + if (check_vanc_parity_checksum(buf, len, buf[len - 1]) < 0) { + av_log(avctx, AV_LOG_WARNING, "VANC parity or checksum incorrect\n"); + goto skip_packet; + } + clear_parity_bits(buf, len); + data = vanc_to_cc(avctx, buf, width, data_len); + if (data) { + uint8_t *pkt_cc = av_packet_new_side_data(pkt, AV_PKT_DATA_A53_CC, data_len); + if (pkt_cc) + memcpy(pkt_cc, data, data_len); + av_free(data); + } } else { - py++; + av_log(avctx, AV_LOG_DEBUG, "Unknown meta data DID = 0x%.2x SDID = 0x%.2x\n", + did, sdid); } +skip_packet: + buf += len; } + return tgt; } @@ -536,7 +702,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( videoFrame->GetHeight(); //fprintf(stderr,"Video Frame size %d ts %d\n", pkt.size, pkt.pts); - if (!no_video && ctx->teletext_lines) { + if (!no_video) { IDeckLinkVideoFrameAncillary *vanc; AVPacket txt_pkt; uint8_t txt_buf0[3531]; // 35 * 46 bytes decoded teletext lines + 1 byte data_identifier + 1920 bytes OP47 decode buffer @@ -549,7 +715,8 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( txt_buf[0] = 0x10; // data_identifier - EBU_data txt_buf++; #if CONFIG_LIBZVBI - if (ctx->bmd_mode == bmdModePAL && (vanc_format == bmdFormat8BitYUV || vanc_format == bmdFormat10BitYUV)) { + if (ctx->bmd_mode == bmdModePAL && ctx->teletext_lines && + (vanc_format == bmdFormat8BitYUV || vanc_format == bmdFormat10BitYUV)) { av_assert0(videoFrame->GetWidth() == 720); for (i = 6; i < 336; i++, line_mask <<= 1) { uint8_t *buf; @@ -571,13 +738,8 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( if (vanc->GetBufferForVerticalBlankingLine(i, (void**)&buf) == S_OK) { uint16_t luma_vanc[MAX_WIDTH_VANC]; extract_luma_from_v210(luma_vanc, buf, videoFrame->GetWidth()); - if (videoFrame->GetWidth() == 1920) { - txt_buf = teletext_data_unit_from_vanc_data(luma_vanc, txt_buf, ctx->teletext_lines); - if (txt_buf - txt_buf0 > 1611) { // ensure we still have at least 1920 bytes free in the buffer - av_log(avctx, AV_LOG_ERROR, "Too many OP47 teletext packets.\n"); - break; - } - } + txt_buf = get_metadata(avctx, luma_vanc, videoFrame->GetWidth(), + txt_buf, sizeof(txt_buf0) - (txt_buf - txt_buf0), &pkt); } if (i == vanc_line_numbers[idx].field0_vanc_end) i = vanc_line_numbers[idx].field1_vanc_start - 1;

1 0

avdevice/decklink_dec: Extraction of luma from V210 VANC modularized
by Karthick J 28 Sep '17

28 Sep '17

ffmpeg | branch: master | Karthick J <kjeyapal(a)akamai.com> | Wed Aug 30 10:39:00 2017 +0530| [a8755785d7a940eace06ed5397d51cb779213749] | committer: Marton Balint avdevice/decklink_dec: Extraction of luma from V210 VANC modularized In preparation to support multiple VANC data decode Signed-off-by: Karthick J <kjeyapal(a)akamai.com> Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8755785d7a940eac… --- libavdevice/decklink_dec.cpp | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index b4f92e25d7..614bda0924 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -46,6 +46,8 @@ extern "C" { #include "decklink_common.h" #include "decklink_dec.h" +#define MAX_WIDTH_VANC 1920 + typedef struct VANCLineNumber { BMDDisplayMode mode; int vanc_start; @@ -103,6 +105,18 @@ static int get_vanc_line_idx(BMDDisplayMode mode) return i - 1; } +/* The 10-bit VANC data is packed in V210, we only need the luma component. */ +static void extract_luma_from_v210(uint16_t *dst, const uint8_t *src, int width) +{ + int i; + for (i = 0; i < width / 3; i += 3) { + *dst++ = (src[1] >> 2) + ((src[2] & 15) << 6); + *dst++ = src[4] + ((src[5] & 3) << 8); + *dst++ = (src[6] >> 4) + ((src[7] & 63) << 4); + src += 8; + } +} + static uint8_t calc_parity_and_line_offset(int line) { uint8_t ret = (line < 313) << 5; @@ -218,19 +232,10 @@ static uint8_t* teletext_data_unit_from_ancillary_packet(uint16_t *py, uint16_t return tgt; } -static uint8_t* teletext_data_unit_from_vanc_data(uint8_t *src, uint8_t *tgt, int64_t wanted_lines) +static uint8_t* teletext_data_unit_from_vanc_data(uint16_t *py, uint8_t *tgt, int64_t wanted_lines) { - uint16_t y[1920]; - uint16_t *py = y; - uint16_t *pend = y + 1920; - /* The 10-bit VANC data is packed in V210, we only need the luma component. */ - while (py < pend) { - *py++ = (src[1] >> 2) + ((src[2] & 15) << 6); - *py++ = src[4] + ((src[5] & 3) << 8); - *py++ = (src[6] >> 4) + ((src[7] & 63) << 4); - src += 8; - } - py = y; + uint16_t *pend = py + 1920; + while (py < pend - 6) { if (py[0] == 0 && py[1] == 0x3ff && py[2] == 0x3ff) { // ancillary data flag py += 3; @@ -559,13 +564,15 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( } } #endif - if (vanc_format == bmdFormat10BitYUV) { + if (vanc_format == bmdFormat10BitYUV && videoFrame->GetWidth() <= MAX_WIDTH_VANC) { int idx = get_vanc_line_idx(ctx->bmd_mode); for (i = vanc_line_numbers[idx].vanc_start; i <= vanc_line_numbers[idx].vanc_end; i++) { uint8_t *buf; if (vanc->GetBufferForVerticalBlankingLine(i, (void**)&buf) == S_OK) { + uint16_t luma_vanc[MAX_WIDTH_VANC]; + extract_luma_from_v210(luma_vanc, buf, videoFrame->GetWidth()); if (videoFrame->GetWidth() == 1920) { - txt_buf = teletext_data_unit_from_vanc_data(buf, txt_buf, ctx->teletext_lines); + txt_buf = teletext_data_unit_from_vanc_data(luma_vanc, txt_buf, ctx->teletext_lines); if (txt_buf - txt_buf0 > 1611) { // ensure we still have at least 1920 bytes free in the buffer av_log(avctx, AV_LOG_ERROR, "Too many OP47 teletext packets.\n"); break;

1 0

avdevice/decklink_dec: Added VANC search for all resolutions
by Karthick J 28 Sep '17

28 Sep '17

ffmpeg | branch: master | Karthick J <kjeyapal(a)akamai.com> | Tue Aug 29 16:57:28 2017 +0530| [e6cdf30fb44f5e011ff94fbc04636b904a51a07e] | committer: Marton Balint avdevice/decklink_dec: Added VANC search for all resolutions In preparation to make VANC decode modular, to support multiple other VANC data. Signed-off-by: Karthick J <kjeyapal(a)akamai.com> Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6cdf30fb44f5e011… --- libavdevice/decklink_dec.cpp | 80 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 10 deletions(-) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index c93ca68b80..b4f92e25d7 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -46,6 +46,63 @@ extern "C" { #include "decklink_common.h" #include "decklink_dec.h" +typedef struct VANCLineNumber { + BMDDisplayMode mode; + int vanc_start; + int field0_vanc_end; + int field1_vanc_start; + int vanc_end; +} VANCLineNumber; + +/* These VANC line numbers need not be very accurate. In any case + * GetBufferForVerticalBlankingLine() will return an error when invalid + * ancillary line number was requested. We just need to make sure that the + * entire VANC region is covered, while making sure we don't decode VANC of + * another source during switching*/ +static VANCLineNumber vanc_line_numbers[] = { + /* SD Modes */ + + {bmdModeNTSC, 11, 19, 274, 282}, + {bmdModeNTSC2398, 11, 19, 274, 282}, + {bmdModePAL, 7, 22, 320, 335}, + {bmdModeNTSCp, 11, -1, -1, 39}, + {bmdModePALp, 7, -1, -1, 45}, + + /* HD 1080 Modes */ + + {bmdModeHD1080p2398, 8, -1, -1, 42}, + {bmdModeHD1080p24, 8, -1, -1, 42}, + {bmdModeHD1080p25, 8, -1, -1, 42}, + {bmdModeHD1080p2997, 8, -1, -1, 42}, + {bmdModeHD1080p30, 8, -1, -1, 42}, + {bmdModeHD1080i50, 8, 20, 570, 585}, + {bmdModeHD1080i5994, 8, 20, 570, 585}, + {bmdModeHD1080i6000, 8, 20, 570, 585}, + {bmdModeHD1080p50, 8, -1, -1, 42}, + {bmdModeHD1080p5994, 8, -1, -1, 42}, + {bmdModeHD1080p6000, 8, -1, -1, 42}, + + /* HD 720 Modes */ + + {bmdModeHD720p50, 8, -1, -1, 26}, + {bmdModeHD720p5994, 8, -1, -1, 26}, + {bmdModeHD720p60, 8, -1, -1, 26}, + + /* For all other modes, for which we don't support VANC */ + {bmdModeUnknown, 0, -1, -1, -1} +}; + +static int get_vanc_line_idx(BMDDisplayMode mode) +{ + unsigned int i; + for (i = 0; i < FF_ARRAY_ELEMS(vanc_line_numbers); i++) { + if (mode == vanc_line_numbers[i].mode) + return i; + } + /* Return the VANC idx for Unknown mode */ + return i - 1; +} + static uint8_t calc_parity_and_line_offset(int line) { uint8_t ret = (line < 313) << 5; @@ -502,18 +559,21 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( } } #endif - if (videoFrame->GetWidth() == 1920 && vanc_format == bmdFormat10BitYUV) { - int first_active_line = ctx->bmd_field_dominance == bmdProgressiveFrame ? 42 : 584; - for (i = 8; i < first_active_line; i++) { + if (vanc_format == bmdFormat10BitYUV) { + int idx = get_vanc_line_idx(ctx->bmd_mode); + for (i = vanc_line_numbers[idx].vanc_start; i <= vanc_line_numbers[idx].vanc_end; i++) { uint8_t *buf; - if (vanc->GetBufferForVerticalBlankingLine(i, (void**)&buf) == S_OK) - txt_buf = teletext_data_unit_from_vanc_data(buf, txt_buf, ctx->teletext_lines); - if (ctx->bmd_field_dominance != bmdProgressiveFrame && i == 20) // skip field1 active lines - i = 569; - if (txt_buf - txt_buf0 > 1611) { // ensure we still have at least 1920 bytes free in the buffer - av_log(avctx, AV_LOG_ERROR, "Too many OP47 teletext packets.\n"); - break; + if (vanc->GetBufferForVerticalBlankingLine(i, (void**)&buf) == S_OK) { + if (videoFrame->GetWidth() == 1920) { + txt_buf = teletext_data_unit_from_vanc_data(buf, txt_buf, ctx->teletext_lines); + if (txt_buf - txt_buf0 > 1611) { // ensure we still have at least 1920 bytes free in the buffer + av_log(avctx, AV_LOG_ERROR, "Too many OP47 teletext packets.\n"); + break; + } + } } + if (i == vanc_line_numbers[idx].field0_vanc_end) + i = vanc_line_numbers[idx].field1_vanc_start - 1; } } vanc->Release();

1 0