[changes brought forward from 1.0.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 04 Oct 2015 21:44:10 +0000]
* Disable neon.
[dgit import unpatched libde265 1.0.2-2+rpi1]
--- /dev/null
--- /dev/null
++libde265 (1.0.2-2+rpi1) stretch-staging; urgency=medium
++
++ [changes brought forward from 1.0.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 04 Oct 2015 21:44:10 +0000]
++ * Disable neon.
++
++ -- Raspbian forward porter <root@raspbian.org> Mon, 25 Jan 2016 01:25:24 +0000
++
++libde265 (1.0.2-2) unstable; urgency=low
++
++ [ Joachim Bauch ]
++ * Added patch by Andreas Cadhalpun to fix compilation with FFmpeg 2.9
++ (Closes: #803834)
++ * Updated symbols file for new C++11 symbols.
++
++ [ Sebastian Ramacher ]
++ * Migrate to automatic dbg packages.
++ * debian/control: Remove some unnecessary Build-Depends.
++
++ -- Joachim Bauch <bauch@struktur.de> Mon, 11 Jan 2016 19:12:19 +0100
++
++libde265 (1.0.2-1) unstable; urgency=low
++
++ * Imported Upstream version 1.0.2
++ * Added new files to copyright information.
++ * Only export decoder API and update symbols for new version.
++
++ -- Joachim Bauch <bauch@struktur.de> Thu, 16 Jul 2015 11:07:46 +0200
++
++libde265 (0.9-1) unstable; urgency=low
++
++ * Updated symbols to make all "std::vector" symbols optional.
++ * Imported Upstream version 0.9
++ * Removed deprecated patch to update symbols visibility. Changes were
++ applied upstream.
++ * Upstream supports compiling against Qt5, prefer that over Qt4.
++ * Added new symbols from new upstream release.
++
++ -- Joachim Bauch <bauch@struktur.de> Tue, 16 Sep 2014 18:47:14 +0200
++
++libde265 (0.8-1) unstable; urgency=low
++
++ * Initial release. (Closes: #744190)
++
++ -- Joachim Bauch <bauch@struktur.de> Fri, 08 Aug 2014 17:23:37 +0200
--- /dev/null
--- /dev/null
++9
--- /dev/null
--- /dev/null
++Source: libde265
++Section: libs
++Priority: optional
++Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
++Uploaders:
++ Alessio Treglia <alessio@debian.org>,
++ Joachim Bauch <bauch@struktur.de>
++Build-Depends:
++ debhelper (>= 9.20151219),
++ dh-autoreconf,
++ libjpeg-dev,
++ libpng-dev,
++ qtbase5-dev | libqt4-dev,
++ libsdl-dev,
++ libswscale-dev,
++ libx11-dev,
++ libxext-dev,
++ libxv-dev,
++ pkg-config
++Standards-Version: 3.9.6
++Homepage: https://github.com/strukturag/libde265
++Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-multimedia/libde265.git
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libde265.git
++
++Package: libde265-0
++Architecture: any
++Multi-Arch: same
++Depends:
++ ${misc:Depends},
++ ${shlibs:Depends}
++Description: Open H.265 video codec implementation
++ libde265 is an open source implementation of the H.265 video codec.
++ It is written from scratch in plain C for simplicity and efficiency.
++ Its simple API makes it easy to integrate it into other software.
++
++Package: libde265-dev
++Section: libdevel
++Multi-Arch: same
++Architecture: any
++Depends:
++ libde265-0 (= ${binary:Version}),
++ ${misc:Depends}
++Description: Open H.265 video codec implementation - development files
++ libde265 is an open source implementation of the H.265 video codec.
++ It is written from scratch in plain C for simplicity and efficiency.
++ Its simple API makes it easy to integrate it into other software.
++ .
++ The development headers for compiling programs that use libde265
++ are provided by this package.
++
++Package: libde265-examples
++Section: video
++Architecture: any
++Depends:
++ libde265-0 (= ${binary:Version}),
++ ${misc:Depends},
++ ${shlibs:Depends}
++Description: Open H.265 video codec implementation - examples
++ libde265 is an open source implementation of the H.265 video codec.
++ It is written from scratch in plain C for simplicity and efficiency.
++ Its simple API makes it easy to integrate it into other software.
++ .
++ Sample applications using libde265 are provided by this package.
--- /dev/null
--- /dev/null
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: libde265
++Upstream-Contact: struktur AG <opensource@struktur.de>
++Source: https://github.com/strukturag/libde265
++
++Files: *
++Copyright:
++ 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
++ 2013 openHEVC contributors
++License: LGPL-3+
++
++Files: dec265/dec265.cc
++ dec265/hdrcopy.cc
++ dec265/sdl.cc
++ dec265/sdl.hh
++ enc265/enc265.cc
++ sherlock265/VideoDecoder.cc
++ sherlock265/VideoDecoder.hh
++ sherlock265/VideoPlayer.cc
++ sherlock265/VideoPlayer.hh
++ sherlock265/VideoWidget.cc
++ sherlock265/VideoWidget.hh
++ sherlock265/sherlock265.cc
++ tools/bjoentegaard.cc
++ tools/block-rate-estim.cc
++ tools/gen-entropy-table.cc
++ tools/rd-curves.cc
++ tools/tests.cc
++ tools/yuv-distortion.cc
++Copyright:
++ 2013-2014 struktur AG, Dirk Farin <farin@struktur.de>
++ 2013-2014 struktur AG, Joachim Bauch <bauch@struktur.de>
++ 1998-2013 Free Software Foundation, Inc
++License: GPL-3+
++Comment: Please note that only the sample applications are GPL-3+ while
++ the decoding library itself is licensed as LGPL-3+.
++
++Files: extra/getopt.c
++ extra/getopt.h
++ extra/getopt_long.c
++Copyright: 1987-1996 The Regents of the University of California
++License: BSD-4-clause
++
++Files: libde265/md5.cc
++ libde265/md5.h
++Copyright: No copyright holder
++License: public-domain-1
++ This software was written by Alexander Peslyak in 2001. No copyright is
++ claimed, and the software is hereby placed in the public domain.
++ In case this attempt to disclaim copyright and place the software in the
++ public domain is deemed null and void, then the software is
++ Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
++ general public under the following terms:
++ .
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted.
++ .
++ There's ABSOLUTELY NO WARRANTY, express or implied.
++ .
++ (This is a heavily cut-down "BSD license".)
++ .
++ This differs from Colin Plumb's older public domain implementation in that
++ no exactly 32-bit integer data type is required (any 32-bit or wider
++ unsigned integer data type will do), there's no compile-time endianness
++ configuration, and the function prototypes match OpenSSL's. No code from
++ Colin Plumb's implementation has been reused; this comment merely compares
++ the properties of the two independent implementations.
++ .
++ The primary goals of this implementation are portability and ease of use.
++ It is meant to be fast, but not as fast as possible. Some known
++ optimizations are not included to reduce source code size and avoid
++ compile-time configuration.
++
++Files: extra/stdint.h
++Copyright: No copyright holder
++License: public-domain-2
++ ISO C9x 7.18 Integer types <stdint.h>
++ Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794)
++ .
++ THIS SOFTWARE IS NOT COPYRIGHTED
++ .
++ Contributor: Danny Smith <danny_r_smith_2001@yahoo.co.nz>
++ .
++ This source code is offered for use in the public domain. You may
++ use, modify or distribute it freely.
++ .
++ This code is distributed in the hope that it will be useful but
++ WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
++ DISCLAIMED. This includes but is not limited to warranties of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++ .
++ Date: 2000-12-02
++
++Files: extra/win32cond.c
++ extra/win32cond.h
++Copyright:
++ 1993-2009 Douglas C. Schmidt and his research group at
++ Washington University, University of California, Irvine, and
++ Vanderbilt University
++License: other-1
++ ACE(TM), TAO(TM), CIAO(TM), DAnCE>(TM), and CoSMIC(TM) (henceforth
++ referred to as "DOC software") are copyrighted by Douglas C. Schmidt
++ and his research group at Washington University, University of California,
++ Irvine, and Vanderbilt University, Copyright (c) 1993-2009, all rights
++ reserved.
++ .
++ Since DOC software is open-source, freely available software, you are free
++ to use, modify, copy, and distribute--perpetually and irrevocably--the DOC
++ software source code and object code produced from the source, as well as
++ copy and distribute modified versions of this software. You must, however,
++ include this copyright statement along with any code built using DOC
++ software that you release.
++ .
++ No copyright statement needs to be provided if you just ship binary
++ executables of your software products.
++ .
++ See "Strategies for Implementing POSIX Condition Variables on Win32" at
++ http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
++
++Files: debian/*
++Copyright:
++ 2014 Joachim Bauch <jojo@struktur.de>
++ 2014 Alessio Treglia <alessio@debian.org>
++License: LGPL-3+
++
++License: GPL-3+
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++ .
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++ .
++ On Debian systems the complete text of the GNU General Public License
++ can be found in the `/usr/share/common-licenses/GPL-3' file.
++ .
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++License: LGPL-3+
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++ .
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++ .
++ On Debian systems the complete text of the GNU Lesser General Public
++ License can be found in the `/usr/share/common-licenses/LGPL-3' file.
++ .
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++License: BSD-4-clause
++ Copyright (c) 1987, 1993, 1994
++ The Regents of the University of California. All rights reserved.
++ .
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions
++ are met:
++ 1. Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++ 2. Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in the
++ documentation and/or other materials provided with the distribution.
++ 3. All advertising materials mentioning features or use of this software
++ must display the following acknowledgement:
++ This product includes software developed by the University of
++ California, Berkeley and its contributors.
++ 4. Neither the name of the University nor the names of its contributors
++ may be used to endorse or promote products derived from this software
++ without specific prior written permission.
++ .
++ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ SUCH DAMAGE.
--- /dev/null
--- /dev/null
++[DEFAULT]
++pristine-tar = True
--- /dev/null
--- /dev/null
++usr/lib/*/*.so.*
--- /dev/null
--- /dev/null
++libde265.so.0 libde265-0 #MINVER#
++ (optional|c++|regex)"^std::_Sp_counted_base<.*@Base$" 1.0.2
++ (optional|c++|regex)"^std::__cxx11::basic_string<.*@Base$" 1.0.2
++ (optional|c++|regex)"^std::__cxx11::basic_stringbuf<.*@Base$" 1.0.2
++ (optional|c++|regex)"^std::vector<.*@Base$" 1.0.2
++ (optional|c++|regex)"^std::_Bvector_base<.*@Base$" 1.0.2
++ (optional|c++|regex)"^typeinfo for std::.*@Base$" 1.0.2
++ (optional|c++|regex)"^typeinfo name for std::.*@Base$" 1.0.2
++ (optional|c++|regex)"^void std::vector<.*@Base$" 1.0.2
++ (optional=only used internally by dec265|c++)"MSE(unsigned char const*, int, unsigned char const*, int, int, int)@Base" 1.0.2
++ (optional=only used internally by dec265|c++)"PSNR(double)@Base" 1.0.2
++ (optional=only used by the non-final encoder api)de265_alloc_image_plane@Base 1.0.2
++ de265_change_framerate@Base 0.8
++ de265_decode@Base 0.8
++ de265_decode_data@Base 0.8
++ de265_disable_logging@Base 0.8
++ de265_flush_data@Base 0.8
++ de265_free@Base 0.8
++ de265_free_decoder@Base 0.8
++ (optional=only used by the non-final encoder api)de265_free_image_plane@Base 1.0.2
++ de265_get_bits_per_pixel@Base 1.0.2
++ de265_get_chroma_format@Base 0.8
++ de265_get_current_TID@Base 0.8
++ de265_get_default_image_allocation_functions@Base 0.8
++ de265_get_error_text@Base 0.8
++ de265_get_highest_TID@Base 0.8
++ de265_get_image_NAL_header@Base 0.8
++ de265_get_image_PTS@Base 0.8
++ de265_get_image_height@Base 0.8
++ de265_get_image_plane@Base 0.8
++ de265_get_image_plane_user_data@Base 0.8
++ de265_get_image_user_data@Base 0.8
++ de265_get_image_width@Base 0.8
++ de265_get_next_picture@Base 0.8
++ de265_get_number_of_NAL_units_pending@Base 0.8
++ de265_get_number_of_input_bytes_pending@Base 0.8
++ de265_get_parameter_bool@Base 0.8
++ de265_get_version@Base 0.8
++ de265_get_version_number@Base 0.8
++ de265_get_version_number_maintenance@Base 1.0.2
++ de265_get_version_number_major@Base 1.0.2
++ de265_get_version_number_minor@Base 1.0.2
++ de265_get_warning@Base 0.8
++ de265_init@Base 0.8
++ de265_isOK@Base 0.8
++ de265_new_decoder@Base 0.8
++ de265_peek_next_picture@Base 0.8
++ de265_push_NAL@Base 0.8
++ de265_push_data@Base 0.8
++ de265_push_end_of_NAL@Base 0.8
++ de265_push_end_of_frame@Base 0.9
++ de265_release_next_picture@Base 0.8
++ de265_reset@Base 0.8
++ de265_set_framerate_ratio@Base 0.8
++ de265_set_image_allocation_functions@Base 0.8
++ de265_set_image_plane@Base 0.8
++ de265_set_image_user_data@Base 0.9
++ de265_set_limit_TID@Base 0.8
++ de265_set_parameter_bool@Base 0.8
++ de265_set_parameter_int@Base 0.8
++ de265_set_verbosity@Base 0.8
++ de265_start_worker_threads@Base 0.8
++ (optional=only used internally by sherlock265)draw_CB_grid@Base 0.8
++ (optional=only used internally by sherlock265)draw_Motion@Base 0.8
++ (optional=only used internally by sherlock265)draw_PB_grid@Base 0.8
++ (optional=only used internally by sherlock265)draw_PB_pred_modes@Base 0.8
++ (optional=only used internally by sherlock265)draw_QuantPY@Base 0.8
++ (optional=only used internally by sherlock265)draw_Slices@Base 0.8
++ (optional=only used internally by sherlock265)draw_TB_grid@Base 0.8
++ (optional=only used internally by sherlock265)draw_Tiles@Base 0.8
++ (optional=only used internally by sherlock265)draw_intra_pred_modes@Base 0.8
++ (optional=only used by the non-final encoder api|regex)en265_.*@Base 1.0.2
--- /dev/null
--- /dev/null
++README.md
--- /dev/null
--- /dev/null
++usr/include/*
++usr/lib/*/*.so
++usr/lib/*/pkgconfig/*
--- /dev/null
--- /dev/null
++usr/bin/*
--- /dev/null
--- /dev/null
++Description: Disable neon.
++Author: Peter Michael Green <plugwash@raspbian.org>
++
++---
++The information above should follow the Patch Tagging Guidelines, please
++checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
++are templates for supplementary fields that you might want to add:
++
++Origin: <vendor|upstream|other>, <url of original patch>
++Bug: <url in upstream bugtracker>
++Bug-Debian: https://bugs.debian.org/<bugnumber>
++Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
++Forwarded: <no|not-needed|url proving that it has been forwarded>
++Reviewed-By: <name and email of someone who approved the patch>
++Last-Update: <YYYY-MM-DD>
++
++--- libde265-1.0.2.orig/configure.ac
+++++ libde265-1.0.2/configure.ac
++@@ -148,9 +148,9 @@ case $target_cpu in
++ if test x"$disable_arm" != x"yes"; then
++ AC_DEFINE(HAVE_ARM, 1, [Support ARM instructions])
++
++- AX_CHECK_COMPILE_FLAG(-mfpu=neon, [
++- AC_DEFINE(HAVE_NEON, 1, [Support ARM NEON instructions])
++- ax_cv_support_neon_ext=yes], [])
+++ #AX_CHECK_COMPILE_FLAG(-mfpu=neon, [
+++ # AC_DEFINE(HAVE_NEON, 1, [Support ARM NEON instructions])
+++ # ax_cv_support_neon_ext=yes], [])
++
++ AC_ARG_ENABLE(thumb,
++ [AS_HELP_STRING([--enable-thumb],
--- /dev/null
--- /dev/null
++Description: Disable building of some internal tools that no longer link
++ because internal symbols are not exported.
++Author: Joachim Bauch <bauch@struktur.de>
++--- a/Makefile.am
+++++ b/Makefile.am
++@@ -8,10 +8,6 @@
++ SUBDIRS+=dec265
++ endif
++
++-SUBDIRS+=enc265
++-
++-SUBDIRS+=tools
++-
++ if ENABLE_SHERLOCK265
++ SUBDIRS+=sherlock265
++ endif
++--- a/dec265/Makefile.am
+++++ b/dec265/Makefile.am
++@@ -1,5 +1,5 @@
++
++-bin_PROGRAMS = dec265 hdrcopy
+++bin_PROGRAMS = dec265
++
++ AM_CPPFLAGS = -I../libde265
++
++@@ -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)
--- /dev/null
--- /dev/null
++Description: Replace deprecated FFmpeg API
++Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
++Last-Update: <2015-11-02>
++
++--- libde265-1.0.2.orig/sherlock265/VideoDecoder.cc
+++++ libde265-1.0.2/sherlock265/VideoDecoder.cc
++@@ -219,7 +219,7 @@ void VideoDecoder::convert_frame_swscale
++ }
++ width = img->get_width();
++ height = img->get_height();
++- sws = sws_getContext(width, height, PIX_FMT_YUV420P, width, height, PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+++ sws = sws_getContext(width, height, AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
++ }
++
++ int stride[3];
--- /dev/null
--- /dev/null
++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>
++--- a/libde265/encoder/Makefile.am
+++++ b/libde265/encoder/Makefile.am
++@@ -9,6 +9,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
++
++--- a/libde265/encoder/algo/Makefile.am
+++++ b/libde265/encoder/algo/Makefile.am
++@@ -15,5 +15,13 @@
++ tb-intrapredmode.h tb-intrapredmode.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
++--- a/configure.ac
+++++ b/configure.ac
++@@ -50,9 +50,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.
++--- a/libde265/image-io.cc
+++++ b/libde265/image-io.cc
++@@ -165,7 +165,7 @@
++
++
++
++-LIBDE265_API PacketSink_File::~PacketSink_File()
+++PacketSink_File::~PacketSink_File()
++ {
++ if (mFH) {
++ fclose(mFH);
++@@ -173,7 +173,7 @@
++ }
++
++
++-LIBDE265_API void PacketSink_File::set_filename(const char* filename)
+++void PacketSink_File::set_filename(const char* filename)
++ {
++ assert(mFH==NULL);
++
++@@ -181,7 +181,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;
++--- 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_YUV : public ImageSource
++ {
++ public:
++- LIBDE265_API ImageSource_YUV() : mFH(NULL) { }
++- virtual LIBDE265_API ~ImageSource_YUV();
+++ ImageSource_YUV() : mFH(NULL) { }
+++ 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;
++@@ -75,20 +75,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;
++@@ -99,21 +99,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() : mFH(NULL) { }
++- virtual LIBDE265_API ~PacketSink_File();
+++ PacketSink_File() : mFH(NULL) { }
+++ 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;
++--- a/libde265/configparam.h
+++++ b/libde265/configparam.h
++@@ -94,7 +94,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; }
++
++
++
++@@ -131,7 +131,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) { value=true; return true; }
+++ virtual bool processCmdLineArguments(char** argv, int* argc, int idx) { value=true; return true; }
++
++ bool set(bool v) { value_set=true; value=v; return true; }
++
++@@ -161,10 +161,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; }
++
++@@ -200,10 +200,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; }
++@@ -238,7 +238,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;
++
++@@ -367,10 +367,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);
++
++
++--- a/libde265/quality.h
+++++ b/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
--- /dev/null
--- /dev/null
++only_export_decoder_api.patch
++disable_tools.patch
++ffmpeg_2.9.patch
++disable-neon.patch
--- /dev/null
--- /dev/null
++#!/usr/bin/make -f
++#export DH_VERBOSE=1
++
++%:
++ dh $@ --with autoreconf --parallel
++
++override_dh_auto_install:
++ dh_auto_install
++ cd $(CURDIR)/debian/tmp/usr/bin/ && mv dec265 libde265-dec265
++ if [ -e "$(CURDIR)/debian/tmp/usr/bin/sherlock265" ]; then \
++ cd $(CURDIR)/debian/tmp/usr/bin/ && mv sherlock265 \
++ libde265-sherlock265; \
++ fi
++
++override_dh_strip:
++ dh_strip --ddeb-migration='libde265-dbg (<< 1.0.2-2~)'
--- /dev/null
--- /dev/null
++3.0 (quilt)
--- /dev/null
--- /dev/null
++version=3
++opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/libde265-$1\.tar\.gz/,\
++downloadurlmangle=s/.+\/v?(\d\S*)\.tar\.gz/https:\/\/github\.com\/strukturag\/libde265\/releases\/download\/v$1\/libde265-$1\.tar\.gz/ \
++ https://github.com/strukturag/libde265/tags .*/v?(\d\S*)\.tar\.gz
projects / libde265.git / commitdiff