debian/0000775000000000000000000000000012243362124007167 5ustar debian/source/0000775000000000000000000000000011715402052010465 5ustar debian/source/format0000664000000000000000000000001411715402052011673 0ustar 3.0 (quilt) debian/copyright0000664000000000000000000000746511715402052011134 0ustar Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 Name: DVDStyler Maintainer: Alex Thuering Source: http://dvdstyler.sourceforge.net/downloads.html Copyright: Copyright 2004-2009, Alex Thuering License: GPL-2 Files: ./src/hyperlink.* Copyright: Copyright 2003, wxGuide License: other wxWindows Library Licence, Version 3.1 ====================================== Copyright (C) 1998-2005 Julian Smart, Robert Roebling et al Everyone is permitted to copy and distribute verbatim copies of this licence document, but changing it is not allowed. WXWINDOWS LIBRARY LICENCE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public Licence as published by the Free Software Foundation; either version 2 of the Licence, or (at your option) any later version. This library 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 Library General Public Licence for more details. You should have received a copy of the GNU Library General Public Licence along with this software, usually in a file named COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. EXCEPTION NOTICE 1. As a special exception, the copyright holders of this library give permission for additional uses of the text contained in this release of the library as licenced under the wxWindows Library Licence, applying either version 3.1 of the Licence, or (at your option) any later version of the Licence as published by the copyright holders of version 3.1 of the Licence document. 2. The exception is that you may use, copy, link, modify and distribute under your own terms, binary object code versions of works based on the Library. 3. If you copy code from files distributed under the terms of the GNU General Public Licence or the GNU Library General Public Licence into a copy of this library, as this licence permits, the exception does not apply to the code that you add in this way. To avoid misleading anyone as to the status of such modified files, you must delete this exception notice from such code and/or adjust the licensing conditions notice accordingly. Files: wxVillaLib/thumb_md5.cpp Copyright: Copyright 1993, public domain License: other This code implements the MD5 message-digest algorithm. The algorithm is due to Ron Rivest. This code was written by Colin Plumb in 1993, no copyright is claimed. This code is in the public domain; do with it what you wish. Files: ./debian/* Copyright: 2009-2010, Alessio Treglia 2008-2009, Fabrice Coutadeur License: GPL-2 License: GPL-2 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 2 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. . You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. X-Comment: On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. debian/dvdstyler.install0000664000000000000000000000001011715402052012564 0ustar usr/bin debian/dvdstyler-data.install0000664000000000000000000000013411715402052013502 0ustar usr/share/locale usr/share/dvdstyler usr/share/pixmaps usr/share/man usr/share/applications debian/changelog0000664000000000000000000002742412243362124011052 0ustar dvdstyler (2.5.2-0ubuntu3) trusty; urgency=low * No change rebuild against libav 9. -- Dmitrijs Ledkovs Thu, 21 Nov 2013 10:45:40 +0000 dvdstyler (2.5.2-0ubuntu2) saucy; urgency=low * fix_no_audio.patch: upstream's patch for videos without audio. It replaces fix_no_audio_input.patch * debian/control: add explicit dependency on libwxgtk-media2.8-dev as it's not pulled automatically anymore (LP: #1219132) -- Fabrice Coutadeur Sat, 31 Aug 2013 11:59:07 +0200 dvdstyler (2.5.2-0ubuntu1) saucy; urgency=low * New upstream release (LP: #1132643) * This will fix also (LP: #1074815) and (LP: #1049113) * Drop fix_linkage patch as it has been applied upstream * fix_no_audio_input.patch: fix a bug when there is no audio in the input video * debian/control: bump Standards-version to 3.9.4. No changes requires. -- Fabrice Coutadeur Tue, 20 Aug 2013 09:06:14 +0200 dvdstyler (2.3.4-0ubuntu2) raring; urgency=low * Added jpeg lib to link, fixing FTBFS on armhf. -- Daniel T Chen Mon, 01 Apr 2013 13:54:48 -0400 dvdstyler (2.3.4-0ubuntu1) raring; urgency=low * New upstream release * debian/watch: updated to only get stable releases (and discard alpha and beta version) -- Fabrice Coutadeur Sat, 15 Dec 2012 18:58:57 +0100 dvdstyler (2.3-0ubuntu1) raring; urgency=low * New upstream release * debian/control: - add b-d on libav-tools and bump dependency on libwxsvg - reenable b-d on mjpegtools. This is mandatory for animated menus * drop-mplex.patch: dropped as mplex seems mandatory for animated menus -- Fabrice Coutadeur Sun, 07 Oct 2012 19:41:14 +0200 dvdstyler (2.1-0ubuntu2) precise; urgency=low * delete unused file debian/patches/fix-libav0.8.patch.old * debian/control: - drop b-d and dependency on mjpegtools as dvdstyler works perfectly without mplex - drop specific dependency on libavcodec-extra as mpeg2video and vob multiplexing is available in libavcodec. * drop-mplex.patch: drop any reference to mplex in the config popup * genisoimage.patch: replace also mkisofs in configure.in * fix-libav0.8.patch: fix audio bitrate when transcoding to use the one specified when transcoding -- Fabrice Coutadeur Fri, 17 Feb 2012 21:40:35 +0100 dvdstyler (2.1-0ubuntu1) precise; urgency=low * New upstream release - This fixes a crash when deleting referenced subtitles (LP: #910926) * debian/watch: updated to get only stable versions * debian/control: - bump standards-version to 3.9.2. No changes are required. - Add b-d on libavfilter-dev as libavfilter is required now * binutils-gold.patch: dropped as it has been adopted upstream * libav-0.7.patch: dropped as this is not applicable anymore * genisoimage.patch: refreshed * fix-libav0.8.patch: fix FTBFS with libav 0.8 * debian/rules: call first dh_auto_clean to be able to build it twice in a row -- Fabrice Coutadeur Sun, 12 Feb 2012 18:57:08 +0100 dvdstyler (1.8.3-0ubuntu4) precise; urgency=low * Build-depend on libjpeg-dev instead of libjpeg62-dev. -- Felix Geyer Mon, 21 Nov 2011 18:51:25 +0100 dvdstyler (1.8.3-0ubuntu3) precise; urgency=low * libav-0.7.patch: fixed to fix core dumps. Fixes are: - src/mediaenc_ffmpeg.cpp: fixed sample_fmt for ac3 encoding. - src/mediatrc_ffmpeg.cpp: fix detection of existing files - src/mediatrc_ffmpeg.cpp: only close encoded file if opened before -- Fabrice Coutadeur Fri, 11 Nov 2011 20:57:32 +0100 dvdstyler (1.8.3-0ubuntu2) oneiric; urgency=low * Port to libav 0.7 API. -- Colin Watson Tue, 23 Aug 2011 10:07:26 +0100 dvdstyler (1.8.3-0ubuntu1) oneiric; urgency=low * New upstream release: * added option to keep aspect ratio of video * added possibility to cut video * added possibility to select fill, outline and shadow color of subtitles * added possibility to add/remove single images in slideshow * added support of NTSC film * updated dvdauthor to version 0.7.0 (LP: #775115) * debian/watch: updated to take stable versions only * debian/control: update b-d on libxwsvg-dev to 2:1.0.8 -- Fabrice Coutadeur Mon, 02 May 2011 07:22:15 +0200 dvdstyler (1.8.2.1-0ubuntu1) natty; urgency=low * New upstream release. This includes updated translations (LP: #626522) -- Fabrice Coutadeur Sat, 19 Feb 2011 19:45:02 +0100 dvdstyler (1.8.1-0ubuntu4) natty; urgency=low * debian/patches/binutils-gold.patch: + link jpeg libraries during build in src/Makefile.am to fix FTBFS with ld --no-add-needed -- Bhavani Shankar Mon, 27 Dec 2010 11:59:06 +0530 dvdstyler (1.8.1-0ubuntu3) maverick; urgency=low * debian/dvdstyler-data.install: also install usr/share/pixmaps, usr/share/applications and usr/share/man. This will bring back the desktop, manpage and icon files (LP: #650794) * debian/control: Standards-version bump to 3.9.1. No changes required. -- Fabrice Coutadeur Wed, 29 Sep 2010 06:39:55 +0200 dvdstyler (1.8.1-0ubuntu2) maverick; urgency=low * No changes upload for libwxsvg0 ABI changes * debian/control: Standards-version bump. No changes required. -- Fabrice Coutadeur Fri, 23 Jul 2010 22:13:30 +0000 dvdstyler (1.8.1-0ubuntu1) maverick; urgency=low * New upstream release. * Fix debian/watch file. * Switch to debhelper 7. * Refresh patches. * debian/control: - ${shlibs:Depends} should not be in dvdstyler-data's Depends field, the runtime package is architecture independent. - Build-depend on bison,flex. * Move all arch-indep files into dvdstyler-data runtime. * Update debian/copyright. -- Alessio Treglia Sun, 30 May 2010 17:56:33 +0200 dvdstyler (1.8.0.2-0ubuntu1) lucid; urgency=low * New upstream bugfix-only release. * Drop 03-disable_ja_lang.patch patch, japanese translation has been added by upstream. -- Alessio Treglia Mon, 22 Mar 2010 10:17:38 +0100 dvdstyler (1.8.0.1-0ubuntu1) lucid; urgency=low * New upstream bugfix release. * Bump Standards. -- Alessio Treglia Sat, 20 Feb 2010 19:33:18 +0100 dvdstyler (1.8.0-0ubuntu1) lucid; urgency=low * New upstream release. -- Alessio Treglia Thu, 04 Feb 2010 06:25:13 +0100 dvdstyler (1.8.0~rc3-0ubuntu1) lucid; urgency=low * New upstream RC release. * Update debian/copyright. -- Alessio Treglia Tue, 26 Jan 2010 19:31:09 +0100 dvdstyler (1.8.0~rc2-0ubuntu1) lucid; urgency=low * New upstream release candidate release: - Changes in RC2: + Fixed support of multiple subtitles + Added check of button coordinates + Added Norwegian and Japanese translations - Changes in RC1: + Added undo/redo + Added menu item "Add file as chapter" + Added possibility to drag-and-drop from TitlesetManager to MenuEditor + Thumbnails: fixed font size and size of images * Refresh patches. * debian/patches/genisoimage.patch: - Rename from genisoimage.diff. - Add tags as per Debian DEP-3. * debian/patches/03-disable_ja_lang.patch: - The lack of the japanese translation causes FTBFS. * debian/control: Update homepage field. * debian/rules: Correct file mode bits after installing them into the shared data foler. -- Alessio Treglia Wed, 20 Jan 2010 15:56:12 +0100 dvdstyler (1.8.0~b3-0ubuntu2) lucid; urgency=low * rebuild for ffmpeg versioned symbols -- Reinhard Tartler Tue, 19 Jan 2010 20:54:49 +0100 dvdstyler (1.8.0~b3-0ubuntu1) lucid; urgency=low * New upstream's beta-release * Switched to Source format 3.0 (quilt) - debian/rules: + deleted references to quilt targets and include + deleted get-orig-source target as repack is not required anymore - debian/control: deleted build dependency on quilt - debian/REAMDE.source: deleted as it's not required anymore -- Fabrice Coutadeur Thu, 31 Dec 2009 17:17:40 +0100 dvdstyler (1.8.0~b2-0ubuntu1) lucid; urgency=low * New upstream's beta-release. * Also install DVD menu templates. * Refresh patches. -- Alessio Treglia Mon, 14 Dec 2009 22:42:58 +0100 dvdstyler (1.7.4-0ubuntu1) lucid; urgency=low * New upstream release: - added three new buttons: text with circle, text with square and underlined text - button actions: added possibility to select audio and subtitle tracks - added possibility to set languages for audio streams - jumppad is disabled by default - added some warning messages - some other small changes -- Fabrice Coutadeur Wed, 04 Nov 2009 06:35:52 +0000 dvdstyler (1.7.3-0ubuntu3) karmic; urgency=low [ Fabrice Coutadeur ] * debian/control: Changed dependency on -untripped to -extra- ffmpeg packages (LP: #418705) [ Alessio Treglia ] * Bump Standards: - Add ${misc:Depends} macro to the Depends fields. * Lines should not be longer than 80 characters. -- Fabrice Coutadeur Tue, 01 Sep 2009 19:30:05 +0000 dvdstyler (1.7.3-0ubuntu2) karmic; urgency=low * No-change rebuild to pick up new ffmpeg shlibs file. -- Stefan Potyra Fri, 28 Aug 2009 21:21:53 +0200 dvdstyler (1.7.3-0ubuntu1) karmic; urgency=low * New upstream release: - Also fixes LP: #385381. * dvdstyler main package should install desktop, icon and manpage files; this allow me to remove all lintian's override files. * debian/control: - Bump Standards. - Adjust dvdstyler-data short description to make lintian happy. - dvdstyler Replaces old dvdstyler-data runtime. - Don't build-depend on patch. * debian/rules: - Turn off DH_VERBOSE. - Don't build with -j option, it doesn't work. - Don't install doc files twice. - A bit of clean up. * debian/patches/genisoimage.diff: - Use genisoimage instead of mkisofs. * Update debian/copyright. -- Alessio Treglia Mon, 17 Aug 2009 10:38:48 +0200 dvdstyler (1.7.2-0ubuntu1) jaunty; urgency=low * New upstream release (LP: #340906) * Patch fix_FTBFS_with_ffmpeg_svn20090119 has been integrated upstream, so it's not used anymore * debian/watch: upstream does not ship debian directory anymore. The repack is not of any use anymore. * debian/rules: - As repacking is not of any use anymore, deleted reference to uscan_repack.sh - add --repack option to uscan, as upstream tarball is in bz2 format * debian/uscan_repack.sh: file deleted * debian/README.source: deleted references to repacking * debian/control: add build dependency on xmlto to build DocBook doc and on zip to compress documentation -- Fabrice Coutadeur Tue, 10 Mar 2009 19:56:10 +0000 dvdstyler (1.7.1-0ubuntu2) jaunty; urgency=low * Only install docs (TODO and AUTHORS) in dvdstyler-data (LP: #322850) - Removed debian/docs - Created debian/dvdstyler-data.docs with the same content as debian/docs -- Fabrice Coutadeur Sat, 31 Jan 2009 06:23:09 +0000 dvdstyler (1.7.1-0ubuntu1) jaunty; urgency=low * Initial packaging (Closes LP: #105653) - Created patch fix_desktop_file to get rid of errors when validating the desktop file with desktop-file-validate - Created patch fix_FTBFS_with_ffmpeg_svn20090119 to fix a compilation issue with latest ffmpeg version (can be deleted when 1.7.2 is released) * Repackaged original tarball to get rid of debian directory -- Fabrice Coutadeur Sat, 15 Nov 2008 04:50:19 +0000 debian/control0000664000000000000000000000533712210346262010601 0ustar Source: dvdstyler Section: graphics Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Fabrice Coutadeur Build-Depends: debhelper (>= 7.0.50~), bison, flex, fakeroot, automake, libav-tools, libwxgtk2.8-dev, libwxbase2.8-dev, libwxgtk-media2.8-dev, libexif-dev, libwxsvg-dev (>= 2:1.0.9), libavcodec-dev, libavfilter-dev, libavformat-dev, libswscale-dev, libjpeg-dev, mjpegtools, gettext, dvdauthor, dvd+rw-tools, xmlto, zip Standards-Version: 3.9.4 Homepage: http://www.dvdstyler.de/ Package: dvdstyler Architecture: any Depends: dvdstyler-data (= ${source:Version}), dvdauthor, genisoimage, dvd+rw-tools, libav-tools, ${shlibs:Depends}, ${misc:Depends} Recommends: xine-ui, dvdisaster Replaces: dvdstyler-data (<= 1.7.2-0ubuntu1) Description: cross platform DVD Authoring System for Video DVD Production DVDStyler is a cross platform DVD Authoring application for Video enthusiasts to create professional looking Video-DVDs. . Main features are: * creating a DVD video with interactive menus * support for AVI, MPEG, VOB and other file formats * using MPEG and VOB files without re-encoding * allows put files with different audio/video format on one DVD (support of titleset) * drag and drop video files directly * import image file for menu background * place buttons, text, images and graphic objects anywhere on the menu screen * change font/color and other parameters of buttons and graphic object * scale buttons and graphic objects * copy and paste any menu object and whole menu * set chapters for each movie * set pre and post commands for each movie and menu * DVD scripting Package: dvdstyler-data Architecture: all Depends: ${misc:Depends} Replaces: dvdstyler (<= 1.8.0.2-0ubuntu1) Description: Data files for DVDStyler DVDStyler is a cross platform DVD Authoring application for Video enthusiasts to create professional looking Video-DVDs. . Main features are: * creating a DVD video with interactive menus * support for AVI, MPEG, VOB and other file formats * using MPEG and VOB files without re-encoding * allows put files with different audio/video format on one DVD (support of titleset) * drag and drop video files directly * import image file for menu background * place buttons, text, images and graphic objects anywhere on the menu screen * change font/color and other parameters of buttons and graphic object * scale buttons and graphic objects * copy and paste any menu object and whole menu * set chapters for each movie * set pre and post commands for each movie and menu * DVD scripting . This package contains the data part (backgrounds, samples, ...) of DVDStyler. debian/rules0000775000000000000000000000062411716364147010264 0ustar #!/usr/bin/make -f %: dh $@ override_dh_auto_configure: ./autogen.sh dh_auto_configure override_dh_auto_test: override_dh_auto_clean: dh_auto_clean dh_clean aclocal.m4 configure Makefile.in src/Makefile.in \ src/rc/Makefile.in objects/Makefile.in buttons/Makefile.in \ data/Makefile.in backgrounds/Makefile.in \ wxVillaLib/Makefile.in docs/Makefile.in templates/Makefile.in \ docs/*.zip debian/watch0000664000000000000000000000014111715402052010212 0ustar version=3 opts=uversionmangle=s/([a-z])/~$1/ \ http://sf.net/dvdstyler/DVDStyler-(.*)\.tar\.bz2 debian/patches/0000775000000000000000000000000012210336250010611 5ustar debian/patches/fix_underlinkage.patch0000664000000000000000000000107312126356236015165 0ustar Index: dvdstyler-2.3.4/src/Makefile.am =================================================================== --- dvdstyler-2.3.4.orig/src/Makefile.am 2012-01-15 14:07:00.000000000 -0500 +++ dvdstyler-2.3.4/src/Makefile.am 2013-04-01 15:14:33.603524338 -0400 @@ -9,7 +9,7 @@ TitlesetManager.cpp BurnDlg.cpp ProgressDlg.cpp DirCtrl.cpp StatusBar.cpp MainWin.cpp dvdstyler.cpp AM_CXXFLAGS = @CXXFLAGS@ -I.. -LDADD = ../wxVillaLib/libwxvilla.a +LDADD = ../wxVillaLib/libwxvilla.a -ljpeg EXTRA_DIST = dvdvml.l dvdvmy.y MAINTAINERCLEANFILES = dvdvml.c dvdvmy.c dvdvmy.h debian/patches/drop-mplex.patch0000664000000000000000000000217412034337630013734 0ustar Description: Drop references to mplex in the settings popup to avoid enabling it Author: Fabrice Coutadeur --- a/src/SettingsDlg.cpp +++ b/src/SettingsDlg.cpp @@ -216,8 +216,6 @@ wxSizer* grpSizer = BeginGroup(debugSizer, _("Debug")); AddCheckProp(grpSizer, _("Don't remove temp files"), !s_config.GetRemoveTempFiles(def)); - AddCheckProp(grpSizer, _("Use mplex"), s_config.GetUseMplex(def)); - AddCheckProp(grpSizer, _("Use mplex for menus"), s_config.GetUseMplexForMenus(def)); } bool SettingsDlg::SetValues() { @@ -263,8 +261,6 @@ s_config.SetAddECCCmd(GetString(i++)); s_config.SetFormatCmd(GetString(i++)); s_config.SetRemoveTempFiles(!GetBool(i++)); - s_config.SetUseMplex(GetBool(i++)); - s_config.SetUseMplexForMenus(GetBool(i++)); return true; } --- a/src/Config.h +++ b/src/Config.h @@ -59,7 +59,7 @@ const wxString DEF_ADD_ECC_CMD = _T("dvdisaster -mRS02 -n dvd -c -i \"$FILE\""); #endif const bool DEF_USE_MPLEX = false; -const bool DEF_USE_MPLEX_FOR_MENUS = true; +const bool DEF_USE_MPLEX_FOR_MENUS = false; #ifdef USE_FFMPEG const wxString DEF_AVCONV_CMD = _T("ffmpeg"); #else debian/patches/genisoimage.patch0000664000000000000000000000271712204615756014146 0ustar Description: Replace mkisofs with genisoimage. Author: Alessio Treglia --- src/Config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/src/Config.h +++ b/src/Config.h @@ -69,8 +69,8 @@ const wxString DEF_AVCONV_CMD = _T("a const wxString DEF_MPLEX_CMD = _T("mplex -f 8 -S 0 -M -V -o \"$FILE_OUT\" \"$FILE_VIDEO\" \"$FILE_AUDIO\""); const wxString DEF_SPUMUX_CMD = _T("spumux -P -s $STREAM \"$FILE_CONF\""); const wxString DEF_DVDAUTHOR_CMD = _T("dvdauthor -o \"$DIR\" -x \"$FILE_CONF\""); -const wxString DEF_ISO_CMD = _T("mkisofs -V \"$VOL_ID\" -o \"$FILE\" -dvd-video \"$DIR\""); -const wxString DEF_ISO_SIZE_CMD = _T("mkisofs -quiet -print-size \"$DIR\""); +const wxString DEF_ISO_CMD = _T("genisoimage -V \"$VOL_ID\" -o \"$FILE\" -dvd-video \"$DIR\""); +const wxString DEF_ISO_SIZE_CMD = _T("genisoimage -quiet -print-size \"$DIR\""); const wxString DEF_BURN_SCAN_CMD = _T("dvd+rw-mediainfo $DEVICE"); const wxString DEF_BURN_CMD = _T("growisofs -V \"$VOL_ID\" -dvd-compat -Z $DEV -dvd-video \"$DIR\" $SPEEDSTR"); const wxString DEF_BURN_SPEED_OPT= _T("-speed=$SPEED"); --- a/configure.in +++ b/configure.in @@ -185,7 +185,7 @@ if test "x$DVDAUTHOR_PATH" = x; then Please check that dvdauthor is in path. ]) fi -AC_PATH_PROG(MKISOFS_PATH, mkisofs, "") +AC_PATH_PROG(MKISOFS_PATH, genisoimage, "") if test "x$MKISOFS_PATH" = x; then AC_MSG_ERROR([ DVDStyler requires mkisofs (cdrtools). debian/patches/fix_no_audio.patch0000664000000000000000000000231212210336250014273 0ustar Description: Fix issue when input file has no audio Patch taken from upstream Author: upstream Bug: https://sourceforge.net/p/dvdstyler/bugs/532/ --- dvdstyler-2.5.2/src/mediatrc_ffmpeg.cpp +++ dvdstyler-2.5.2.new/src/mediatrc_ffmpeg.cpp @@ -3,7 +3,7 @@ // Purpose: FFMPEG Media Transcoder // Author: Alex Thuering // Created: 26.04.2008 -// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.58 2013/03/17 18:51:00 ntalex Exp $ +// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.59 2013/08/23 18:40:24 ntalex Exp $ // Copyright: (c) Alex Thuering // Licence: GPL ///////////////////////////////////////////////////////////////////////////// @@ -42,9 +42,13 @@ } bool wxFfmpegMediaTranscoder::AddInputFile(const wxString& fileName, const wxString& format, long tsOffset) { - if (format.length()) - AddOption(wxT("f"), format); - m_cmd += wxString::Format(wxT(" -i \"%s\""), fileName.c_str()); + if (fileName == wxT("/dev/zero")) { + m_cmd += wxT(" -ac 2 -ar 48000 -f s16le -i /dev/zero"); + } else { + if (format.length()) + AddOption(wxT("f"), format); + m_cmd += wxString::Format(wxT(" -i \"%s\""), fileName.c_str()); + } if (tsOffset > 0) AddOption(wxT("itsoffset"), Time2String(tsOffset)); debian/patches/fix-libav0.8.patch0000664000000000000000000001716611717662344013775 0ustar Description: adjust dvdstyler for libav 0.8 Author: Fabrice Coutadeur --- a/src/mediaenc_ffmpeg.cpp +++ b/src/mediaenc_ffmpeg.cpp @@ -26,6 +26,7 @@ extern "C" { #define __STDC_LIMIT_MACROS #include #include +#include } #define AUDIO_BUF_SIZE 524288 @@ -166,12 +167,18 @@ bool wxFfmpegMediaEncoder::addAudioStrea AVCodecContext* c = m_audioStm->codec; c->thread_count = m_threadCount; + c->time_base.den = 25; + c->time_base.num = 1; c->codec_id = (CodecID) codecId; c->codec_type = AVMEDIA_TYPE_AUDIO; c->bit_rate = 64000; c->sample_rate = 48000; c->sample_fmt = codecId == CODEC_ID_AC3 ? AV_SAMPLE_FMT_FLT : AV_SAMPLE_FMT_S16; c->channels = 2; + // some formats want stream headers to be separate + if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER) + c->flags |= CODEC_FLAG_GLOBAL_HEADER; + return true; } --- a/src/mediatrc_ffmpeg.cpp +++ b/src/mediatrc_ffmpeg.cpp @@ -22,11 +22,12 @@ extern "C" { #include #include #include +#include #include -#include +#include #include #include -#include +#include } #define AUDIO_BUF_SIZE 50000 @@ -46,6 +47,68 @@ extern "C" { #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0) #define AVIO_FLAG_WRITE AVIO_WRONLY #endif +#define CODEC_CAP_LOSSLESS 0x80000000 + +static int avsink_init(AVFilterContext *ctx, const char *args, void *opaque) +{ + AVSinkContext *priv =(AVSinkContext *)ctx->priv; + + if (!opaque) + return AVERROR(EINVAL); + *priv = *(AVSinkContext *)opaque; + + return 0; +} + +static void null_end_frame(AVFilterLink *inlink) { } + +static int avsink_query_formats(AVFilterContext *ctx) +{ + AVSinkContext *priv = (AVSinkContext *)ctx->priv; + enum PixelFormat pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list((const int*)pix_fmts)); + return 0; +} + +AVFilter avsink = { + "avsink", + sizeof(AVSinkContext), + avsink_init, + NULL, + avsink_query_formats, + (AVFilterPad[]) {{ "default", + AVMEDIA_TYPE_VIDEO, + AV_PERM_READ, + 0, + NULL, + NULL, + NULL, + null_end_frame, + }, + { NULL }}, + (AVFilterPad[]) {{ NULL }}, +}; + +int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, AVFilterBufferRef **picref_ptr, AVRational *tb) { + int ret; + AVFilterBufferRef *picref; + + if ((ret = avfilter_request_frame(ctx->inputs[0])) < 0) + return ret; + if (!(picref = ctx->inputs[0]->cur_buf)) + return AVERROR(ENOENT); + *picref_ptr = picref; + ctx->inputs[0]->cur_buf = NULL; + *tb = ctx->inputs[0]->time_base; + + memcpy(frame->data, picref->data, sizeof(frame->data)); + memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize)); + frame->interlaced_frame = picref->video->interlaced; + frame->top_field_first = picref->video->top_field_first; + + return 1; +} //////////////////////////// AVAudioConvert ///////////////////////////////// // audioconvert.h @@ -174,7 +237,7 @@ static int configure_video_filters(Input "src", args, NULL, ost->graph); if (ret < 0) return ret; - ret = avfilter_graph_create_filter(&ost->output_video_filter, avfilter_get_by_name("buffersink"), + ret = avfilter_graph_create_filter(&ost->output_video_filter, &avsink, "out", NULL, pix_fmts, ost->graph); if (ret < 0) return ret; @@ -197,8 +260,8 @@ static int configure_video_filters(Input ost->graph->scale_sws_opts = av_strdup(args); if (ost->avfilter) { - AVFilterInOut *outputs = avfilter_inout_alloc(); - AVFilterInOut *inputs = avfilter_inout_alloc(); + AVFilterInOut *outputs = (AVFilterInOut*) av_malloc(sizeof(AVFilterInOut)); + AVFilterInOut *inputs = (AVFilterInOut*) av_malloc(sizeof(AVFilterInOut)); outputs->name = av_strdup("in"); outputs->filter_ctx = last_filter; @@ -210,7 +273,7 @@ static int configure_video_filters(Input inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0) return ret; av_freep(&ost->avfilter); } else { @@ -1085,7 +1148,7 @@ bool wxFfmpegMediaTranscoder::AddAudioSt AVStream *st; OutputStream *ost; AVCodecContext *audio_enc; - + ost = NewOutputStream(oc, AVMEDIA_TYPE_AUDIO, (int) audioFormat); st = ost->st; @@ -1105,7 +1168,7 @@ bool wxFfmpegMediaTranscoder::AddAudioSt audio_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; } if (audioFormat != afCOPY) { - av_set_int(audio_enc, "b:a", bitrate*1000); + audio_enc->bit_rate= bitrate*1000; if (audio_qscale > QSCALE_NONE) { audio_enc->flags |= CODEC_FLAG_QSCALE; @@ -2071,11 +2134,13 @@ bool wxFfmpegMediaTranscoder::OutputPack for(i=0;iinput_video_filter && ost->source_index == ist_index) { - if (!picture.sample_aspect_ratio.num) + if (ist->st->sample_aspect_ratio.num) picture.sample_aspect_ratio = ist->st->sample_aspect_ratio; - picture.pts = ist->pts; + //picture.pts = ist->pts; - av_vsrc_buffer_add_frame(ost->input_video_filter, &picture, AV_VSRC_BUF_FLAG_OVERWRITE); + av_vsrc_buffer_add_frame(ost->input_video_filter, &picture, + ist->pts, + picture.sample_aspect_ratio); } } } @@ -2123,12 +2188,11 @@ bool wxFfmpegMediaTranscoder::OutputPack frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]); while (frame_available) { + AVRational ist_pts_tb; + if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter) { - AVRational ist_pts_tb = ost->output_video_filter->inputs[0]->time_base; - if (av_vsink_buffer_get_video_buffer_ref(ost->output_video_filter, &ost->picref, 0) < 0) - goto cont; + get_filtered_video_frame(ost->output_video_filter, &picture, &ost->picref, &ist_pts_tb); if (ost->picref) { - avfilter_fill_frame_from_video_buffer_ref(&picture, ost->picref); ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); } } @@ -2147,7 +2211,7 @@ bool wxFfmpegMediaTranscoder::OutputPack break; case AVMEDIA_TYPE_VIDEO: if (ost->picref->video) - ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio; + ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect; if (!DoVideoOut(os, ost, ist, &picture, &frame_size, bit_buffer_size, bit_buffer)) return false; // if (vstats_filename && frame_size) --- a/src/mediatrc_ffmpeg.h +++ b/src/mediatrc_ffmpeg.h @@ -23,6 +23,10 @@ extern "C" { #define __STDC_LIMIT_MACROS #include #include + +typedef struct { + enum PixelFormat pix_fmt; +} AVSinkContext; } // select an input stream for an output stream debian/patches/fix_desktop_file.patch0000664000000000000000000000077611715402052015165 0ustar Fix errors detected by desktop-file-validate --- data/dvdstyler.desktop | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- DVDStyler-1.8.0rc2.orig/data/dvdstyler.desktop +++ DVDStyler-1.8.0rc2/data/dvdstyler.desktop @@ -1,11 +1,10 @@ [Desktop Entry] Version=1.0 Type=Application -Encoding=UTF-8 Name=DVD Styler Comment=Video DVD Production -Icon=dvdstyler.png +Icon=dvdstyler Exec=dvdstyler Terminal=false -Categories=Application;AudioVideo; +Categories=AudioVideo; StartupNotify=true debian/patches/series0000664000000000000000000000030212210335763012031 0ustar fix_desktop_file.patch #Fix errors detected by desktop-file-validate genisoimage.patch #fix-libav0.8.patch #drop-mplex.patch #fix_underlinkage.patch #fix_no_audio_input.patch fix_no_audio.patch debian/patches/fix_no_audio_input.patch0000664000000000000000000000167112204712404015523 0ustar Description: avconv does not support /dev/zero when there is no audio The generated command line contains a -i /dev/zero option when the input file does not have sound and there is no sound added. This patch drop that part and does not generates any audio option when there is no audio. Author: Fabrice Coutadeur Bug: https://sourceforge.net/p/dvdstyler/bugs/532/ --- dvdstyler-2.5.2.orig/src/ProgressDlg.cpp +++ dvdstyler-2.5.2/src/ProgressDlg.cpp @@ -1262,6 +1262,7 @@ bool ProgressDlg::Transcode(Vob* vob, As return false; } } + /* if (vob && vob->GetFilename().length() && !vob->HasAudio()) { #ifdef __WXMSW__ wxString zero = wxT("aevalsrc=0"); @@ -1278,6 +1279,7 @@ bool ProgressDlg::Transcode(Vob* vob, As if (recordingTime <= 0) recordingTime = vob->GetDuration() > 0 ? vob->GetDuration() : 1.0; } + */ // set output options transcoder.SetInterlaced(vob->GetInterlaced()); debian/compat0000664000000000000000000000000211715402052010363 0ustar 7 debian/dvdstyler-data.docs0000664000000000000000000000002411715402052012762 0ustar TODO AUTHORS README