Changes of Revision 2
| [-] | Changed | dirac.spec |
|
x 1 2 -# Copyright (c) 2006-2009 oc2pus3 -# This file and all modifications and additions to the pristine4 -# package are under the same license as the package itself.5 #6 -# Please submit bugfixes or comments to toni@links2linux.de7 +# spec file for package dirac (Version 1.0.2)8 +#9 +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.10 +#11 +# All modifications and additions to the file contributed by third parties12 +# remain the property of their copyright owners, unless otherwise agreed13 +# upon. The license for this file, and modifications and additions to the14 +# file, is the same license as for the pristine package itself (unless the15 +# license for the pristine package is not an Open Source License, in which16 +# case the license is the MIT License). An "Open Source License" is a17 +# license that conforms to the Open Source Definition (Version 1.9)18 +# published by the Open Source Initiative.19 +20 +# Please submit bugfixes or comments via http://bugs.opensuse.org/21 +#22 23 # norootforbuild24 25 -Summary: Video Codec based on wavelets26 -Name: dirac27 -Version: 1.0.228 -Release: 2.pm.3.129 -Source: http://prdownloads.sourceforge.net/dirac/%{name}-%{version}.tar.gz30 -Source90: %{name}-rpmlintrc31 -Patch0: %{name}-gcc45.patch32 -License: MPL33 -Group: Productivity/Multimedia/Other34 -Url: http://sf.net/projects/dirac35 -Packager: Toni Graffy <toni@links2linux.de>36 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot37 -BuildRequires: doxygen38 -%if %suse_version >= 103039 -BuildRequires: fdupes40 -%endif41 -BuildRequires: freefont42 -%if %suse_version <= 110043 -#BuildRequires: ghostscript-std44 -%else45 -#BuildRequires: ghostscript-mini46 -%endif47 -BuildRequires: gcc-c++48 -BuildRequires: graphviz49 -%if %suse_version >= 103050 -#BuildRequires: hpijs-standalone51 -BuildRequires: texlive52 -BuildRequires: texlive-latex53 -%else54 -BuildRequires: te_latex55 -BuildRequires: tetex56 +57 +Name: dirac58 +Version: 1.0.259 +Release: 760 +Url: http://diracvideo.org/61 +Group: Productivity/Multimedia/Video/Editors and Convertors62 +License: MPL ..63 +Summary: The Dirac_Video Codec64 +Source: %{name}-%{version}.tar.bz265 +Patch0: 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch66 +Patch1: %{name}-%{version}-gcc45.patch67 +BuildRequires: gcc-c++ libstdc++-devel68 +BuildRequires: libcppunit-devel69 +%ifnarch ia64 s390 s390x %sparc70 +BuildRequires: pkg-config valgrind-devel71 %endif72 -BuildRequires: valgrind73 +BuildRequires: doxygen fdupes graphviz-gd texlive-latex74 +BuildRoot: %{_tmppath}/%{name}-%{version}-build75 76 %description77 -Dirac is an open source video codec.78 +Dirac is an open source video codec. It uses a traditional hybrid video79 +codec architecture, but with the wavelet transform instead of the usual80 +block transforms. Motion compensation uses overlapped blocks to reduce81 +block artefacts that would upset the transform coding stage.82 +83 +Dirac can code just about any size of video, from streaming up to HD84 +and beyond, although certain presets are defined for different85 +applications and standards. These cover the parameters that need to be86 +set for the encoder to work, such as block sizes and temporal87 +prediction structures, which must otherwise be set by hand.88 89 -It uses a traditional hybrid video codec architecture, but with the90 -wavelet transform instead of the usual block transforms. Motion91 -compensation uses overlapped blocks to reduce block artefacts that92 -would upset the transform coding stage.93 +Dirac is intended to develop into real coding and decoding software,94 +capable of plugging into video processing applications and media95 +players that need compression. It is intended to develop into a simple96 +set of reliable but effective coding tools that work over a wide97 +variety of content and formats, using well-understood compression98 +techniques, in a clear and accessible software structure. It is not99 +intended as a demonstration or reference coder.100 +101 +102 +103 +Authors:104 +--------105 + Thomas Davies <diracinfo@rd.bbc.co.uk>, BBC Research and Development106 + Richard Felton <diracinfo@rd.bbc.co.uk>, BBC Research and Development107 + Scott Robert Ladd <coyote@coyotegulch.com>, Coyote Gulch Productions108 + Stuart Cunningham <diracinfo@rd.bbc.co.uk>, BBC Research and Development109 + Anuradha Suraparaju <diracinfo@rd.bbc.co.uk>, BBC Research and Development110 + Chris Bowley <diracinfo@rd.bbc.co.uk>, BBC Research and Development111 + Tim Borer <diracinfo@rd.bbc.co.uk>, BBC Research and Development112 + Peter Meerwald <pmeerw@users.sourceforge.net>113 + Steve Bearcroft <bearcrsw@users.sourceforge.net>114 + Zen <ogg@illiminable.com>115 + Mike Ferenduros <mike_ferenduros@users.sourceforge.net>116 + Andrew Kennedy <diracinfo@rd.bbc.co.uk>, BBC Research and Development117 + Peter Bleackley <diracinfo@rd.bbc.co.uk>, BBC Research and Development118 + Myo Tun <myo.tun@brunel.ac.uk>, Brunel University119 +120 +%package -n libdirac_decoder0121 +License: MPL ..122 +Group: System/Libraries123 +Summary: Dirac Video Codec Decoder Library124 +125 +%description -n libdirac_decoder0126 +Dirac is an open source video codec. It uses a traditional hybrid video127 +codec architecture, but with the wavelet transform instead of the usual128 +block transforms. Motion compensation uses overlapped blocks to reduce129 +block artefacts that would upset the transform coding stage.130 131 Dirac can code just about any size of video, from streaming up to HD132 and beyond, although certain presets are defined for different133 -applications and standards. These cover the parameters that need to134 -be set for the encoder to work, such as block sizes and temporal135 +applications and standards. These cover the parameters that need to be136 +set for the encoder to work, such as block sizes and temporal137 prediction structures, which must otherwise be set by hand.138 139 +Dirac is intended to develop into real coding and decoding software,140 +capable of plugging into video processing applications and media141 +players that need compression. It is intended to develop into a simple142 +set of reliable but effective coding tools that work over a wide143 +variety of content and formats, using well-understood compression144 +techniques, in a clear and accessible software structure. It is not145 +intended as a demonstration or reference coder.146 +147 +148 +149 +Authors:150 +--------151 + Thomas Davies <diracinfo@rd.bbc.co.uk>, BBC Research and Development152 + Richard Felton <diracinfo@rd.bbc.co.uk>, BBC Research and Development153 + Scott Robert Ladd <coyote@coyotegulch.com>, Coyote Gulch Productions154 + Stuart Cunningham <diracinfo@rd.bbc.co.uk>, BBC Research and Development155 + Anuradha Suraparaju <diracinfo@rd.bbc.co.uk>, BBC Research and Development156 + Chris Bowley <diracinfo@rd.bbc.co.uk>, BBC Research and Development157 + Tim Borer <diracinfo@rd.bbc.co.uk>, BBC Research and Development158 + Peter Meerwald <pmeerw@users.sourceforge.net>159 + Steve Bearcroft <bearcrsw@users.sourceforge.net>160 + Zen <ogg@illiminable.com>161 + Mike Ferenduros <mike_ferenduros@users.sourceforge.net>162 + Andrew Kennedy <diracinfo@rd.bbc.co.uk>, BBC Research and Development163 + Peter Bleackley <diracinfo@rd.bbc.co.uk>, BBC Research and Development164 + Myo Tun <myo.tun@brunel.ac.uk>, Brunel University165 +166 %package -n libdirac_encoder0167 -Group: System/Libraries168 -Summary: Dirac Video Codec Encoder Library169 -Provides: libdirac = 0.7.0170 -Obsoletes: libdirac <= 0.7.0171 -Provides: libdirac0 = 1.0.0172 -Obsoletes: libdirac0 <= 1.0.0173 +License: MPL ..174 +Group: System/Libraries175 +Summary: Dirac Video Codec Encoder Library176 177 %description -n libdirac_encoder0178 -Dirac is an open source video codec.179 -180 -It uses a traditional hybrid video codec architecture, but with the181 -wavelet transform instead of the usual block transforms. Motion182 -compensation uses overlapped blocks to reduce block artefacts that183 -would upset the transform coding stage.184 +Dirac is an open source video codec. It uses a traditional hybrid video185 +codec architecture, but with the wavelet transform instead of the usual186 +block transforms. Motion compensation uses overlapped blocks to reduce187 +block artefacts that would upset the transform coding stage.188 189 Dirac can code just about any size of video, from streaming up to HD190 and beyond, although certain presets are defined for different191 -applications and standards. These cover the parameters that need to192 -be set for the encoder to work, such as block sizes and temporal193 +applications and standards. These cover the parameters that need to be194 +set for the encoder to work, such as block sizes and temporal195 prediction structures, which must otherwise be set by hand.196 197 -%package -n libdirac_decoder0198 -Group: System/Libraries199 -Summary: Dirac Video Codec Decoder Library200 -Provides: libdirac0:%{_libdir}/libdirac_decoder.so.0.0.0201 |
||
| [+] | 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_row*pic_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_row*pic_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") | ||