mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-05 01:55:52 +00:00
multimedia/libde265: Update to 1.0.8
- Use upstream release archive as recommended by Porters Handbook (see USE_GITHUB section) - Backport upstream commits 900772c3e9ee1e106b93283fd8e7633d52899e40 , 7d5aeb5f11531de33f5b7ae0e768ffc50da4facb , dbff9077462899fc8e3b39907d43c2a6ad54e9f3 , a3f1c6a0dea2b0d4a531255ad06ed40cdb184d25 and 4c0fe2c149c68ece57fde4cb11e05b5fb572da4b for various bug fixes - Package dec265 utility, also rename it as libde265-dec265 to match Debian's repository - Import patches from Debian to only expose public API and disable tools that don't build without internal API exposed. References:900772c3e9
7d5aeb5f11
dbff907746
a3f1c6a0de
4c0fe2c149
https://salsa.debian.org/multimedia-team/libde265/-/blob/master/debian/patches/only_export_decoder_api.patch https://salsa.debian.org/multimedia-team/libde265/-/blob/master/debian/patches/disable_tools.patch Patch initially submitted by vishwin PR: 251442 Reported by: vishwin Approved by: kwm (maintainer timeout, 14+ months)
This commit is contained in:
parent
16ed4da8aa
commit
c9445b18bf
@ -1,20 +1,28 @@
|
||||
# Created by: Koop Mast <kwm@FreeBSD.org>
|
||||
|
||||
PORTNAME= libde265
|
||||
PORTVERSION= 1.0.2
|
||||
PORTREVISION= 5
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.0.8
|
||||
CATEGORIES= multimedia
|
||||
MASTER_SITES= https://github.com/strukturag/${PORTNAME}/releases/download/v${DISTVERSION}/
|
||||
|
||||
PATCH_SITES= https://github.com/strukturag/${PORTNAME}/commit/
|
||||
PATCHFILES= 900772c3e9ee1e106b93283fd8e7633d52899e40.patch:-p1 \
|
||||
7d5aeb5f11531de33f5b7ae0e768ffc50da4facb.patch:-p1 \
|
||||
dbff9077462899fc8e3b39907d43c2a6ad54e9f3.patch:-p1 \
|
||||
a3f1c6a0dea2b0d4a531255ad06ed40cdb184d25.patch:-p1 \
|
||||
4c0fe2c149c68ece57fde4cb11e05b5fb572da4b.patch:-p1
|
||||
|
||||
MAINTAINER= kwm@FreeBSD.org
|
||||
COMMENT= Open source h.265 video codec
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= strukturag
|
||||
LICENSE= LGPL3
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
USES= autoreconf compiler:c++11-lib libtool pathfix pkgconfig
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --disable-sherlock265 --disable-dec265
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONFIGURE_ARGS= --disable-static --disable-sherlock265
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
@ -24,4 +32,9 @@ CONFIGURE_ENV+= CCASFLAGS="${CFLAGS} -B${LOCALBASE}/bin -no-integrated-as"
|
||||
LLD_UNSAFE= yes
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libde265.so.0.1.1
|
||||
${MV} ${STAGEDIR}${PREFIX}/bin/dec265 \
|
||||
${STAGEDIR}${PREFIX}/bin/libde265-dec265
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
@ -1,2 +1,13 @@
|
||||
SHA256 (strukturag-libde265-v1.0.2_GH0.tar.gz) = c9769a621d568bf5d1e687453cb5d996d7a813476813edb4752ce0fea437fca8
|
||||
SIZE (strukturag-libde265-v1.0.2_GH0.tar.gz) = 381737
|
||||
TIMESTAMP = 1644223000
|
||||
SHA256 (libde265-1.0.8.tar.gz) = 24c791dd334fa521762320ff54f0febfd3c09fc978880a8c5fbc40a88f21d905
|
||||
SIZE (libde265-1.0.8.tar.gz) = 837878
|
||||
SHA256 (900772c3e9ee1e106b93283fd8e7633d52899e40.patch) = 121750b44912f45c071b866f6183d7a17cd0e2e2734c69dfa18251ee83fee2db
|
||||
SIZE (900772c3e9ee1e106b93283fd8e7633d52899e40.patch) = 871
|
||||
SHA256 (7d5aeb5f11531de33f5b7ae0e768ffc50da4facb.patch) = 49dbd9d91071b2977753b60645b9465d395f4d9e28d304afb97331594d1befa8
|
||||
SIZE (7d5aeb5f11531de33f5b7ae0e768ffc50da4facb.patch) = 2677
|
||||
SHA256 (dbff9077462899fc8e3b39907d43c2a6ad54e9f3.patch) = 47e3cb0424963a9187dc8fa2944b195a9203da0218efd550683dda9be6884fca
|
||||
SIZE (dbff9077462899fc8e3b39907d43c2a6ad54e9f3.patch) = 733
|
||||
SHA256 (a3f1c6a0dea2b0d4a531255ad06ed40cdb184d25.patch) = e47243f811d9924aaea7c76043cebfe9254a32797b92fabd9526b5d8cd491264
|
||||
SIZE (a3f1c6a0dea2b0d4a531255ad06ed40cdb184d25.patch) = 2348
|
||||
SHA256 (4c0fe2c149c68ece57fde4cb11e05b5fb572da4b.patch) = da76d56fd0d5ab480c4e44a8d3bbd8adf17ebd5b6e77c1516dacf8f17edb9e2c
|
||||
SIZE (4c0fe2c149c68ece57fde4cb11e05b5fb572da4b.patch) = 1709
|
||||
|
@ -1,60 +0,0 @@
|
||||
--- configure.ac.orig 2015-07-14 13:51:51.000000000 +0200
|
||||
+++ configure.ac 2015-07-22 16:42:42.854395000 +0200
|
||||
@@ -36,8 +36,8 @@
|
||||
# Initialize automake stuff
|
||||
AM_INIT_AUTOMAKE
|
||||
|
||||
-CFLAGS+=" -std=c99"
|
||||
-CXXFLAGS+=" -Werror=return-type -Werror=unused-result -Werror=reorder"
|
||||
+CFLAGS="$CFLAGS -std=c99"
|
||||
+CXXFLAGS="$CXXFLAGS -Werror=return-type -Werror=unused-result -Werror=reorder"
|
||||
AX_CXX_COMPILE_STDCXX_11()
|
||||
|
||||
dnl Use -Wall if we have gcc.
|
||||
@@ -101,8 +101,8 @@
|
||||
],[],[need_strict_ansi=no],[need_strict_ansi=yes]);
|
||||
AC_LANG_POP(C++)
|
||||
if eval "test x$need_strict_ansi = xyes"; then
|
||||
- CFLAGS+=" -D__STRICT_ANSI__"
|
||||
- CXXFLAGS+=" -D__STRICT_ANSI__"
|
||||
+ CFLAGS="$CFLAGS -D__STRICT_ANSI__"
|
||||
+ CXXFLAGS="$CXXFLAGS -D__STRICT_ANSI__"
|
||||
fi
|
||||
AC_MSG_RESULT([$need_strict_ansi])
|
||||
|
||||
@@ -180,7 +180,7 @@
|
||||
[enable_log_error=$enableval],
|
||||
[enable_log_error=yes])
|
||||
if eval "test $enable_log_error = yes"; then
|
||||
- CXXFLAGS+=" -DDE265_LOG_ERROR"
|
||||
+ CXXFLAGS="$CXXFLAGS -DDE265_LOG_ERROR"
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(log-info,
|
||||
@@ -189,7 +189,7 @@
|
||||
[enable_log_info=$enableval],
|
||||
[enable_log_info=no])
|
||||
if eval "test $enable_log_info = yes"; then
|
||||
- CXXFLAGS+=" -DDE265_LOG_INFO"
|
||||
+ CXXFLAGS="$CXXFLAGS -DDE265_LOG_INFO"
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(log-debug,
|
||||
@@ -198,7 +198,7 @@
|
||||
[enable_log_debug=$enableval],
|
||||
[enable_log_debug=no])
|
||||
if eval "test $enable_log_debug = yes"; then
|
||||
- CXXFLAGS+=" -DDE265_LOG_DEBUG"
|
||||
+ CXXFLAGS="$CXXFLAGS -DDE265_LOG_DEBUG"
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(log-trace,
|
||||
@@ -207,7 +207,7 @@
|
||||
[enable_log_trace=$enableval],
|
||||
[enable_log_trace=no])
|
||||
if eval "test $enable_log_trace = yes"; then
|
||||
- CXXFLAGS+=" -DDE265_LOG_TRACE"
|
||||
+ CXXFLAGS="$CXXFLAGS -DDE265_LOG_TRACE"
|
||||
fi
|
||||
|
||||
|
41
multimedia/libde265/files/patch-disable-tools
Normal file
41
multimedia/libde265/files/patch-disable-tools
Normal file
@ -0,0 +1,41 @@
|
||||
Description: Disable building of some internal tools that no longer link
|
||||
because internal symbols are no longer exported.
|
||||
Author: Joachim Bauch <bauch@struktur.de>
|
||||
--- dec265/Makefile.am
|
||||
+++ dec265/Makefile.am
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
-bin_PROGRAMS = dec265 hdrcopy
|
||||
+bin_PROGRAMS = dec265
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
|
||||
|
||||
@@ -9,12 +9,6 @@
|
||||
dec265_LDADD = ../libde265/libde265.la -lstdc++
|
||||
dec265_SOURCES = dec265.cc
|
||||
|
||||
-hdrcopy_DEPENDENCIES = ../libde265/libde265.la
|
||||
-hdrcopy_CXXFLAGS =
|
||||
-hdrcopy_LDFLAGS =
|
||||
-hdrcopy_LDADD = ../libde265/libde265.la -lstdc++
|
||||
-hdrcopy_SOURCES = hdrcopy.cc
|
||||
-
|
||||
if HAVE_VIDEOGFX
|
||||
dec265_CXXFLAGS += $(VIDEOGFX_CFLAGS)
|
||||
dec265_LDFLAGS += $(VIDEOGFX_LIBS)
|
||||
--- Makefile.am
|
||||
+++ Makefile.am
|
||||
@@ -8,13 +8,6 @@
|
||||
SUBDIRS+=dec265
|
||||
endif
|
||||
|
||||
-if ENABLE_ENCODER
|
||||
-SUBDIRS+=enc265
|
||||
-endif
|
||||
-
|
||||
-SUBDIRS+=tools
|
||||
-SUBDIRS+=acceleration-speed
|
||||
-
|
||||
if ENABLE_SHERLOCK265
|
||||
SUBDIRS+=sherlock265
|
||||
endif
|
@ -1,19 +0,0 @@
|
||||
--- libde265/Makefile.am.orig 2015-07-22 17:41:19.854783000 +0200
|
||||
+++ libde265/Makefile.am 2015-07-22 17:41:35.651508000 +0200
|
||||
@@ -19,7 +19,6 @@
|
||||
endif
|
||||
|
||||
libde265_la_LDFLAGS = -version-info $(LIBDE265_CURRENT):$(LIBDE265_REVISION):$(LIBDE265_AGE)
|
||||
-libde265_la_LIBADD = -lstdc++
|
||||
|
||||
libde265_la_SOURCES = \
|
||||
acceleration.h \
|
||||
@@ -92,7 +91,7 @@
|
||||
vui.h
|
||||
|
||||
SUBDIRS = encoder
|
||||
-libde265_la_LIBADD += encoder/libde265_encoder.la
|
||||
+libde265_la_LIBADD = encoder/libde265_encoder.la
|
||||
|
||||
if ENABLE_SSE_OPT
|
||||
SUBDIRS += x86
|
@ -1,11 +0,0 @@
|
||||
--- libde265/fallback-dct.cc.orig 2015-07-14 13:51:51.000000000 +0200
|
||||
+++ libde265/fallback-dct.cc 2015-07-22 17:24:55.690743000 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#if defined(_MSC_VER) || defined(__MINGW32__)
|
||||
# include <malloc.h>
|
||||
-#else
|
||||
+#elif defined(HAVE_ALLOCA_H)
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- libde265/fallback-motion.cc.orig 2015-07-14 13:51:51.000000000 +0200
|
||||
+++ libde265/fallback-motion.cc 2015-07-22 17:25:04.707534000 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#if defined(_MSC_VER) || defined(__MINGW32__)
|
||||
# include <malloc.h>
|
||||
-#else
|
||||
+#elif defined(HAVE_ALLOCA_H)
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- libde265/image.cc.orig 2015-07-14 13:51:51.000000000 +0200
|
||||
+++ libde265/image.cc 2015-07-22 17:32:34.455583000 +0200
|
||||
@@ -47,7 +47,7 @@
|
||||
#elif _WIN32
|
||||
#define ALLOC_ALIGNED(alignment, size) _aligned_malloc((size), (alignment))
|
||||
#define FREE_ALIGNED(mem) _aligned_free((mem))
|
||||
-#elif __APPLE__
|
||||
+#elif defined(HAVE_POSIX_MEMALIGN)
|
||||
static inline void *ALLOC_ALIGNED(size_t alignment, size_t size) {
|
||||
void *mem = NULL;
|
||||
if (posix_memalign(&mem, alignment, size) != 0) {
|
@ -1,11 +0,0 @@
|
||||
--- libde265/motion.cc.orig 2015-07-14 13:51:51.000000000 +0200
|
||||
+++ libde265/motion.cc 2015-07-22 17:25:26.140610000 +0200
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
#if defined(_MSC_VER) || defined(__MINGW32__)
|
||||
# include <malloc.h>
|
||||
-#else
|
||||
+#elif defined(HAVE_ALLOCA_H)
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- libde265/pps.cc.orig 2015-07-14 13:51:51.000000000 +0200
|
||||
+++ libde265/pps.cc 2015-07-22 17:25:38.546345000 +0200
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <string.h>
|
||||
#if defined(_MSC_VER) || defined(__MINGW32__)
|
||||
# include <malloc.h>
|
||||
-#else
|
||||
+#elif defined(HAVE_ALLOCA_H)
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- libde265/refpic.cc.orig 2015-07-14 13:51:51.000000000 +0200
|
||||
+++ libde265/refpic.cc 2015-07-22 17:25:52.916195000 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <stdlib.h>
|
||||
#if defined(_MSC_VER) || defined(__MINGW32__)
|
||||
# include <malloc.h>
|
||||
-#else
|
||||
+#elif defined(HAVE_ALLOCA_H)
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- libde265/threads.cc.orig 2015-07-14 13:51:51.000000000 +0200
|
||||
+++ libde265/threads.cc 2015-07-22 17:26:03.712606000 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
#if defined(_MSC_VER) || defined(__MINGW32__)
|
||||
# include <malloc.h>
|
||||
-#else
|
||||
+#elif defined(HAVE_ALLOCA_H)
|
||||
# include <alloca.h>
|
||||
#endif
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- libde265/util.h.orig 2015-07-22 16:48:18.032493000 +0200
|
||||
+++ libde265/util.h 2015-07-22 16:48:43.439129000 +0200
|
||||
@@ -70,7 +70,7 @@
|
||||
namespace std { using namespace std::tr1; }
|
||||
#endif
|
||||
|
||||
-#if __GNUC__ && GCC_VERSION < 40600
|
||||
+#if __GNUC__ && GCC_VERSION < 40600 && !defined(__clang__)
|
||||
// nullptr was introduced in gcc 4.6, a simple alias should be fine for our use case
|
||||
#define nullptr NULL
|
||||
#endif
|
285
multimedia/libde265/files/patch-only-export-decoder-api
Normal file
285
multimedia/libde265/files/patch-only-export-decoder-api
Normal file
@ -0,0 +1,285 @@
|
||||
Description: Only export symbols defined in the decoder API.
|
||||
The encoder API is not final yet, so upstream exports all symbols to make
|
||||
development easier. For packaging we only want to expose the public API.
|
||||
Author: Joachim Bauch <bauch@struktur.de>
|
||||
--- libde265/encoder/Makefile.am
|
||||
+++ libde265/encoder/Makefile.am
|
||||
@@ -12,6 +12,18 @@
|
||||
encpicbuf.h encpicbuf.cc \
|
||||
sop.h sop.cc
|
||||
|
||||
+libde265_encoder_la_CFLAGS = \
|
||||
+ $(CFLAG_VISIBILITY) \
|
||||
+ -DLIBDE265_EXPORTS
|
||||
+libde265_encoder_la_CXXFLAGS += \
|
||||
+ $(CFLAG_VISIBILITY) \
|
||||
+ -DLIBDE265_EXPORTS
|
||||
+
|
||||
+if HAVE_VISIBILITY
|
||||
+ libde265_encoder_la_CFLAGS += -DHAVE_VISIBILITY
|
||||
+ libde265_encoder_la_CXXFLAGS += -DHAVE_VISIBILITY
|
||||
+endif
|
||||
+
|
||||
SUBDIRS=algo
|
||||
libde265_encoder_la_LIBADD = algo/libde265_encoder_algo.la
|
||||
|
||||
--- libde265/encoder/algo/Makefile.am
|
||||
+++ libde265/encoder/algo/Makefile.am
|
||||
@@ -17,5 +17,13 @@
|
||||
tb-rateestim.h tb-rateestim.cc \
|
||||
pb-mv.h pb-mv.cc
|
||||
|
||||
+libde265_encoder_algo_la_CXXFLAGS += \
|
||||
+ $(CFLAG_VISIBILITY) \
|
||||
+ -DLIBDE265_EXPORTS
|
||||
+
|
||||
+if HAVE_VISIBILITY
|
||||
+ libde265_encoder_algo_la_CXXFLAGS += -DHAVE_VISIBILITY
|
||||
+endif
|
||||
+
|
||||
EXTRA_DIST = \
|
||||
CMakeLists.txt
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -56,9 +56,7 @@
|
||||
fi
|
||||
changequote([,])dnl
|
||||
|
||||
-dnl gl_VISIBILITY
|
||||
-dnl : In encoder branch, we still export all library symbols :
|
||||
-HAVE_VISIBILITY=0
|
||||
+gl_VISIBILITY
|
||||
AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" != "x0"])
|
||||
|
||||
# Checks for header files.
|
||||
--- libde265/image-io.cc
|
||||
+++ libde265/image-io.cc
|
||||
@@ -186,7 +186,7 @@
|
||||
}
|
||||
|
||||
|
||||
-LIBDE265_API PacketSink_File::~PacketSink_File()
|
||||
+PacketSink_File::~PacketSink_File()
|
||||
{
|
||||
if (mFH) {
|
||||
fclose(mFH);
|
||||
@@ -194,7 +194,7 @@
|
||||
}
|
||||
|
||||
|
||||
-LIBDE265_API void PacketSink_File::set_filename(const char* filename)
|
||||
+void PacketSink_File::set_filename(const char* filename)
|
||||
{
|
||||
assert(mFH==NULL);
|
||||
|
||||
@@ -202,7 +202,7 @@
|
||||
}
|
||||
|
||||
|
||||
-LIBDE265_API void PacketSink_File::send_packet(const uint8_t* data, int n)
|
||||
+void PacketSink_File::send_packet(const uint8_t* data, int n)
|
||||
{
|
||||
uint8_t startCode[3];
|
||||
startCode[0] = 0;
|
||||
--- libde265/image-io.h
|
||||
+++ libde265/image-io.h
|
||||
@@ -30,17 +30,17 @@
|
||||
class ImageSource
|
||||
{
|
||||
public:
|
||||
- LIBDE265_API ImageSource();
|
||||
- virtual LIBDE265_API ~ImageSource() { }
|
||||
+ ImageSource();
|
||||
+ virtual ~ImageSource() { }
|
||||
|
||||
//enum ImageStatus { Available, Waiting, EndOfVideo };
|
||||
|
||||
//virtual ImageStatus get_status() = 0;
|
||||
- virtual LIBDE265_API de265_image* get_image(bool block=true) = 0;
|
||||
- virtual LIBDE265_API void skip_frames(int n) = 0;
|
||||
+ virtual de265_image* get_image(bool block=true) = 0;
|
||||
+ virtual void skip_frames(int n) = 0;
|
||||
|
||||
- virtual LIBDE265_API int get_width() const = 0;
|
||||
- virtual LIBDE265_API int get_height() const = 0;
|
||||
+ virtual int get_width() const = 0;
|
||||
+ virtual int get_height() const = 0;
|
||||
};
|
||||
|
||||
|
||||
@@ -48,17 +48,17 @@
|
||||
class ImageSource_YUV : public ImageSource
|
||||
{
|
||||
public:
|
||||
- LIBDE265_API ImageSource_YUV();
|
||||
- virtual LIBDE265_API ~ImageSource_YUV();
|
||||
+ ImageSource_YUV();
|
||||
+ virtual ~ImageSource_YUV();
|
||||
|
||||
- bool LIBDE265_API set_input_file(const char* filename, int w,int h);
|
||||
+ bool set_input_file(const char* filename, int w,int h);
|
||||
|
||||
//virtual ImageStatus get_status();
|
||||
- virtual LIBDE265_API de265_image* get_image(bool block=true);
|
||||
- virtual LIBDE265_API void skip_frames(int n);
|
||||
+ virtual de265_image* get_image(bool block=true);
|
||||
+ virtual void skip_frames(int n);
|
||||
|
||||
- virtual LIBDE265_API int get_width() const { return width; }
|
||||
- virtual LIBDE265_API int get_height() const { return height; }
|
||||
+ virtual int get_width() const { return width; }
|
||||
+ virtual int get_height() const { return height; }
|
||||
|
||||
private:
|
||||
FILE* mFH;
|
||||
@@ -74,20 +74,20 @@
|
||||
class ImageSink
|
||||
{
|
||||
public:
|
||||
- virtual LIBDE265_API ~ImageSink() { }
|
||||
+ virtual ~ImageSink() { }
|
||||
|
||||
- virtual LIBDE265_API void send_image(const de265_image* img) = 0;
|
||||
+ virtual void send_image(const de265_image* img) = 0;
|
||||
};
|
||||
|
||||
class ImageSink_YUV : public ImageSink
|
||||
{
|
||||
public:
|
||||
- LIBDE265_API ImageSink_YUV() : mFH(NULL) { }
|
||||
- LIBDE265_API ~ImageSink_YUV();
|
||||
+ ImageSink_YUV() : mFH(NULL) { }
|
||||
+ ~ImageSink_YUV();
|
||||
|
||||
- bool LIBDE265_API set_filename(const char* filename);
|
||||
+ bool set_filename(const char* filename);
|
||||
|
||||
- virtual LIBDE265_API void send_image(const de265_image* img);
|
||||
+ virtual void send_image(const de265_image* img);
|
||||
|
||||
private:
|
||||
FILE* mFH;
|
||||
@@ -98,21 +98,21 @@
|
||||
class PacketSink
|
||||
{
|
||||
public:
|
||||
- virtual LIBDE265_API ~PacketSink() { }
|
||||
+ virtual ~PacketSink() { }
|
||||
|
||||
- virtual LIBDE265_API void send_packet(const uint8_t* data, int n) = 0;
|
||||
+ virtual void send_packet(const uint8_t* data, int n) = 0;
|
||||
};
|
||||
|
||||
|
||||
class PacketSink_File : public PacketSink
|
||||
{
|
||||
public:
|
||||
- LIBDE265_API PacketSink_File();
|
||||
- virtual LIBDE265_API ~PacketSink_File();
|
||||
+ PacketSink_File();
|
||||
+ virtual ~PacketSink_File();
|
||||
|
||||
- LIBDE265_API void set_filename(const char* filename);
|
||||
+ void set_filename(const char* filename);
|
||||
|
||||
- virtual LIBDE265_API void send_packet(const uint8_t* data, int n);
|
||||
+ virtual void send_packet(const uint8_t* data, int n);
|
||||
|
||||
private:
|
||||
FILE* mFH;
|
||||
--- libde265/configparam.h
|
||||
+++ libde265/configparam.h
|
||||
@@ -95,7 +95,7 @@
|
||||
bool hasLongOption() const { return true; } //mLongOption!=NULL; }
|
||||
std::string getLongOption() const { return mLongOption ? std::string(mLongOption) : get_name(); }
|
||||
|
||||
- virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx) { return false; }
|
||||
+ virtual bool processCmdLineArguments(char** argv, int* argc, int idx) { return false; }
|
||||
|
||||
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
virtual std::string get_default_string() const { return default_value ? "true":"false"; }
|
||||
|
||||
virtual std::string getTypeDescr() const { return "(boolean)"; }
|
||||
- virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx) { set(true); return true; }
|
||||
+ virtual bool processCmdLineArguments(char** argv, int* argc, int idx) { set(true); return true; }
|
||||
|
||||
bool set(bool v) { value_set=true; value=v; return true; }
|
||||
|
||||
@@ -162,10 +162,10 @@
|
||||
virtual bool has_default() const { return default_set; }
|
||||
|
||||
void set_default(std::string v) { default_value=v; default_set=true; }
|
||||
- virtual LIBDE265_API std::string get_default_string() const { return default_value; }
|
||||
+ virtual std::string get_default_string() const { return default_value; }
|
||||
|
||||
- virtual LIBDE265_API std::string getTypeDescr() const { return "(string)"; }
|
||||
- virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx);
|
||||
+ virtual std::string getTypeDescr() const { return "(string)"; }
|
||||
+ virtual bool processCmdLineArguments(char** argv, int* argc, int idx);
|
||||
|
||||
bool set(std::string v) { value_set=true; value=v; return true; }
|
||||
|
||||
@@ -201,10 +201,10 @@
|
||||
virtual bool has_default() const { return default_set; }
|
||||
|
||||
void set_default(int v) { default_value=v; default_set=true; }
|
||||
- virtual LIBDE265_API std::string get_default_string() const;
|
||||
+ virtual std::string get_default_string() const;
|
||||
|
||||
- virtual LIBDE265_API std::string getTypeDescr() const;
|
||||
- virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx);
|
||||
+ virtual std::string getTypeDescr() const;
|
||||
+ virtual bool processCmdLineArguments(char** argv, int* argc, int idx);
|
||||
|
||||
bool set(int v) {
|
||||
if (is_valid(v)) { value_set=true; value=v; return true; }
|
||||
@@ -239,7 +239,7 @@
|
||||
virtual std::vector<std::string> get_choice_names() const = 0;
|
||||
|
||||
virtual std::string getTypeDescr() const;
|
||||
- virtual LIBDE265_API bool processCmdLineArguments(char** argv, int* argc, int idx);
|
||||
+ virtual bool processCmdLineArguments(char** argv, int* argc, int idx);
|
||||
|
||||
const char** get_choices_string_table() const;
|
||||
|
||||
@@ -368,10 +368,10 @@
|
||||
config_parameters() : param_string_table(NULL) { }
|
||||
~config_parameters() { delete[] param_string_table; }
|
||||
|
||||
- void LIBDE265_API add_option(option_base* o);
|
||||
+ void add_option(option_base* o);
|
||||
|
||||
- void LIBDE265_API print_params() const;
|
||||
- bool LIBDE265_API parse_command_line_params(int* argc, char** argv, int* first_idx=NULL,
|
||||
+ void print_params() const;
|
||||
+ bool parse_command_line_params(int* argc, char** argv, int* first_idx=NULL,
|
||||
bool ignore_unknown_options=false);
|
||||
|
||||
|
||||
--- libde265/quality.h
|
||||
+++ libde265/quality.h
|
||||
@@ -26,11 +26,11 @@
|
||||
#include <libde265/image.h>
|
||||
|
||||
|
||||
-LIBDE265_API uint32_t SSD(const uint8_t* img, int imgStride,
|
||||
+uint32_t SSD(const uint8_t* img, int imgStride,
|
||||
const uint8_t* ref, int refStride,
|
||||
int width, int height);
|
||||
|
||||
-LIBDE265_API uint32_t SAD(const uint8_t* img, int imgStride,
|
||||
+uint32_t SAD(const uint8_t* img, int imgStride,
|
||||
const uint8_t* ref, int refStride,
|
||||
int width, int height);
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
LIBDE265_API double PSNR(double mse);
|
||||
|
||||
|
||||
-LIBDE265_API uint32_t compute_distortion_ssd(const de265_image* img1, const de265_image* img2,
|
||||
+uint32_t compute_distortion_ssd(const de265_image* img1, const de265_image* img2,
|
||||
int x0, int y0, int log2size, int cIdx);
|
||||
|
||||
#endif
|
@ -1,14 +1,7 @@
|
||||
bin/bjoentegaard
|
||||
bin/block-rate-estim
|
||||
bin/enc265
|
||||
bin/gen-enc-table
|
||||
bin/rd-curves
|
||||
bin/tests
|
||||
bin/yuv-distortion
|
||||
bin/libde265-dec265
|
||||
include/libde265/de265-version.h
|
||||
include/libde265/de265.h
|
||||
lib/libde265.a
|
||||
lib/libde265.so
|
||||
lib/libde265.so.0
|
||||
lib/libde265.so.0.0.10
|
||||
lib/libde265.so.0.1.1
|
||||
libdata/pkgconfig/libde265.pc
|
||||
|
Loading…
Reference in New Issue
Block a user