Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	dirac.spec
@@ -1,240 +1,292 @@ -# Copyright (c) 2006-2009 oc2pus -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # -# Please submit bugfixes or comments to toni@links2linux.de +# spec file for package dirac (Version 1.0.2) +# +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# # norootforbuild -Summary: Video Codec based on wavelets -Name: dirac -Version: 1.0.2 -Release: 2.pm.3.1 -Source: http://prdownloads.sourceforge.net/dirac/%{name}-%{version}.tar.gz -Source90: %{name}-rpmlintrc -Patch0: %{name}-gcc45.patch -License: MPL -Group: Productivity/Multimedia/Other -Url: http://sf.net/projects/dirac -Packager: Toni Graffy <toni@links2linux.de> -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: doxygen -%if %suse_version >= 1030 -BuildRequires: fdupes -%endif -BuildRequires: freefont -%if %suse_version <= 1100 -#BuildRequires: ghostscript-std -%else -#BuildRequires: ghostscript-mini -%endif -BuildRequires: gcc-c++ -BuildRequires: graphviz -%if %suse_version >= 1030 -#BuildRequires: hpijs-standalone -BuildRequires: texlive -BuildRequires: texlive-latex -%else -BuildRequires: te_latex -BuildRequires: tetex + +Name: dirac +Version: 1.0.2 +Release: 7 +Url: http://diracvideo.org/ +Group: Productivity/Multimedia/Video/Editors and Convertors +License: MPL .. +Summary: The Dirac_Video Codec +Source: %{name}-%{version}.tar.bz2 +Patch0: 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch +Patch1: %{name}-%{version}-gcc45.patch +BuildRequires: gcc-c++ libstdc++-devel +BuildRequires: libcppunit-devel +%ifnarch ia64 s390 s390x %sparc +BuildRequires: pkg-config valgrind-devel %endif -BuildRequires: valgrind +BuildRequires: doxygen fdupes graphviz-gd texlive-latex +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Dirac is an open source video codec. +Dirac is an open source video codec. It uses a traditional hybrid video +codec architecture, but with the wavelet transform instead of the usual +block transforms. Motion compensation uses overlapped blocks to reduce +block artefacts that would upset the transform coding stage. + +Dirac can code just about any size of video, from streaming up to HD +and beyond, although certain presets are defined for different +applications and standards. These cover the parameters that need to be +set for the encoder to work, such as block sizes and temporal +prediction structures, which must otherwise be set by hand. -It uses a traditional hybrid video codec architecture, but with the -wavelet transform instead of the usual block transforms. Motion -compensation uses overlapped blocks to reduce block artefacts that -would upset the transform coding stage. +Dirac is intended to develop into real coding and decoding software, +capable of plugging into video processing applications and media +players that need compression. It is intended to develop into a simple +set of reliable but effective coding tools that work over a wide +variety of content and formats, using well-understood compression +techniques, in a clear and accessible software structure. It is not +intended as a demonstration or reference coder. + + + +Authors: +-------- + Thomas Davies <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Richard Felton <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Scott Robert Ladd <coyote@coyotegulch.com>, Coyote Gulch Productions + Stuart Cunningham <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Anuradha Suraparaju <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Chris Bowley <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Tim Borer <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Peter Meerwald <pmeerw@users.sourceforge.net> + Steve Bearcroft <bearcrsw@users.sourceforge.net> + Zen <ogg@illiminable.com> + Mike Ferenduros <mike_ferenduros@users.sourceforge.net> + Andrew Kennedy <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Peter Bleackley <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Myo Tun <myo.tun@brunel.ac.uk>, Brunel University + +%package -n libdirac_decoder0 +License: MPL .. +Group: System/Libraries +Summary: Dirac Video Codec Decoder Library + +%description -n libdirac_decoder0 +Dirac is an open source video codec. It uses a traditional hybrid video +codec architecture, but with the wavelet transform instead of the usual +block transforms. Motion compensation uses overlapped blocks to reduce +block artefacts that would upset the transform coding stage. Dirac can code just about any size of video, from streaming up to HD and beyond, although certain presets are defined for different -applications and standards. These cover the parameters that need to -be set for the encoder to work, such as block sizes and temporal +applications and standards. These cover the parameters that need to be +set for the encoder to work, such as block sizes and temporal prediction structures, which must otherwise be set by hand. +Dirac is intended to develop into real coding and decoding software, +capable of plugging into video processing applications and media +players that need compression. It is intended to develop into a simple +set of reliable but effective coding tools that work over a wide +variety of content and formats, using well-understood compression +techniques, in a clear and accessible software structure. It is not +intended as a demonstration or reference coder. + + + +Authors: +-------- + Thomas Davies <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Richard Felton <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Scott Robert Ladd <coyote@coyotegulch.com>, Coyote Gulch Productions + Stuart Cunningham <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Anuradha Suraparaju <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Chris Bowley <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Tim Borer <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Peter Meerwald <pmeerw@users.sourceforge.net> + Steve Bearcroft <bearcrsw@users.sourceforge.net> + Zen <ogg@illiminable.com> + Mike Ferenduros <mike_ferenduros@users.sourceforge.net> + Andrew Kennedy <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Peter Bleackley <diracinfo@rd.bbc.co.uk>, BBC Research and Development + Myo Tun <myo.tun@brunel.ac.uk>, Brunel University + %package -n libdirac_encoder0 -Group: System/Libraries -Summary: Dirac Video Codec Encoder Library -Provides: libdirac = 0.7.0 -Obsoletes: libdirac <= 0.7.0 -Provides: libdirac0 = 1.0.0 -Obsoletes: libdirac0 <= 1.0.0 +License: MPL .. +Group: System/Libraries +Summary: Dirac Video Codec Encoder Library %description -n libdirac_encoder0 -Dirac is an open source video codec. - -It uses a traditional hybrid video codec architecture, but with the -wavelet transform instead of the usual block transforms. Motion -compensation uses overlapped blocks to reduce block artefacts that -would upset the transform coding stage. +Dirac is an open source video codec. It uses a traditional hybrid video +codec architecture, but with the wavelet transform instead of the usual +block transforms. Motion compensation uses overlapped blocks to reduce +block artefacts that would upset the transform coding stage. Dirac can code just about any size of video, from streaming up to HD and beyond, although certain presets are defined for different -applications and standards. These cover the parameters that need to -be set for the encoder to work, such as block sizes and temporal +applications and standards. These cover the parameters that need to be +set for the encoder to work, such as block sizes and temporal prediction structures, which must otherwise be set by hand. -%package -n libdirac_decoder0 -Group: System/Libraries -Summary: Dirac Video Codec Decoder Library -Provides: libdirac0:%{_libdir}/libdirac_decoder.so.0.0.0
[-] [+]	Added	0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch ^
@@ -0,0 +1,52 @@ +From 88fae6224b54ecf92ac6e3ae5083c3f352adc798 Mon Sep 17 00:00:00 2001 +From: Anuradha Suraparaju <anuradha@hoyle.rd.bbc.co.uk> +Date: Fri, 17 Apr 2009 17:47:27 +1000 +Subject: [PATCH] Fix uninitialised memory read that causes the encoder to crash when using + non-overlapping blocks. + +--- + libdirac_common/mot_comp.cpp \| 21 +++++++++++++++------ + 1 files changed, 15 insertions(+), 6 deletions(-) + +diff --git a/libdirac_common/mot_comp.cpp b/libdirac_common/mot_comp.cpp +index aa8d37c..e0ec2ff 100644 +--- a/libdirac_common/mot_comp.cpp ++++ b/libdirac_common/mot_comp.cpp +@@ -306,6 +306,8 @@ void MotionCompensator::CompensateComponent( Picture* pic , + + int save_from_row = m_bparams.Ybsep()-m_bparams.Yoffset(); + ++ bool row_overlap = ((m_bparams.Yblen() - m_bparams.Ybsep()) > 0); ++ + // unpadded picture dimensions + const int x_end_data = pic_data_out.FirstX() + std::min(pic_data_out.LengthX(), pic_size.x ); + const int y_end_data = pic_data_out.FirstY() + std::min(pic_data_out.LengthY(), pic_size.y ); +@@ -489,12 +491,19 @@ void MotionCompensator::CompensateComponent( Picture* pic , + //Increment the block vertical position + pos.y += m_bparams.Ybsep(); + +- // Copy the rows required to motion compensate the next row of block. +- // This is usually Yblen-Ybsep rows. +- memmove (pic_data[0], pic_data[save_from_row], (m_bparams.Yblen() - save_from_row)pic_data.LengthX()sizeof(ValueType)); +- memset( pic_data[m_bparams.Yblen() - save_from_row], 0, save_from_rowpic_data.LengthX()sizeof(ValueType) ); +- save_from_row = m_bparams.Ybsep(); +- ++ if (row_overlap) ++ { ++ // Copy the rows required to motion compensate the next row of ++ // blocks. This is usually Yblen-Ybsep rows. ++ memmove (pic_data[0], pic_data[save_from_row], (m_bparams.Yblen() - save_from_row)pic_data.LengthX()sizeof(ValueType)); ++ memset( pic_data[m_bparams.Yblen() - save_from_row], 0, save_from_rowpic_data.LengthX()sizeof(ValueType) ); ++ save_from_row = m_bparams.Ybsep(); ++ } ++ else ++ { ++ // no row overlap. So reset pic_data to 0. ++ memset( pic_data[0], 0, m_bparams.Yblen()pic_data.LengthX()sizeof(ValueType) ); ++ } + }//yblock + + if ( m_add_or_sub == SUBTRACT) +-- +1.7.0.3 +
[-] [+]	Added	dirac-1.0.2-gcc45.patch ^
@@ -0,0 +1,22 @@ +Index: dirac-1.0.2/libdirac_encoder/quant_chooser.cpp +=================================================================== +--- dirac-1.0.2.orig/libdirac_encoder/quant_chooser.cpp ++++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp +@@ -340,7 +340,7 @@ void QuantChooser::SetSkip( CodeBlock& c + { + for (int i=cblock.Xstart(); i<cblock.Xend(); ++i ) + { +- if ( (std::abs(m_coeff_data[j][i])<<2) >= u_threshold ) ++ if ( (static_cast<int>(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold ) + can_skip = false; + } + } +@@ -355,7 +355,7 @@ CoeffType QuantChooser::BlockAbsMax( con + { + for (int i=node.Xp() ; i<node.Xp()+node.Xl(); ++i) + { +- val = std::max( val , std::abs(m_coeff_data[j][i]) ); ++ val = std::max( val , static_cast<int>(std::abs(m_coeff_data[j][i])) ); + }// i + }// j +
[-] [+]	Deleted	dirac-gcc45.patch ^
@@ -1,48 +0,0 @@ -diff -Nur dirac-1.0.2-orig/libdirac_encoder/quant_chooser.cpp dirac-1.0.2/libdirac_encoder/quant_chooser.cpp ---- dirac-1.0.2-orig/libdirac_encoder/quant_chooser.cpp 2010-06-27 12:00:16.870371867 +0200 -+++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp 2010-06-27 12:05:29.274389459 +0200 -@@ -1,6 +1,6 @@ - /* *** BEGIN LICENSE BLOCK *** - * --* $Id: quant_chooser.cpp,v 1.20 2009/01/21 05:22:05 asuraparaju Exp $ $Name: Dirac_1_0_2 $ -+* $Id: quant_chooser.cpp,v 1.21 2010/05/09 04:38:31 asuraparaju Exp $ $Name: $ - * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * -@@ -333,14 +333,14 @@ - void QuantChooser::SetSkip( CodeBlock& cblock , const int qidx) - { - const int u_threshold = dirac_quantiser_lists.QuantFactor4( qidx ); -- -+ - // Sets the skip flag for a codeblock - bool can_skip = true; - for (int j=cblock.Ystart(); j<cblock.Yend(); ++j ) - { - for (int i=cblock.Xstart(); i<cblock.Xend(); ++i ) - { -- if ( (std::abs(m_coeff_data[j][i])<<2) >= u_threshold ) -+ if ( (static_cast<int>(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold ) - can_skip = false; - } - } -@@ -355,7 +355,7 @@ - { - for (int i=node.Xp() ; i<node.Xp()+node.Xl(); ++i) - { -- val = std::max( val , std::abs(m_coeff_data[j][i]) ); -+ val = std::max( val , static_cast<int>(std::abs(m_coeff_data[j][i])) ); - }// i - }// j - -diff -Nur dirac-1.0.2-orig/libdirac_encoder/quant_chooser.h dirac-1.0.2/libdirac_encoder/quant_chooser.h ---- dirac-1.0.2-orig/libdirac_encoder/quant_chooser.h 2010-06-27 12:00:16.868371962 +0200 -+++ dirac-1.0.2/libdirac_encoder/quant_chooser.h 2010-06-27 12:05:29.274389459 +0200 -@@ -1,6 +1,6 @@ - /* *** BEGIN LICENSE BLOCK *** - * --* $Id: quant_chooser.h,v 1.7 2008/05/27 01:29:54 asuraparaju Exp $ $Name: Dirac_1_0_2 $ -+* $Id: quant_chooser.h,v 1.7 2008/05/27 01:29:54 asuraparaju Exp $ $Name: $ - * - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - *
	Renamed	dirac-1.0.2.tar.bz2 ^
[-] [+]	Deleted	dirac-rpmlintrc ^
@@ -1,5 +0,0 @@ -# This line is mandatory to access the configuration functions -from Config import * - -addFilter("source-or-patch-not-bzipped") -addFilter("shlib-policy-missing-lib")