Date: Tue, 8 Oct 2019 04:48:29 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514029 - in head/multimedia: . ffmpeg vmaf vmaf/files x265 x265/files Message-ID: <201910080448.x984mTWT086474@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Oct 8 04:48:28 2019 New Revision: 514029 URL: https://svnweb.freebsd.org/changeset/ports/514029 Log: multimedia/vmaf: add new port VMAF is a perceptual video quality assessment algorithm developed by Netflix. VMAF Development Kit (VDK) is a software package that contains the VMAF algorithm implementation, as well as a set of tools that allows a user to train and test a custom VMAF model. https://github.com/Netflix/vmaf Added: head/multimedia/vmaf/ head/multimedia/vmaf/Makefile (contents, props changed) head/multimedia/vmaf/distinfo (contents, props changed) head/multimedia/vmaf/files/ head/multimedia/vmaf/files/patch-stat64 (contents, props changed) head/multimedia/vmaf/pkg-descr (contents, props changed) head/multimedia/vmaf/pkg-plist (contents, props changed) Modified: head/multimedia/Makefile (contents, props changed) head/multimedia/ffmpeg/Makefile (contents, props changed) head/multimedia/x265/Makefile (contents, props changed) head/multimedia/x265/files/patch-source_CMakeLists.txt (contents, props changed) Modified: head/multimedia/Makefile ============================================================================== --- head/multimedia/Makefile Tue Oct 8 04:11:18 2019 (r514028) +++ head/multimedia/Makefile Tue Oct 8 04:48:28 2019 (r514029) @@ -449,6 +449,7 @@ SUBDIR += vdr-plugins SUBDIR += vid.stab SUBDIR += vlc + SUBDIR += vmaf SUBDIR += vtkmpeg2encode SUBDIR += w_scan SUBDIR += webcamd Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Tue Oct 8 04:11:18 2019 (r514028) +++ head/multimedia/ffmpeg/Makefile Tue Oct 8 04:48:28 2019 (r514029) @@ -41,7 +41,7 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASS BEI LAME LENSFUN LIBBLURAY LIBRSVG2 LIBXML2 LV2 MODPLUG MYSOFA OPENAL OPENCL OPENCV OPENGL \ OPENH264 OPENJPEG OPENMPT OPTIMIZED_CFLAGS OPUS POCKETSPHINX PULSEAUDIO \ RUBBERBAND RTCPU SDL SMB SNAPPY SNDIO SOXR SPEEX SRT SSH TENSORFLOW \ - TESSERACT THEORA TWOLAME V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB VORBIS \ + TESSERACT THEORA TWOLAME V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB VMAF VORBIS \ VO_AMRWBENC VPX WAVPACK WEBP X264 X265 XAVS2 XCB XVID \ XVIDEO ZIMG ZMQ ZVBI @@ -130,6 +130,7 @@ TESSERACT_DESC= Optical Character Recognition via Tess VAPOURSYNTH_DESC= VapourSynth demuxer VFP_DESC= Vector Floating Point instructions VIDSTAB_DESC= Video stabilization filter +VMAF_DESC= VMAF filter via libvmaf XAVS2_DESC= AVS2 encoding via libxavs2 XCB_DESC= X11 grabbing using XCB ZIMG_DESC= "z" library video scaling filter @@ -503,6 +504,10 @@ VAPOURSYNTH_CONFIGURE_ENABLE= vapoursynth VDPAU_USE= XORG=x11 VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau + +# vmaf +VMAF_BUILD_DEPENDS= ${LOCALBASE}/lib/libvmaf.a:multimedia/vmaf +VMAF_CONFIGURE_ENABLE= libvmaf # armv6/armv7 VFP_CONFIGURE_ENABLE= vfp Added: head/multimedia/vmaf/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vmaf/Makefile Tue Oct 8 04:48:28 2019 (r514029) @@ -0,0 +1,33 @@ +# $FreeBSD$ + +PORTNAME= vmaf +DISTVERSIONPREFIX= v +DISTVERSION= 1.3.15 +CATEGORIES= multimedia + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Perceptual video quality assessment based on multi-method fusion + +LICENSE= APACHE20 + +ONLY_FOR_ARCHS= amd64 i386 + +USES= compiler:c11 gmake +USE_GITHUB= yes +GH_ACCOUNT= Netflix +MAKE_ARGS= INSTALL_PREFIX="${PREFIX}" +CFLAGS_i386= -msse # https://github.com/Netflix/vmaf/issues/374 + +post-patch: + @${REINPLACE_CMD} -e '/^CC[[:>:]]/d' \ + -e '/FLAGS =/s/=/+=/' \ + -e 's/ -O[[:>:]]//; s/ -O[0-9]//; s/ -g//' \ + -e '/^CCFLAGS/s/$$/ $$(LDFLAGS)/' \ + ${WRKSRC}/ptools/Makefile.VMAF \ + ${WRKSRC}/*/Makefile + +post-install: + ${INSTALL_PROGRAM} ${WRKSRC}/wrapper/vmafossexec \ + ${STAGEDIR}${PREFIX}/bin + +.include <bsd.port.mk> Added: head/multimedia/vmaf/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vmaf/distinfo Tue Oct 8 04:48:28 2019 (r514029) @@ -0,0 +1,3 @@ +TIMESTAMP = 1567967754 +SHA256 (Netflix-vmaf-v1.3.15_GH0.tar.gz) = 43bbb484102c4d976da4a10d896fb9a11838c8aa809e9c017d5b3edb225b528d +SIZE (Netflix-vmaf-v1.3.15_GH0.tar.gz) = 68124392 Added: head/multimedia/vmaf/files/patch-stat64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vmaf/files/patch-stat64 Tue Oct 8 04:48:28 2019 (r514029) @@ -0,0 +1,26 @@ +https://github.com/Netflix/vmaf/pull/373 + +--- wrapper/Makefile.orig 2019-09-08 18:35:54 UTC ++++ wrapper/Makefile +@@ -56,7 +56,7 @@ CFLAGS_COMMON = -g -O3 -fPIC -w -Wextra -pedantic -D M + + CFLAGS := -std=c99 $(CFLAGS_COMMON) $(CFLAGS) + CXXFLAGS := -std=c++11 $(CFLAGS_COMMON) $(CXXFLAGS) +-CPPFLAGS := $(CPPFLAGS) ++CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS) + LDFLAGS := $(LDFLAGS) + + $(AVX_OBJS): EXTRA_CFLAGS := -mavx +--- wrapper/src/main.cpp.orig 2019-09-08 18:35:54 UTC ++++ wrapper/src/main.cpp +@@ -167,8 +167,8 @@ int run_wrapper(char *fmt, int width, int height, char + struct _stat64 ref_stat; + if (!_stat64(ref_path, &ref_stat)) + #else +- struct stat64 ref_stat; +- if (!stat64(ref_path, &ref_stat)) ++ struct stat ref_stat; ++ if (!stat(ref_path, &ref_stat)) + #endif + { + size_t frame_size = width * height + s->offset; Added: head/multimedia/vmaf/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vmaf/pkg-descr Tue Oct 8 04:48:28 2019 (r514029) @@ -0,0 +1,6 @@ +VMAF is a perceptual video quality assessment algorithm developed by +Netflix. VMAF Development Kit (VDK) is a software package that +contains the VMAF algorithm implementation, as well as a set of tools +that allows a user to train and test a custom VMAF model. + +WWW: https://github.com/Netflix/vmaf Added: head/multimedia/vmaf/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vmaf/pkg-plist Tue Oct 8 04:48:28 2019 (r514029) @@ -0,0 +1,206 @@ +bin/vmafossexec +include/libvmaf.h +lib/libvmaf.a +libdata/pkgconfig/libvmaf.pc +share/model/other_models/model_V8a.model +share/model/other_models/nflx_v1.pkl +share/model/other_models/nflx_v1.pkl.model +share/model/other_models/nflx_vmaff_rf_v1.pkl +share/model/other_models/nflx_vmaff_rf_v2.pkl +share/model/other_models/nflxall_libsvmnusvr_currentbest.pkl +share/model/other_models/nflxall_libsvmnusvr_currentbest.pkl.model +share/model/other_models/nflxall_vmafv1.pkl +share/model/other_models/nflxall_vmafv1.pkl.model +share/model/other_models/nflxall_vmafv2.pkl +share/model/other_models/nflxall_vmafv2.pkl.model +share/model/other_models/nflxall_vmafv3.pkl +share/model/other_models/nflxall_vmafv3.pkl.model +share/model/other_models/nflxall_vmafv3a.pkl +share/model/other_models/nflxall_vmafv3a.pkl.model +share/model/other_models/nflxall_vmafv4.pkl +share/model/other_models/nflxall_vmafv4.pkl.model +share/model/other_models/nflxtrain_libsvmnusvr_currentbest.pkl +share/model/other_models/nflxtrain_libsvmnusvr_currentbest.pkl.model +share/model/other_models/nflxtrain_norm_type_none.pkl +share/model/other_models/nflxtrain_norm_type_none.pkl.model +share/model/other_models/nflxtrain_vmafv1.pkl +share/model/other_models/nflxtrain_vmafv1.pkl.model +share/model/other_models/nflxtrain_vmafv2.pkl +share/model/other_models/nflxtrain_vmafv2.pkl.model +share/model/other_models/nflxtrain_vmafv3.pkl +share/model/other_models/nflxtrain_vmafv3.pkl.model +share/model/other_models/nflxtrain_vmafv3a.pkl +share/model/other_models/nflxtrain_vmafv3a.pkl.model +share/model/other_models/niqe_v0.1.pkl +share/model/other_models/vmaf_4k_v0.6.1rc.pkl +share/model/other_models/vmaf_4k_v0.6.1rc.pkl.model +share/model/other_models/vmaf_v0.6.0.pkl +share/model/other_models/vmaf_v0.6.0.pkl.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0001 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0001.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0002 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0002.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0003 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0003.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0004 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0004.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0005 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0005.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0006 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0006.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0007 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0007.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0008 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0008.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0009 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0009.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0010 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0010.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0011 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0011.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0012 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0012.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0013 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0013.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0014 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0014.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0015 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0015.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0016 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0016.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0017 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0017.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0018 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0018.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0019 +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.0019.model +share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl.model +share/model/vmaf_4k_v0.6.1.pkl +share/model/vmaf_4k_v0.6.1.pkl.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0001 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0001.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0002 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0002.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0003 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0003.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0004 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0004.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0005 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0005.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0006 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0006.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0007 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0007.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0008 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0008.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0009 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0009.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0010 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0010.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0011 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0011.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0012 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0012.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0013 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0013.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0014 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0014.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0015 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0015.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0016 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0016.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0017 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0017.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0018 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0018.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0019 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0019.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0020 +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0020.model +share/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0001 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0001.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0002 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0002.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0003 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0003.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0004 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0004.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0005 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0005.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0006 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0006.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0007 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0007.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0008 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0008.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0009 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0009.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0010 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0010.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0011 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0011.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0012 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0012.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0013 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0013.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0014 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0014.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0015 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0015.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0016 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0016.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0017 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0017.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0018 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0018.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0019 +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.0019.model +share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.pkl.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0001 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0001.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0002 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0002.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0003 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0003.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0004 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0004.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0005 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0005.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0006 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0006.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0007 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0007.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0008 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0008.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0009 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0009.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0010 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0010.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0011 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0011.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0012 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0012.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0013 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0013.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0014 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0014.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0015 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0015.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0016 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0016.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0017 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0017.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0018 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0018.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0019 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0019.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0020 +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0020.model +share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.model +share/model/vmaf_v0.6.1.pkl +share/model/vmaf_v0.6.1.pkl.model Modified: head/multimedia/x265/Makefile ============================================================================== --- head/multimedia/x265/Makefile Tue Oct 8 04:11:18 2019 (r514028) +++ head/multimedia/x265/Makefile Tue Oct 8 04:48:28 2019 (r514029) @@ -21,7 +21,7 @@ BUILD_DEPENDS= nasm:devel/nasm USES= cmake compiler:c++14-lang pathfix -OPTIONS_DEFINE= DEBUG OPTIMIZED_FLAGS +OPTIONS_DEFINE= DEBUG OPTIMIZED_FLAGS VMAF OPTIONS_DEFINE_amd64= HI10P HI12P SVTHEVC DEBUG_PREVENTS= OPTIMIZED_FLAGS @@ -34,12 +34,16 @@ OPTIMIZED_FLAGS_VARS= CFLAGS+=-O3 CXXFLAGS+=-O3 SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc SVTHEVC_CMAKE_BOOL= ENABLE_SVT_HEVC SVTHEVC_CMAKE_ON= -DSVT_HEVC_INCLUDE_DIR:PATH="${LOCALBASE}/include/svt-hevc" +VMAF_BUILD_DEPENDS= ${LOCALBASE}/lib/libvmaf.a:multimedia/vmaf +VMAF_USES= localbase:ldflags +VMAF_CMAKE_BOOL= ENABLE_LIBVMAF DEBUG_DESC= Enable debugging HI10P_DESC= Enable HI10P Support (64-bit only) HI12P_DESC= Enable HI12P Support (64-bit only) OPTIMIZED_FLAGS_DESC= Enable O3 optimization SVTHEVC_DESC= HEVC encoding via SVT-HEVC +VMAF_DESC= Per frame and aggregate VMAF score USE_LDCONFIG= yes CMAKE_ARGS= -DENABLE_PIC=on -DENABLE_TESTS=on Modified: head/multimedia/x265/files/patch-source_CMakeLists.txt ============================================================================== --- head/multimedia/x265/files/patch-source_CMakeLists.txt Tue Oct 8 04:11:18 2019 (r514028) +++ head/multimedia/x265/files/patch-source_CMakeLists.txt Tue Oct 8 04:48:28 2019 (r514029) @@ -4,6 +4,8 @@ Error: Orphaned: include/EbApi.h Error: Orphaned: include/EbErrorCodes.h Error: Orphaned: include/EbTime.h +libx265.so.179: undefined reference to `compute_vmaf' + --- source/CMakeLists.txt.orig 2019-01-23 09:47:18 UTC +++ source/CMakeLists.txt @@ -570,13 +570,6 @@ if(ENABLE_HDR10_PLUS) @@ -20,3 +22,13 @@ Error: Orphaned: include/EbTime.h install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED)) if(MSVC_IDE) +@@ -627,6 +620,9 @@ if(ENABLE_SHARED) + endif() + if(EXTRA_LIB) + target_link_libraries(x265-shared ${EXTRA_LIB}) ++ endif() ++ if(ENABLE_LIBVMAF) ++ target_link_libraries(x265-shared ${VMAF}) + endif() + target_link_libraries(x265-shared ${PLATFORM_LIBS}) + if(SVTHEVC_FOUND)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910080448.x984mTWT086474>