From: Debian Multimedia Maintainers Date: Fri, 20 Dec 2019 11:17:15 +0000 (+0000) Subject: only_export_decoder_api X-Git-Tag: archive/raspbian/1.0.4-1+rpi1^2~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cc8618edcfa29ad833600ad227c689e991d79cab;p=libde265.git only_export_decoder_api Gbp-Pq: Name only_export_decoder_api.patch --- diff --git a/configure.ac b/configure.ac index 91fd23f..1c11638 100644 --- a/configure.ac +++ b/configure.ac @@ -56,9 +56,7 @@ if test "x$GCC" = "xyes"; then 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. diff --git a/libde265/configparam.h b/libde265/configparam.h index 58b1daa..9e3496c 100644 --- a/libde265/configparam.h +++ b/libde265/configparam.h @@ -95,7 +95,7 @@ class option_base 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 @@ public: 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 @@ public: 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 @@ public: 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 @@ public: virtual std::vector 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 @@ class config_parameters 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); diff --git a/libde265/encoder/Makefile.am b/libde265/encoder/Makefile.am index 6cbf204..6de5664 100644 --- a/libde265/encoder/Makefile.am +++ b/libde265/encoder/Makefile.am @@ -10,6 +10,18 @@ libde265_encoder_la_SOURCES = \ 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 diff --git a/libde265/encoder/algo/Makefile.am b/libde265/encoder/algo/Makefile.am index 828d227..1c29615 100644 --- a/libde265/encoder/algo/Makefile.am +++ b/libde265/encoder/algo/Makefile.am @@ -17,5 +17,13 @@ libde265_encoder_algo_la_SOURCES = \ 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 diff --git a/libde265/image-io.cc b/libde265/image-io.cc index 35e97bf..9aa7d13 100644 --- a/libde265/image-io.cc +++ b/libde265/image-io.cc @@ -183,7 +183,7 @@ PacketSink_File::PacketSink_File() } -LIBDE265_API PacketSink_File::~PacketSink_File() +PacketSink_File::~PacketSink_File() { if (mFH) { fclose(mFH); @@ -191,7 +191,7 @@ LIBDE265_API PacketSink_File::~PacketSink_File() } -LIBDE265_API void PacketSink_File::set_filename(const char* filename) +void PacketSink_File::set_filename(const char* filename) { assert(mFH==NULL); @@ -199,7 +199,7 @@ LIBDE265_API void PacketSink_File::set_filename(const char* filename) } -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; diff --git a/libde265/image-io.h b/libde265/image-io.h index 1cc6c8d..03daaf9 100644 --- a/libde265/image-io.h +++ b/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 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 ImageSource_YUV : public ImageSource 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 ImageSink_YUV : public ImageSink 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; diff --git a/libde265/quality.h b/libde265/quality.h index 7073d14..b32368d 100644 --- a/libde265/quality.h +++ b/libde265/quality.h @@ -26,11 +26,11 @@ #include -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 MSE(const uint8_t* img, int imgStride, 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