Ticket #1073: mplayer_1.0.rc2svn20071207-0.3.diff
| File mplayer_1.0.rc2svn20071207-0.3.diff, 339.9 KB (added by , 18 years ago) |
|---|
-
debian/mplayer-doc.doc-base
old new 1 Document: mplayer-doc 2 Title: Mplayer documentation 3 Author: Cabuccino 4 Abstract: Documentation for MPlayer - The Movie Player for LINUX 5 Section: Graphics 6 7 Format: HTML 8 Index: /usr/share/doc/mplayer-doc/HTML/en/index.html 9 Files: /usr/share/doc/mplayer-doc/HTML/en/*.html -
mplayer-1.0.rc2svn20071207
old new 1 ?package(mplayer):needs="X11" section="Applications/Viewers" \ 2 title="MPlayer" \ 3 icon="/usr/share/pixmaps/mplayer.xpm" \ 4 command="/usr/bin/gmplayer" -
mplayer-1.0.rc2svn20071207
old new 1 usr/bin/mplayer usr/bin/gmplayer 2 usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz 3 usr/share/man/de/man1/mplayer.1.gz usr/share/man/de/man1/gmplayer.1.gz 4 usr/share/man/es/man1/mplayer.1.gz usr/share/man/es/man1/gmplayer.1.gz 5 usr/share/man/fr/man1/mplayer.1.gz usr/share/man/fr/man1/gmplayer.1.gz 6 usr/share/man/hu/man1/mplayer.1.gz usr/share/man/hu/man1/gmplayer.1.gz 7 usr/share/man/pl/man1/mplayer.1.gz usr/share/man/pl/man1/gmplayer.1.gz -
mplayer-1.0.rc2svn20071207
old new 1 Source: mplayer 2 Section: graphics 3 Priority: extra 4 Maintainer: Christian Marillat <marillat@debian.org> 5 Bugs: mailto:marillat@debian.org 6 Homepage: http://www.mplayerhq.hu/ 7 Standards-Version: 3.7.3 8 Build-Depends: debhelper (>> 5), libncurses5-dev, libsvga1-dev [i386] | svgalibg1-dev [i386], 9 libesd0-dev, liblircclient-dev, libgtk2.0-dev, libvorbis-dev, libsdl1.2-dev, 10 libmad0-dev, libasound2-dev (>= 1.0.1), liblzo2-dev, libfaad-dev, gawk, libdts-dev, 11 libxvmc-dev, libjpeg62-dev, libaudiofile-dev, libsmbclient-dev, libfribidi-dev, 12 libxv-dev, libpng3-dev, ccache, libungif4-dev, libggi2-dev, libaa1-dev, dpatch, 13 liblame-dev, libdvdnav-dev, libcdparanoia0-dev, libxvidcore4-dev, libdv-dev, 14 libcaca-dev, liblivemedia-dev (>= 2004.05.01), libfreetype6-dev, em8300-headers, 15 libgl1-mesa-swx11-dev | libgl-dev, libdirectfb-dev (>= 1.0.1), libdvdread-dev, libtheora-dev, 16 libx264-dev (>= 0.svn20070309-4), libglu1-mesa-dev, libartsc0-dev, libfontconfig-dev, 17 libaudio-dev, libmpcdec-dev, libpulse-dev, libxxf86dga-dev, libjack-dev, 18 ladspa-sdk, libvstream-dev, libfaac-dev, libxinerama-dev, libtwolame-dev, 19 libspeex-dev, libopenal-dev, libamrwb-dev, libamrnb-dev 20 21 Package: mplayer 22 Architecture: i386 23 Depends: ${shlibs:Depends}, mplayer-skin 24 Suggests: w32codecs (>= 1:20050412-0.1), libdvdcss, mplayer-doc 25 Conflicts: mplayer-386, mplayer-586, mplayer-k6, mplayer-custom, mplayer-nogui, libconfhelper-perl 26 Replaces: mplayer-386, mplayer-586, mplayer-k6, mplayer-custom, mplayer-nogui 27 Description: The Ultimate Movie Player For Linux 28 It plays most mpeg, avi and asf files, supported by many native and win32 29 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 30 big feature of mplayer is the wide range of supported output drivers. It 31 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 32 this way all drivers of SDL) and some lowlevel card-specific drivers (for 33 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 34 so you can enjoy movies in fullscreen. 35 36 Package: mplayer-nogui 37 Architecture: i386 38 Depends: ${shlibs:Depends} 39 Suggests: w32codecs (>= 1:20050412-0.1), libdvdcss, mplayer-doc 40 Conflicts: mplayer-386, mplayer-586, mplayer-k6, mplayer-custom, mplayer, mplayer-skin, libconfhelper-perl 41 Replaces: mplayer-386, mplayer-586, mplayer-k6, mplayer-custom, mplayer 42 Provides: mplayer 43 Description: The Ultimate Movie Player For Linux 44 It plays most mpeg, avi and asf files, supported by many native and win32 45 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 46 big feature of mplayer is the wide range of supported output drivers. It 47 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 48 this way all drivers of SDL) and some lowlevel card-specific drivers (for 49 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 50 so you can enjoy movies in fullscreen. 51 . 52 This version doesn't have the User Interface in GTK+. 53 54 Package: mencoder 55 Architecture: i386 56 Depends: ${shlibs:Depends} 57 Suggests: w32codecs (>= 1:20050412-0.1), libdvdcss, mplayer-doc 58 Conflicts: mencoder-k6, mencoder-386, mencoder-586, mencoder-custom 59 Replaces: mencoder-k6, mencoder-386, mencoder-586, mencoder-custom 60 Description: MPlayer's Movie Encoder 61 A simple movie encoder, designed to encode MPlayer-playable movies 62 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 63 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 64 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 65 video resizing abilities. 66 67 Package: mplayer-doc 68 Architecture: all 69 Section: doc 70 Description: Documentation for mplayer 71 This package contains the documentation Chinese, English, French, German, 72 Hungarian, Italian and Polish. -
mplayer-1.0.rc2svn20071207
old new 1 MPlayer and mencoder for Debian i386 2 ------------------------------------ 3 4 Byte order: little-endian 5 Optimizing for: Runtime CPU-Detection enabled 6 7 Languages: 8 Messages/GUI: en 9 Manual pages: ru pl it hu fr es en de cs 10 11 Enabled optional drivers: 12 Input: vstream ftp pvr radio tv-teletext tv-v4l2 tv-v4l tv live555 cddb 13 cdda dvdread(internal) vcd dvb smb network 14 Codecs: x264 xvid libdv libamr_wb libamr_nb libavcodec qtx real xanim 15 win32 faad2 faac musepack libmpeg2 libdca liba52 mp3lib 16 libtheora speex libvorbis twolame libmad liblzo gif 17 Audio output: alsa openal jack pulse esd arts oss v4l2 nas sdl mpegpes(dvb) 18 Video output: v4l2 dxr3 sdl gif89a pnm jpeg png mpegpes(dvb) fbdev svga 19 caca aa ggi xmga mga xvidix cvidix opengl dga xvmc xv x11 20 xover dfbmga directfb md5sum tga s3fb tdfxfb 21 Audio filters: ladspa 22 Disabled optional drivers: 23 Input: dvdnav tv-dshow nemesi libdvdcss(internal) 24 Codecs: toolame 25 Audio output: sun ivtv dxr2 26 Video output: ivtv dxr2 vesa zr zr2 winvidix 3dfx bl xvr100 tdfx_vid 27 Audio filters: 28 29 ------------------------------------------------------------------------------ 30 The amd64 package has been compiled with the following options : 31 32 Byte order: little-endian 33 Optimizing for: 34 35 Languages: 36 Messages/GUI: en 37 Manual pages: de en es fr hu it pl sv 38 39 Enabled optional drivers: 40 Input: vstream ftp network tv-v4l2 tv-v4l edl tv live555 matroska cdda 41 dvdread vcd dvb smb 42 Codecs: x264 xvid libdv amr_wb amr_nb libavcodec.so xanim 43 faad2(external) faac musepack libmpeg2 libdts liba52 mp3lib 44 libtheora libvorbis libmad liblzo gif 45 Audio output: alsa jack polyp esd arts oss nas sdl mpegpes(dvb) 46 Video output: xvidix cvidix sdl gif89a md5sum pnm jpeg png mpegpes(dvb) 47 fbdev caca aa ggi xmga mga opengl dga xv x11 xover dfbmga 48 directfb tga tdfxfb 3dfx 49 Audio filters: ladspa 50 Disabled optional drivers: 51 Input: tv-bsdbt848 mpdvdkit 52 Codecs: qtx opendivx real dshow/dmo win32 twolame toolame 53 Audio output: sgi sun dxr2 dsound win32 54 Video output: winvidix bl zr zr2 dxr3 dxr2 directx vesa svga xvmc tdfx_vid 55 Audio filters: 56 57 ------------------------------------------------------------------------------ 58 59 The mplayer-g4 package has been compiled with the following options : 60 61 Byte order: Big Endian 62 Optimizing for: 7450 altivec 63 64 Languages: 65 Messages/GUI: en 66 Manual pages: de en es fr hu it pl 67 68 Enabled optional drivers: 69 Input: ftp network tv-v4l2 tv-v4l edl tv live.com matroska(internal) 70 cdda mpdvdkit2 vcd dvb smb 71 Codecs: flac(external) xvid libdv libavcodec real xanim 72 faad2(external) libvorbis libmad liblzo gif 73 Audio output: alsa1x esd arts oss nas sdl mpegpes(dvb) 74 Video output: xvidix cvidix dxr3 sdl gif89a jpeg png mpegpes(dvb) 75 fbdev svga aa ggi xmga mga opengl dga xv x11 xover dfbmga 76 directfb tga tdfxfb 3dfx 77 Disabled optional drivers: 78 Input: tv-bsdbt848 dvdread 79 Codecs: qtx opendivx dshow/dmo win32 libtheora 80 Audio output: sgi sun dxr2 win32 macosx 81 Video output: winvidix bl zr zr2 dxr2 directx vesa xvmc tdfx_vid 82 83 ------------------------------------------------------------------------------ 84 85 The sparc package has been compiled with the following options : 86 87 Byte order: big-endian 88 Optimizing for: v9 89 90 Languages: 91 Messages/GUI: en 92 Manual pages: de en es fr hu it pl sv 93 94 Enabled optional drivers: 95 Input: vstream ftp network tv-v4l2 tv-v4l edl tv live555 matroska cdda 96 dvdread vcd dvb smb 97 Codecs: x264 xvid libdv amr_wb amr_nb libavcodec.so xanim 98 faad2(external) faac musepack libmpeg2 libdts liba52 mp3lib 99 libtheora libvorbis libmad liblzo gif 100 Audio output: alsa jack polyp esd arts oss nas sdl mpegpes(dvb) 101 Video output: sdl gif89a md5sum pnm jpeg png mpegpes(dvb) fbdev caca aa 102 ggi xmga mga opengl dga xv x11 xover dfbmga directfb tga 103 tdfxfb 3dfx 104 Audio filters: ladspa 105 Disabled optional drivers: 106 Input: tv-bsdbt848 mpdvdkit 107 Codecs: qtx opendivx real dshow/dmo win32 twolame toolame 108 Audio output: sgi sun dxr2 dsound win32 109 Video output: xvidix winvidix cvidix bl zr zr2 dxr3 dxr2 directx vesa 110 svga xvmc tdfx_vid 111 Audio filters: 112 113 ------------------------------------------------------------------------------ 114 115 These error messages : 116 117 libdha: DHA kernelhelper failed: No such device 118 libdha: DHA kernelhelper failed: No such device 119 120 Can be ignored, dhahelper is not yet finished. 121 122 ------------------------------------------------------------------------------ 123 124 Christian -
mplayer-1.0.rc2svn20071207
old new 1 Source: mplayer 2 Section: graphics 3 Priority: extra 4 Maintainer: Christian Marillat <marillat@debian.org> 5 Bugs: mailto:marillat@debian.org 6 Homepage: http://www.mplayerhq.hu/ 7 Standards-Version: 3.7.3 8 Build-Depends: debhelper (>> 5), libncurses5-dev, libxv-dev, libfaac-dev, libdts-dev, 9 libesd0-dev, liblircclient-dev, libgtk2.0-dev, libvorbis-dev, libsdl1.2-dev, 10 libmad0-dev, libasound2-dev (>= 1.0.1), liblzo2-dev, libfaad-dev, libxvmc-dev, 11 gawk, libjpeg62-dev, libaudiofile-dev, libsmbclient-dev, libfribidi-dev, ccache, 12 libpng-dev | libpng3-dev, libungif4-dev, libggi2-dev, libaa1-dev, liblame-dev, 13 libcdparanoia0-dev, libxvidcore4-dev, libdv-dev, libcaca-dev, em8300-headers, 14 liblivemedia-dev (>= 2004.05.01), libfreetype6-dev, libgl1-mesa-dev | libgl-dev, libaudio-dev, 15 libdirectfb-dev (>= 1.0.1), libdvdread-dev, libtheora-dev, libspeex-dev, 16 libglu1-mesa-dev, libartsc0-dev, libfontconfig-dev, libx264-dev (>= 0.svn20070309-4), 17 libdvdnav-dev, libxxf86dga-dev, libpulse-dev, libjack-dev, ladspa-sdk, dpatch, 18 libvstream-dev, libmpcdec-dev, libxinerama-dev, libtwolame-dev, libopenal-dev, 19 libamrwb-dev, libamrnb-dev 20 21 Package: mplayer 22 Architecture: alpha 23 Depends: ${shlibs:Depends}, mplayer-skin 24 Suggests: libdvdcss, mplayer-doc 25 Conflicts: mplayer-custom, mplayer-nogui, libconfhelper-perl 26 Replaces: mplayer-custom, mplayer-nogui 27 Description: The Ultimate Movie Player For Linux 28 It plays most mpeg, avi and asf files, supported by many native and win32 29 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 30 big feature of mplayer is the wide range of supported output drivers. It 31 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 32 this way all drivers of SDL) and some lowlevel card-specific drivers (for 33 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 34 so you can enjoy movies in fullscreen. 35 . 36 This version is for Alpha CPUs. 37 38 Package: mencoder 39 Architecture: alpha 40 Depends: ${shlibs:Depends} 41 Suggests: libdvdcss, mplayer-doc 42 Conflicts: mencoder-custom 43 Replaces: mencoder-custom 44 Description: MPlayer's Movie Encoder 45 A simple movie encoder, designed to encode MPlayer-playable movies 46 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 47 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 48 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 49 video resizing abilities. 50 . 51 This version is for Alpha CPUs. 52 53 Package: mplayer-nogui 54 Architecture: alpha 55 Depends: ${shlibs:Depends} 56 Suggests: w32codecs (>= 0.91-1), libdvdcss, mplayer-doc 57 Conflicts: mplayer, mplayer-custom, mplayer-skin, libconfhelper-perl 58 Replaces: mplayer, mplayer-custom 59 Provides: mplayer 60 Description: The Ultimate Movie Player For Linux 61 It plays most mpeg, avi and asf files, supported by many native and win32 62 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 63 big feature of mplayer is the wide range of supported output drivers. It 64 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 65 this way all drivers of SDL) and some lowlevel card-specific drivers (for 66 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 67 so you can enjoy movies in fullscreen. 68 . 69 This version is for Alpha CPU but doesn't have the User Interface in GTK+. 70 71 Package: mplayer-doc 72 Architecture: all 73 Section: doc 74 Description: Documentation for mplayer 75 This package contains the documentation Chinese, English, French, German, 76 Hungarian, Italian and Polish. -
mplayer-1.0.rc2svn20071207
old new 1 mplayer (1:1.0.rc2svn20071207-0.3) unstable; urgency=low 2 3 * In mplayer.conf use 'alsa,' instead of 'alsa' for vo option. Seems to be 4 better for exotic alsa setup (Thanks to Clayton). 5 * New patch to call gmpalyer with %U instead of %F needed to open files 6 with spaces (Thanks to Maxime). 7 * Rebuild against the latest libx264-dev (58) package. 8 * Call dh_desktop for mplayer package instead of manual call to 9 update-desktop-database. 10 * Replace GTK By GTK+ in description. 11 * Change section for doc-base file. 12 * Remove useless ldconfig call in postinst and postrm for mplayer. 13 14 -- Christian Marillat <marillat@debian.org> Sun, 09 Mar 2008 10:39:02 +0100 15 16 mplayer (1:1.0.rc2svn20071207-0.2) unstable; urgency=low 17 18 * mplayer-doc should be in doc section. 19 * Fix ia64 build. 20 21 -- Christian Marillat <marillat@debian.org> Sun, 16 Dec 2007 15:19:14 +0100 22 23 mplayer (1:1.0.rc2svn20071207-0.1) unstable; urgency=low 24 25 * Build amd64 packages with --enable-runtime-cpudetection 26 27 -- Christian Marillat <marillat@debian.org> Mon, 10 Dec 2007 00:14:15 +0100 28 29 mplayer (1:1.0.rc2svn20071207-0.0) unstable; urgency=low 30 31 * News svn release 25315. 32 * Added E-AC3 patch from http://www.db-instable.org/misc and mplayer 33 codecs.conf from http://forum.doom9.org/showthread.php?t=129050 34 This command line should works : 35 mplayer -vc ffvc1 -demuxer lavf -fps 30000/1001 -ac ffeac3 FILE.EVO 36 * Removed pulse patch included by upstream. 37 38 -- Christian Marillat <marillat@debian.org> Fri, 07 Dec 2007 12:04:40 +0100 39 40 mplayer (1:1.0.rc2-0.2) unstable; urgency=low 41 42 * Remove 04_screensaver patch. try to bother upstream author for a better 43 solution. 44 * Replace Apps by Applications in Debian menu. 45 46 -- Christian Marillat <marillat@debian.org> Fri, 02 Nov 2007 15:15:19 +0100 47 48 mplayer (1:1.0.rc2-0.1) unstable; urgency=low 49 50 * Rebuild agains the current libcaca and libcucu pacjages. 51 52 -- Christian Marillat <marillat@debian.org> Thu, 11 Oct 2007 20:08:48 +0200 53 54 mplayer (1:1.0.rc2-0.0) unstable; urgency=low 55 56 * New upstream release. 57 58 -- Christian Marillat <marillat@debian.org> Thu, 11 Oct 2007 14:46:34 +0200 59 60 mplayer (1:1.0-rc1svn20071006-0.0) unstable; urgency=low 61 62 * New svn release 24712. 63 * Added patch found in bug #404975 to diasble gnome-screensaver while 64 playing movies (Thanks to Manphiz for the working patch). 65 66 -- Christian Marillat <marillat@debian.org> Sat, 06 Oct 2007 10:19:58 +0200 67 68 mplayer (1:1.0-rc1svn20070917-0.2) unstable; urgency=low 69 70 * Fix the broken alpha patch. 71 72 -- Christian Marillat <marillat@debian.org> Thu, 20 Sep 2007 14:55:50 +0200 73 74 mplayer (1:1.0-rc1svn20070917-0.1) unstable; urgency=low 75 76 * Add a patch to fix alpha build. 77 78 -- Christian Marillat <marillat@debian.org> Thu, 20 Sep 2007 11:43:54 +0200 79 80 mplayer (1:1.0-rc1svn20070917-0.0) unstable; urgency=low 81 82 * New svn release 24554. 83 84 -- Christian Marillat <marillat@debian.org> Mon, 17 Sep 2007 15:36:47 +0200 85 86 mplayer (1:1.0-rc1svn20070903-0.1) unstable; urgency=low 87 88 * Build sparc package with -mcpu=ultrasparc -mtune=ultrasparc 89 90 -- Christian Marillat <marillat@debian.org> Tue, 11 Sep 2007 13:30:34 +0200 91 92 mplayer (1:1.0-rc1svn20070903-0.0) unstable; urgency=low 93 94 * New svn release 24331. 95 96 -- Christian Marillat <marillat@debian.org> Mon, 03 Sep 2007 12:41:26 +0200 97 98 mplayer (1:1.0-rc1svn20070823-0.1) unstable; urgency=low 99 100 * I've finally found why the powerpc package wasn't build. 101 102 -- Christian Marillat <marillat@debian.org> Thu, 23 Aug 2007 18:29:00 +0200 103 104 mplayer (1:1.0-rc1svn20070823-0.0) unstable; urgency=low 105 106 * New svn release 24123. 107 108 -- Christian Marillat <marillat@debian.org> Thu, 23 Aug 2007 14:33:55 +0200 109 110 mplayer (1:1.0-rc1svn20070812-0.0) unstable; urgency=low 111 112 * New svn release 24045. 113 114 -- Christian Marillat <marillat@debian.org> Sun, 12 Aug 2007 11:54:36 +0200 115 116 mplayer (1:1.0-rc1svn20070801-0.0) unstable; urgency=low 117 118 * New svn release 23992. 119 120 -- Christian Marillat <marillat@debian.org> Wed, 01 Aug 2007 17:55:58 +0200 121 122 mplayer (1:1.0-rc1svn20070720-0.0) unstable; urgency=low 123 124 * New svn release 23833. 125 * Need to build with --enable-png because png autodection is broken. 126 127 -- Christian Marillat <marillat@debian.org> Fri, 20 Jul 2007 11:48:10 +0200 128 129 mplayer (1:1.0-rc1svn20070719-0.0) unstable; urgency=low 130 131 * New svn release 23825. 132 133 -- Christian Marillat <marillat@debian.org> Thu, 19 Jul 2007 10:43:48 +0200 134 135 mplayer (1:1.0-rc1svn20070618-0.0) unstable; urgency=low 136 137 * New svn release 23579. 138 * Add ppc64 support from Thibaut Varene. 139 * Build staticaly against libavcodec mplayer is 10% faster. 140 141 -- Christian Marillat <marillat@debian.org> Mon, 18 Jun 2007 22:25:22 +0200 142 143 mplayer (1:1.0-rc1svn20070501-0.1) unstable; urgency=low 144 145 * Use real dpatch for patches. 146 * Rewrote 04_Makefile patch (doesn't work on powerpc). 147 * Vidix s disabled for powerpc. From the configure script : 148 # this is broken currently, undefined references to inw, outw etc. 149 # ppc && linux && _vidix_internal=yes 150 * Replaces libjack0.100.0-dev by libjack-dev in Build-Depends. 151 152 -- Christian Marillat <marillat@debian.org> Mon, 07 May 2007 14:51:24 +0200 153 154 mplayer (1:1.0-rc1svn20070501-0.0) unstable; urgency=low 155 156 * New svn release 23187. 157 * XvMC work again with the latest libav libraries. 158 159 -- Christian Marillat <marillat@debian.org> Tue, 01 May 2007 16:15:58 +0200 160 161 mplayer (1:1.0-rc1svn20070225-0.4) unstable; urgency=low 162 163 * Removed transition package. 164 * Removed unneeded packages in Build-Depends. 165 * Install the right mime file for *-nogui packages. 166 167 -- Christian Marillat <marillat@debian.org> Sat, 21 Apr 2007 09:53:08 +0200 168 169 mplayer (1:1.0-rc1svn20070225-0.3) unstable; urgency=medium 170 171 * Replace liblzo-dev by liblzo2-dev in Build-Dpends. 172 * Add a Build-Conflicts to nvidia-glx-dev otherwise OpenGL support is not 173 built. 174 175 -- Christian Marillat <marillat@debian.org> Sat, 31 Mar 2007 10:01:17 +0200 176 177 mplayer (1:1.0-rc1svn20070225-0.2) unstable; urgency=low 178 179 * mplayer-itanium2 should provides mplayer. 180 181 -- Christian Marillat <marillat@debian.org> Sun, 11 Mar 2007 08:40:07 +0100 182 183 mplayer (1:1.0-rc1svn20070225-0.1) unstable; urgency=low 184 185 * Fix a typo in the powerpc hack. 186 187 -- Christian Marillat <marillat@debian.org> Tue, 27 Feb 2007 14:23:42 +0100 188 189 mplayer (1:1.0-rc1svn20070225-0.0) unstable; urgency=low 190 191 * New svn release 22346. 192 * Sdl vidéo support is back. 193 * debian/rules Some perl hacks, because --disable-altivec doesn't work. 194 195 -- Christian Marillat <marillat@debian.org> Mon, 26 Feb 2007 17:48:19 +0100 196 197 mplayer (1:1.0-rc1svn20070222-0.0) unstable; urgency=low 198 199 * Newsvn release 22309. 200 201 -- Christian Marillat <marillat@debian.org> Thu, 22 Feb 2007 15:03:10 +0100 202 203 mplayer (1:1.0-rc1cvs20070118-0.3) unstable; urgency=low 204 205 * Added a little hack to configure to output a -mtune option for the ia64 206 arch. My sed hack in debian/rules to add itanium optimization should 207 work now. 208 209 -- Christian Marillat <marillat@debian.org> Sun, 28 Jan 2007 19:19:05 +0100 210 211 mplayer (1:1.0-rc1cvs20070118-0.2) unstable; urgency=low 212 213 * Rename the mplayer-powerpc package to mplayer and mencoder-powerpc to 214 mencoder and keep the *-powerpc packages to install normal packages. 215 * Don't try to link the powerpc packages against the ffmpeg libraries. 216 * Add itanium2 packages. Packages name are : mplayer for itanium 1 and 217 mplayer-itanium2 for guess what ? Same for mencoder. 218 * Added libspeex-dev in Build-Depends. 219 220 -- Christian Marillat <marillat@debian.org> Sat, 27 Jan 2007 16:10:17 +0100 221 222 mplayer (1:1.0-rc1cvs20070118-0.1) unstable; urgency=low 223 224 * Don't add s3fb support for sparc, hppa and powerpc. 225 226 -- Christian Marillat <marillat@debian.org> Sat, 20 Jan 2007 16:24:13 +0100 227 228 mplayer (1:1.0-rc1cvs20070118-0.0) unstable; urgency=low 229 230 * SVN release. 231 * Add libpulse-dev in Builde-Depends. 232 * Build with --enable-radio and --enable-radio-capture 233 * Enable s3fb output with --enable-s3fb 234 235 -- Christian Marillat <marillat@debian.org> Fri, 19 Jan 2007 15:06:48 +0100 236 237 mplayer (1:1.0-rc1-0.1) unstable; urgency=low 238 239 * Ideas from Thibaut Varene : 240 o Add support for ccache. 241 o Add support for make -j. 242 * Add support for Pulseaudio (old project was Polypaudio) from 243 Jean-Christophe Dubacq. 244 * Add mplayer-skin in Conflicts for nogui package. 245 * Add libconfhelper-perl in Conflicts for all packages. 246 247 -- Christian Marillat <marillat@debian.org> Fri, 24 Nov 2006 14:59:26 +0100 248 249 mplayer (1:1.0-rc1-0.0) unstable; urgency=low 250 251 * New upstream release. 252 253 -- Christian Marillat <marillat@debian.org> Sun, 29 Oct 2006 10:16:39 +0100 254 255 mplayer (1:1.0-pre8cvs20061002-0.0) unstable; urgency=low 256 257 * New svn release. 258 259 -- Christian Marillat <marillat@debian.org> Mon, 2 Oct 2006 11:01:31 +0200 260 261 mplayer (1:1.0-pre8cvs20060919-0.0) unstable; urgency=low 262 263 * New svn release. 264 265 -- Christian Marillat <marillat@debian.org> Tue, 19 Sep 2006 11:19:51 +0200 266 267 mplayer (1:1.0-pre8-0.2) unstable; urgency=low 268 269 * --with-xanimlibdir=/usr/lib/codecs and --with-reallibdir=/usr/lib/codecs \ 270 need to be defined for i386. 271 * Remove the libpostproc directory to link against the dynamic library. 272 273 -- Christian Marillat <marillat@debian.org> Wed, 16 Aug 2006 18:03:52 +0200 274 275 mplayer (1:1.0-pre8-0.1) unstable; urgency=low 276 277 * Add --with-reallibdir=/usr/local/lib/codecs for PPC arch. Yes /usr/local 278 because for now a codec package for ppc doesn't exist and thus users can 279 install the dll files in /usr/local 280 * Re-enable joystick support. 281 * Install mime type for the nogui package. 282 * Rebuild against the latest libdirectfb-0.9-25 package. 283 * Add libtwolame-dev in Builde-depends. 284 * Little patch to build against the latest x264 package. 285 286 -- Christian Marillat <marillat@debian.org> Wed, 2 Aug 2006 17:06:36 +0200 287 288 mplayer (1:1.0-pre8-0.0) unstable; urgency=low 289 290 * New Pre release. 291 * This release is compiled with --disable-joystick 292 293 -- Christian Marillat <marillat@debian.org> Mon, 12 Jun 2006 15:51:53 +0200 294 295 mplayer (1:1.0-pre7cvs20060430-0.4) unstable; urgency=low 296 297 * debian/rules Fix options for alpha and hppa arch. 298 299 -- Christian Marillat <marillat@debian.org> Sat, 13 May 2006 08:18:34 +0200 300 301 mplayer (1:1.0-pre7cvs20060430-0.3) unstable; urgency=low 302 303 * Re-arrange Build-Depends to work with sbuild. 304 305 -- Christian Marillat <marillat@debian.org> Fri, 12 May 2006 17:59:47 +0200 306 307 mplayer (1:1.0-pre7cvs20060430-0.2) unstable; urgency=low 308 309 * Make libaa1-dev the first package in Buil-Depends (aalib1-dev | 310 libaa1-dev), otherwise builder don't llike that. 311 * Added hppa and alpha support. 312 313 -- Christian Marillat <marillat@debian.org> Thu, 11 May 2006 16:15:13 +0200 314 315 mplayer (1:1.0-pre7cvs20060430-0.1) unstable; urgency=low 316 317 * debian/rules small patch from Guido to fix the devscripts bug #364256. 318 * Add a nogui package for sparc. 319 * Add ia64 support from Thibaut Varene. 320 321 -- Christian Marillat <marillat@debian.org> Wed, 10 May 2006 08:51:34 +0200 322 323 mplayer (1:1.0-pre7cvs20060430-0.0) unstable; urgency=low 324 325 * New CVS release. 326 327 -- Christian Marillat <marillat@debian.org> Sun, 30 Apr 2006 15:19:42 +0200 328 329 mplayer (1:1.0-pre7cvs20060416-0.1) unstable; urgency=low 330 331 * Remove --enable-vorbis option. 332 333 -- Christian Marillat <marillat@debian.org> Tue, 18 Apr 2006 15:00:30 +0200 334 335 mplayer (1:1.0-pre7cvs20060416-0.0) unstable; urgency=low 336 337 * New CVS release. 338 * Remove unneeded --enable-xinerama --enable-fribidi --enable-freetype options. 339 * Remove the mplayer.xpm Debian icon menu, now provided by upstream. 340 341 -- Christian Marillat <marillat@debian.org> Sun, 16 Apr 2006 17:58:53 +0200 342 343 mplayer (1:1.0-pre7cvs20060325-0.3) unstable; urgency=low 344 345 * Build with --enable-lirc. 346 347 -- Christian Marillat <marillat@debian.org> Mon, 27 Mar 2006 08:53:00 +0200 348 349 mplayer (1:1.0-pre7cvs20060325-0.2) unstable; urgency=low 350 351 * Bug in -0.1 should be fixed in debian/control.marillat not debian/control 352 353 -- Christian Marillat <marillat@debian.org> Sun, 26 Mar 2006 23:42:34 +0200 354 355 mplayer (1:1.0-pre7cvs20060325-0.1) unstable; urgency=low 356 357 * mencoder should replaces/conflicts with mencoder-586. 358 359 -- Christian Marillat <marillat@debian.org> Sun, 26 Mar 2006 14:44:47 +0200 360 361 mplayer (1:1.0-pre7cvs20060325-0.0) unstable; urgency=low 362 363 * New CVS release. 364 * Remove 386, 586 and k6 packages. Now we only have mplayer, mplayer-nogui 365 and mencoder packages build with --enable-runtime-cpudetection. Don't 366 ask, I'll not change my mind for that. 367 * Install all translated man pages. 368 * Remove unnecessary --enable option. 369 370 -- Christian Marillat <marillat@debian.org> Sun, 26 Mar 2006 14:21:52 +0200 371 372 mplayer (1:1.0-pre7cvs20060219-0.2) unstable; urgency=low 373 374 * Remove --enable-live, otherwise the configure script doesn't find the 375 right path for include files. 376 377 -- Christian Marillat <marillat@debian.org> Thu, 23 Feb 2006 01:53:32 +0100 378 379 mplayer (1:1.0-pre7cvs20060219-0.1) unstable; urgency=low 380 381 * Rebuild against the latest ffmpegcvs to fix AC3 crash. 382 383 -- Christian Marillat <marillat@debian.org> Wed, 22 Feb 2006 16:58:05 +0100 384 385 mplayer (1:1.0-pre7cvs20060219-0.0) unstable; urgency=low 386 387 * New CVS release. 388 * Enable libavformat. 389 * Remove all my patches except the configure patch because the livemedia 390 header aren't installed as expected. 391 392 -- Christian Marillat <marillat@debian.org> Mon, 20 Feb 2006 22:16:17 +0100 393 394 mplayer (1:1.0-pre7cvs20060103-0.1) unstable; urgency=low 395 396 * Add em8300-headers in Build-Depends. 397 * Remove xlibs-dev from Build-Depends. 398 * Remove polyp audio support. 399 400 -- Christian Marillat <marillat@debian.org> Tue, 17 Jan 2006 10:47:32 +0100 401 402 mplayer (1:1.0-pre7cvs20060103-0.0) unstable; urgency=low 403 404 * New CVS release. 405 * Move the default skin in a separate package. 406 * Enable XvMC support and add libxvmc-dev in Build-Depends. 407 408 -- Christian Marillat <marillat@debian.org> Sat, 7 Jan 2006 15:51:46 +0100 409 410 mplayer (1:1.0-pre7cvs20051102-0.1) unstable; urgency=low 411 412 * Add libxinerama-dev in Build-depends for all arch. 413 * Don't package my desktop file, use upstream file instead. 414 * Doesn't build the 3dfx driver, we already have the more up to date 415 tdfxfb and tdfx_vid drivers. 416 417 -- Christian Marillat <marillat@debian.org> Tue, 29 Nov 2005 13:49:37 +0100 418 419 mplayer (1:1.0-pre7cvs20051102-0.0) unstable; urgency=low 420 421 * New CVS release. 422 * Add libxxf86dga-dev, libjack-dev and libx264-dev in Build-depends for amd64. 423 * Add libxv-dev, libfaac-dev and libdts-dev for all arch in Build-depends. 424 * Add Musepack support. 425 * Clean up the Debian diff. 426 427 -- Christian Marillat <marillat@debian.org> Wed, 2 Nov 2005 11:08:39 +0100 428 429 mplayer (1:1.0-pre7cvs20051101-0.0) unstable; urgency=low 430 431 * CVS release. 432 433 -- Christian Marillat <marillat@debian.org> Tue, 1 Nov 2005 21:54:39 +0100 434 435 mplayer (1:1.0-pre7cvs20051016-0.1) unstable; urgency=low 436 437 * Don't use afm=libmad by default in mplayer.conf libmad does an horrible 438 noise when you move in a file. 439 440 -- Christian Marillat <marillat@debian.org> Tue, 18 Oct 2005 15:38:17 +0200 441 442 mplayer (1:1.0-pre7cvs20051016-0.0) unstable; urgency=low 443 444 * CVS release. 445 * The -pp option is back. 446 447 -- Christian Marillat <marillat@debian.org> Sun, 16 Oct 2005 17:19:07 +0200 448 449 mplayer (1:1.0-pre7cvs20051008-0.1) unstable; urgency=low 450 451 * Add libpolyp-dev and ladspa-sdk in Build-Depends for amd64. 452 453 -- Christian Marillat <marillat@debian.org> Mon, 10 Oct 2005 21:56:51 +0200 454 455 mplayer (1:1.0-pre7cvs20051008-0.0) unstable; urgency=low 456 457 * CVS release. 458 * Remove useless xmms support. 459 * Don't make gmplayer symbolic link for the nogui package. 460 * Don't call "gmplayer < /dev/null" in Debian menu. 461 462 -- Christian Marillat <marillat@debian.org> Sat, 8 Oct 2005 17:37:19 +0200 463 464 mplayer (1:1.0-pre7cvs20050716-0.1) unstable; urgency=low 465 466 * Forget to update build-dependencies for others archs. 467 * Add ladspa-sdk in build-depends. 468 * Added polypaudio sound server support. 469 * Applied ppc patches from Guido. 470 * Add vstream support for TiVo. 471 472 -- Christian Marillat <marillat@debian.org> Sun, 7 Aug 2005 10:02:48 +0200 473 474 mplayer (1:1.0-pre7cvs20050716-0.0) unstable; urgency=low 475 476 * CVS release. 477 * Add libxxf86dga-dev to xlibs-static-dev in Build-depends. 478 * Replaces libbio2jack0-dev by libjack-dev | libjack0.100.0-dev in Build-depends. 479 * Updated README.Debian 480 * dxr3 is disabled (doesn't compile) 481 482 -- Christian Marillat <marillat@debian.org> Sat, 16 Jul 2005 18:54:58 +0200 483 484 mplayer (1:1.0-pre7-0.3) unstable; urgency=low 485 486 * Add mplayer in replaces for mencoder sparc. 487 * Really build the sparc package against libjack0.100.0-dev 488 * Don't need to Build-depends on libdvdread-dev | libdvdread2-dev only 489 libdvdread-dev is needed. 490 491 -- Christian Marillat <marillat@debian.org> Mon, 4 Jul 2005 17:12:48 +0200 492 493 mplayer (1:1.0-pre7-0.2) unstable; urgency=low 494 495 * Rename the sparc package mplayer (was mplayer-sparc). Do the same for 496 mencoder. 497 * Install mencoder binary in the right package for sparc. 498 499 -- Christian Marillat <marillat@debian.org> Fri, 1 Jul 2005 08:48:25 +0200 500 501 mplayer (1:1.0-pre7-0.1) unstable; urgency=low 502 503 * Removed dummy packages mplayer-k7, mplayer-686, mencoder-k7 504 * Don't need to Recommends: mplayer-fonts, now that mplayer use fontconfig. 505 * New desktop file from Konrad Materka. 506 * Build against the latest libjack-dev package. 507 508 -- Christian Marillat <marillat@debian.org> Thu, 30 Jun 2005 15:26:10 +0200 509 510 mplayer (1:1.0-pre7-0.0) unstable; urgency=low 511 512 * New upstream release. 513 514 -- Christian Marillat <marillat@debian.org> Sun, 17 Apr 2005 15:02:22 +0200 515 516 mplayer (1:1.0-pre6cvs20050417-0.0) unstable; urgency=low 517 518 * CVS release. 519 * pp filters are back. 520 521 -- Christian Marillat <marillat@debian.org> Sun, 17 Apr 2005 12:05:35 +0200 522 523 mplayer (1:1.0-pre6cvs20050409-0.1) unstable; urgency=low 524 525 * Rebuild for testing 526 527 -- Christian Marillat <marillat@debian.org> Sun, 10 Apr 2005 22:28:31 +0200 528 529 mplayer (1:1.0-pre6cvs20050409-0.0) unstable; urgency=low 530 531 * CVS release. 532 * Include libavcodec source for ppc. 533 534 -- Christian Marillat <marillat@debian.org> Sat, 9 Apr 2005 21:36:42 +0200 535 536 mplayer (1:1.0-pre6cvs20050402-0.0) unstable; urgency=low 537 538 * CVS release 539 * Build with --disable-shared-pp 540 * Update libpostproc-dev build-dependecy to (>= 2:20050331-0.4). 541 542 -- Christian Marillat <marillat@debian.org> Sat, 2 Apr 2005 21:47:48 +0200 543 544 mplayer (1:1.0-pre6-0.6) unstable; urgency=low 545 546 * Add Guido changes for powerpc patches. 547 548 -- Christian Marillat <marillat@debian.org> Wed, 30 Mar 2005 11:01:12 +0200 549 550 mplayer (1:1.0-pre6-0.5) unstable; urgency=low 551 552 * debian/control.amd64 don't need to recommends mplayer-fonts, now mplayer 553 use fontconfig for subtitles. 554 * Build the custom package with --enable-xvmc 555 * Add a nogui package for amd64. 556 * Renamed the mplayer-amd64 to mplayer and mencoder-amd64 to mencoder. 557 558 -- Christian Marillat <marillat@debian.org> Mon, 7 Mar 2005 10:58:47 +0100 559 560 mplayer (1:1.0-pre6-0.4) unstable; urgency=low 561 562 * Add patches from Dan Korostelev : 563 o Call (if exist) update-desktop-database in postinst and postrm. 564 o New desktop file. 565 * debian/control.others Build-Depends on libavcodeccvs-dev 566 * Add jack support. Thanks to Bastian Kleineidam for the updated bio2jack 567 packages. 568 569 -- Christian Marillat <marillat@debian.org> Tue, 1 Mar 2005 11:24:16 +0100 570 571 mplayer (1:1.0-pre6-0.3) unstable; urgency=low 572 573 * Enable all optimizations for amd64. 574 * New patch 51_vector_keyword from Guido. 575 576 -- Christian Marillat <marillat@debian.org> Thu, 6 Jan 2005 14:42:51 +0100 577 578 mplayer (1:1.0-pre6-0.2) unstable; urgency=low 579 580 * Don't remove xmms dependency. xmms is really needed, except for people 581 who are using mplayer-nogui like me :) 582 583 -- Christian Marillat <marillat@debian.org> Wed, 29 Dec 2004 16:05:04 +0100 584 585 mplayer (1:1.0-pre6-0.1) unstable; urgency=low 586 587 * Build agains the latest libavcodeccvs to fix AC3 crash. 588 * Add ladspa support. 589 * Don't install codecs.conf file in /etc/mplayer Instead put this file in 590 the example directory in case somebody wants to do some hacking. 591 592 -- Christian Marillat <marillat@debian.org> Mon, 27 Dec 2004 16:31:23 +0100 593 594 mplayer (1:1.0-pre6-0.0) unstable; urgency=low 595 596 * New upstream release. 597 * Did again the liblivemedia patches. 598 599 -- Christian Marillat <marillat@debian.org> Sat, 25 Dec 2004 10:58:57 +0100 600 601 mplayer (1:1.0-pre5try2-0.2) unstable; urgency=low 602 603 * Hack to remove xmms dependency. 604 * New patch to build against liblivemedia-dev. 605 * Another patch from cvs to build against liblivemedia-dev. 606 607 -- Christian Marillat <marillat@debian.org> Fri, 24 Dec 2004 14:04:55 +0100 608 609 mplayer (1:1.0-pre5try2-0.1) unstable; urgency=low 610 611 * Replace liblive.com-dev by liblivemedia-dev in Build-Depends. 612 613 -- Christian Marillat <marillat@debian.org> Sat, 18 Dec 2004 14:06:02 +0100 614 615 mplayer (1:1.0-pre5try2-0.0) unstable; urgency=low 616 617 * New upstream release. 618 * Add amd64 compilation options in the README.Debian 619 620 -- Christian Marillat <marillat@debian.org> Sat, 18 Dec 2004 12:57:19 +0100 621 622 mplayer (1:1.0-pre5-0.12) unstable; urgency=low 623 624 * Build the 586 package with sse support. 625 626 -- Christian Marillat <marillat@debian.org> Thu, 9 Dec 2004 13:56:41 +0100 627 628 mplayer (1:1.0-pre5-0.11) unstable; urgency=low 629 630 * Fix multiple entries in the doc-base file thanks to Laurent Bonnaud 631 632 -- Christian Marillat <marillat@debian.org> Wed, 8 Dec 2004 18:49:09 +0100 633 634 mplayer (1:1.0-pre5-0.10) unstable; urgency=low 635 636 * Applied patches from Guido for sparc. 637 638 -- Christian Marillat <marillat@debian.org> Mon, 6 Dec 2004 15:24:02 +0100 639 640 mplayer (1:1.0-pre5-0.9) unstable; urgency=low 641 642 * Fix the desktop file (multiple entries) Thanks to Michael Mellor. 643 * Build against libavcodeccvs-dev. 644 645 -- Christian Marillat <marillat@debian.org> Sun, 5 Dec 2004 10:10:35 +0100 646 647 mplayer (1:1.0-pre5-0.8) unstable; urgency=low 648 649 * Use the included libavcodec for the powerpc package. Thanks to Guido. 650 * Hack to re-enable the -pp option. 651 652 -- Christian Marillat <marillat@debian.org> Thu, 4 Nov 2004 16:00:04 +0100 653 654 mplayer (1:1.0-pre5-0.7) unstable; urgency=low 655 656 * Add patch from Guido for ppc target. 657 * Doesn't compile the no-gui package with xmms support. 658 659 -- Christian Marillat <marillat@debian.org> Mon, 18 Oct 2004 18:48:22 +0200 660 661 mplayer (1:1.0-pre5-0.6) unstable; urgency=low 662 663 * Enable xmms support and add xmms in Suggests. 664 * Don't use liblivemedia-dev but my liblive.com-dev package. Doesn't work 665 at all with liblivemedia-dev 666 * Binaries upload this time. 667 668 -- Christian Marillat <marillat@debian.org> Wed, 13 Oct 2004 10:53:41 +0200 669 670 mplayer (1:1.0-pre5-0.5) unstable; urgency=low 671 672 * Build dynamically against libavcodec. 673 * Fix custom target. 674 * Fix a simple debclean. 675 * Replace liblive.com-dev by liblivemedia-dev the official Debian package. 676 677 -- Christian Marillat <marillat@debian.org> Sun, 10 Oct 2004 19:01:28 +0200 678 679 mplayer (1:1.0-pre5-0.4) unstable; urgency=low 680 681 * debian/rules more simplified, and amd64 fix. 682 683 -- Christian Marillat <marillat@debian.org> Thu, 19 Aug 2004 11:13:04 +0200 684 685 mplayer (1:1.0-pre5-0.3) unstable; urgency=low 686 687 * debian/rules fix typo in CONFIG_CONTROL to re-enable lirc and joystick support. 688 689 -- Christian Marillat <marillat@debian.org> Thu, 12 Aug 2004 13:42:57 +0200 690 691 mplayer (1:1.0-pre5-0.2) unstable; urgency=low 692 693 * debian/rules more simplified. 694 * Add nas-dev | libaudio-dev and xlibs-dev | xlib6g-dev in build-depends 695 to enable NAS for the testing package. 696 697 -- Christian Marillat <marillat@debian.org> Tue, 10 Aug 2004 16:16:37 +0200 698 699 mplayer (1:1.0-pre5-0.1) unstable; urgency=low 700 701 * debian/rules Simplified, thanks to Guido. 702 703 -- Christian Marillat <marillat@debian.org> Sun, 1 Aug 2004 10:52:20 +0200 704 705 mplayer (1:1.0-pre5-0.0) unstable; urgency=low 706 707 * New upstream release. 708 709 -- Christian Marillat <marillat@debian.org> Sun, 18 Jul 2004 19:07:54 +0200 710 711 mplayer (1:1.0-pre4cvs20040702-0.1) unstable; urgency=low 712 713 * Applied patch for amd64 from Oliver Cordes. 714 * Add libfontconfig-dev in Build-Depends. 715 716 -- Christian Marillat <marillat@debian.org> Sun, 4 Jul 2004 15:06:17 +0200 717 718 mplayer (1:1.0-pre4cvs20040702-0.0) unstable; urgency=low 719 720 * CVS release 721 * Change default ao option to alsa (was alsa1x) in /etc/mplayer/mplayer.conf 722 * Add libtheora support; 723 724 -- Christian Marillat <marillat@debian.org> Fri, 2 Jul 2004 08:40:38 +0200 725 726 mplayer (1:1.0-pre4cvs20040620-0.0) unstable; urgency=low 727 728 * Cvs release 729 o Fix fullscreen with metacity 730 o Use fontconfig for subtitle (Better for fribidi) 731 * Set expects_uris to no in applications files (Thanks to markus koller) 732 733 -- Christian Marillat <marillat@debian.org> Sun, 20 Jun 2004 19:43:25 +0200 734 735 mplayer (1:1.0-pre4-0.4) unstable; urgency=low 736 737 * Remove gmplayer definitions in mplayer.applications file for the nogui 738 package. 739 * Remove duplicate entries in default mplayer.conf file. 740 * Build against xvid 1.0.0 741 * Add support for FreeBidi. 742 743 -- Christian Marillat <marillat@debian.org> Tue, 18 May 2004 15:31:40 +0200 744 745 mplayer (1:1.0-pre4-0.3) unstable; urgency=low 746 747 * Really apply my svga hack. 748 749 -- Christian Marillat <marillat@debian.org> Thu, 13 May 2004 16:20:26 +0200 750 751 mplayer (1:1.0-pre4-0.2) unstable; urgency=low 752 753 * Rewrote my hack to depends on svgalib-dummy1. 754 * Add support for libcaca. 755 * Applied patch from Guido 756 o Build against libxvidcore4 on ppc. 757 o Remove altivec patch, fixed upstream. 758 * Don't need to Build-Depends on libmatroska-dev (now included in mplayer) 759 760 -- Christian Marillat <marillat@debian.org> Thu, 13 May 2004 14:47:22 +0200 761 762 mplayer (1:1.0-pre4-0.1) unstable; urgency=low 763 764 * Rebuild a clean diff.gz (May be I was drunk for doing a so broken file) 765 766 -- Christian Marillat <marillat@debian.org> Fri, 7 May 2004 18:10:17 +0200 767 768 mplayer (1:1.0-pre4-0.0) unstable; urgency=low 769 770 * New upstream release. 771 772 -- Christian Marillat <marillat@debian.org> Sat, 1 May 2004 17:11:50 +0200 773 774 mplayer (1:1.0-pre3cvs20040422-0.0) unstable; urgency=low 775 776 * New CVS release. 777 * In /etc/mplayer/mplayer.conf add a ',' at the end of ao and vo option, 778 thus if the defined driver doesn't exist mplayer should fallback to 779 others drivers. 780 * Move mplayer.applications file in the right place and add mime, keys, 781 and applications files for the nogui package. 782 * Build against the latest libdv4-dev. 783 * Remove skin entries in mplayer.conf for the nogui package. 784 785 -- Christian Marillat <marillat@debian.org> Thu, 22 Apr 2004 15:40:25 +0200 786 787 mplayer (1:1.0-pre3cvs20040404-0.2) unstable; urgency=low 788 789 * debian/rules fix to use always the right control file. Fix missing 790 dvdread and directfb support in sarge. 791 * Update README.Debian 792 793 -- Christian Marillat <marillat@debian.org> Tue, 13 Apr 2004 15:59:43 +0200 794 795 mplayer (1:1.0-pre3cvs20040404-0.1) unstable; urgency=low 796 797 * Updated README.Debian for ppc from Guido. 798 799 -- Christian Marillat <marillat@debian.org> Wed, 7 Apr 2004 00:38:53 +0200 800 801 mplayer (1:1.0-pre3cvs20040404-0.0) unstable; urgency=low 802 803 * New CVS to fix security hole 804 * Downgrade again compilation for the k6 package. 805 * Build with DirectFB support. 806 * Added usual patch for ppc from Guido. 807 * Updated README.Debian 808 * Build with DVB support. 809 810 -- Christian Marillat <marillat@debian.org> Sun, 4 Apr 2004 18:47:30 +0200 811 812 mplayer (1:1.0-pre3cvs20040323-0.1) unstable; urgency=low 813 814 * Generate html documentation 815 * Build packages with --enable-tv-v4l2 816 817 -- Christian Marillat <marillat@debian.org> Wed, 24 Mar 2004 20:34:14 +0100 818 819 mplayer (1:1.0-pre3cvs20040323-0.0) unstable; urgency=low 820 821 * New CVS release. 822 * Fix bogus Conflicts 823 * Set default -ao option to alsa1x 824 825 -- Christian Marillat <marillat@debian.org> Tue, 23 Mar 2004 14:33:25 +0100 826 827 mplayer (1:1.0-pre3cvs20040314-0.0) unstable; urgency=low 828 829 * Cvs release with fix for k6 and 686 packages. 830 * 686 and k7 packages are now empty packages who install the k6 or the 831 586 package. 832 833 -- Christian Marillat <marillat@debian.org> Sun, 14 Mar 2004 16:39:55 +0100 834 835 mplayer (1:1.0-pre3-0.4) unstable; urgency=low 836 837 * Another try to fix the segfault :) 838 839 -- Christian Marillat <marillat@debian.org> Wed, 3 Mar 2004 16:22:29 +0100 840 841 mplayer (1:1.0-pre3-0.3) unstable; urgency=low 842 843 * Remove w32codecs-lite in suggests 844 * Applied patch from Guido Guenther for ppc packages. 845 * Seems to not crash anymore. I don't know whats wrong in -0.2 846 847 -- Christian Marillat <marillat@debian.org> Wed, 3 Mar 2004 14:41:16 +0100 848 849 mplayer (1:1.0-pre3-0.2) unstable; urgency=low 850 851 * Add mplayer-doc in suggest for all packages. 852 * Enable xanim support 853 * New package mplayer-nogui build without the GTK User Interface 854 * Make alsa9 the default -ao option 855 * Make xv the default -vo option for the nogui package 856 857 -- Christian Marillat <marillat@debian.org> Mon, 1 Mar 2004 11:51:04 +0100 858 859 mplayer (1:1.0-pre3-0.1) unstable; urgency=low 860 861 * Fix doc-base entry for the mplayer-doc package 862 * Use the news upstream tarball who fix compilation on ppc, sparc or m68k. 863 864 -- Christian Marillat <marillat@debian.org> Tue, 23 Dec 2003 19:09:53 +0100 865 866 mplayer (1:1.0-pre3-0.0) unstable; urgency=low 867 868 * New pre release. 869 * Build with aRts support now that the latest libarts doesn't depends on 870 Qt. 871 * Change command in menu files to work with wmaker, thanks to Philippe Monroux 872 * Don't build the i386 mencoder package. 873 * Install control file for mplayer-doc 874 * Doesn't use the included mpdvdkit2 but libdvdread and libdvdcss if 875 installed. 876 * Use /usr/lib/win32 instead of /usr/lib/RealPlayer8/Codecs for realplayer 877 codecs. 878 879 -- Christian Marillat <marillat@debian.org> Tue, 9 Dec 2003 10:10:43 +0100 880 881 mplayer (1:1.0-pre2-0.1) unstable; urgency=low 882 883 * Fix doc-base file to point to the new documentation location 884 * Add --enable-shared-pp for the custom target 885 886 -- Christian Marillat <marillat@debian.org> Tue, 14 Oct 2003 09:50:07 +0200 887 888 mplayer (1:1.0-pre2-0.0) unstable; urgency=low 889 890 * New upstream pre release. 891 892 -- Christian Marillat <marillat@debian.org> Wed, 8 Oct 2003 10:11:44 +0200 893 894 mplayer (1:1.0-pre1cvs20031005-0.3) unstable; urgency=low 895 896 * Add patch from Guido to enable flac and fadd 897 898 -- Christian Marillat <marillat@debian.org> Tue, 7 Oct 2003 16:08:48 +0200 899 900 mplayer (1:1.0-pre1cvs20031005-0.2) unstable; urgency=low 901 902 * Arf, build the 686 package without sse2. I should not follow what users 903 said. 904 905 -- Christian Marillat <marillat@debian.org> Mon, 6 Oct 2003 09:32:09 +0200 906 907 mplayer (1:1.0-pre1cvs20031005-0.1) unstable; urgency=low 908 909 * Build with --enable-external-flac 910 * Updated README.Debian with configure output 911 912 -- Christian Marillat <marillat@debian.org> Sun, 5 Oct 2003 21:45:50 +0200 913 914 mplayer (1:1.0-pre1cvs20031005-0.0) unstable; urgency=low 915 916 * New CVS release. 917 * Disable DVB support, Debian package is broken. 918 * Force sse2 for the 686 package, the configure script seems to be broken. 919 * Doesn't crash with rar file in 3.0 format. 920 * Merge more changes from Guido Guenther for ppc packages. 921 922 -- Christian Marillat <marillat@debian.org> Sun, 5 Oct 2003 21:11:52 +0200 923 924 mplayer (1:1.0-pre1cvs20031001-0.1) unstable; urgency=low 925 926 * Build with --enable-sse2 for i686 configure script seems to be broken. 927 928 -- Christian Marillat <marillat@debian.org> Sat, 4 Oct 2003 09:04:33 +0200 929 930 mplayer (1:1.0-pre1cvs20031001-0.0) unstable; urgency=low 931 932 * New CVS release, not sure if the security patch was applied in the 933 previous package. 934 * Build with --enable-externalfaad and with external libavcodec to reduce 935 package size. 936 o mplayer 386 binary size in previous package 5709736 937 o mplayer 386 binary size in that package 3722568 938 939 -- Christian Marillat <marillat@debian.org> Wed, 1 Oct 2003 19:16:33 +0200 940 941 mplayer (1:1.0-pre1cvs20030929-0.0) unstable; urgency=low 942 943 * CVS version who fix exploitable remote buffer overflow vulnerability. 944 945 -- Christian Marillat <marillat@debian.org> Mon, 29 Sep 2003 21:41:17 +0200 946 947 mplayer (1:1.0-pre1.2) unstable; urgency=low 948 949 * Applied patch from Guido Guenther to build powerpc and g4 packages. 950 Thanks. 951 * Added mplayer.keys and mplayer.applications files for gnome-vfs, these 952 files are used by GNOME apps, like nautilus. Should work (not tested). 953 Thanks to mammique 954 955 -- Christian Marillat <marillat@debian.org> Wed, 24 Sep 2003 19:20:48 +0200 956 957 mplayer (1:1.0-pre1.1) unstable; urgency=low 958 959 * debian/rules add --language=all for custom target. 960 961 -- Christian Marillat <marillat@debian.org> Thu, 4 Sep 2003 14:37:22 +0200 962 963 mplayer (1:1.0-pre1.0) unstable; urgency=low 964 965 * New upstream release. 966 * dvdnav has been disabled 967 * Build with matroska support 968 969 -- Christian Marillat <marillat@debian.org> Wed, 3 Sep 2003 07:10:18 +0200 970 971 mplayer (1:0.91-0.1) unstable; urgency=low 972 973 * Build with --enable-smb 974 * Add replaces for -k6 on -k7 packages 975 * Change Build-depends to libdvdnav-dev (<= 1.5) 976 977 -- Christian Marillat <marillat@debian.org> Tue, 26 Aug 2003 12:04:19 +0200 978 979 mplayer (1:0.91-0.0) unstable; urgency=low 980 981 * New upstream release. 982 * debian/control.* Add | w32codecs-lite in Suggests 983 * Add application/ogg in mime files 984 * Apparently the K6 package is more a K7 than a K6 package, then I've 985 changed the package name to K6. 986 987 -- Christian Marillat <marillat@debian.org> Thu, 14 Aug 2003 22:15:40 +0200 988 989 mplayer (1:0.90-0.8) unstable; urgency=low 990 991 * Fix typo in menu file (missing ") Thanks to Jonathon Sim. 992 993 -- Christian Marillat <marillat@debian.org> Thu, 7 Aug 2003 05:07:55 +0200 994 995 mplayer (1:0.90-0.7) unstable; urgency=low 996 997 * Build against libdvdread3-dev 998 999 -- Christian Marillat <marillat@debian.org> Wed, 6 Aug 2003 21:23:53 +0200 1000 1001 mplayer (1:0.90-0.6) unstable; urgency=low 1002 1003 * debian/control update libdvdnav-dev dependecies to -0.2 1004 1005 -- Christian Marillat <marillat@debian.org> Thu, 31 Jul 2003 13:06:51 +0200 1006 1007 mplayer (1:0.90-0.5) unstable; urgency=low 1008 1009 * Should Build-Depends on libdvdnav-dev 0.1.3-1.1 only. 1010 * debian/control Update w32codecs version to 0.91-1 and remove realplayer, 1011 xanim-modules and qt6codecs from suggests. 1012 1013 -- Christian Marillat <marillat@debian.org> Sat, 19 Jul 2003 15:55:40 +0200 1014 1015 mplayer (1:0.90-0.4) unstable; urgency=low 1016 1017 * debian/control* Replace xlibmesa-dev by the unstable -dev package 1018 * debian/rules typo (replace a mplayer-386 by a mplayer-custom) 1019 * Ooops, re-enable the png patch. 1020 1021 -- Christian Marillat <marillat@debian.org> Thu, 17 Jul 2003 10:34:05 +0200 1022 1023 mplayer (1:0.90-0.3) unstable; urgency=low 1024 1025 * Remove libdvdread2-dev from Build-Depends already provided by 1026 libdvdnav-dev 1027 * Make the icon background transparent 1028 * Add an icon for the Debian menu 1029 * debian/rules Fix typos s/sustom/custom/ and remove libpostproc in 1030 custom target. Thanks to Joel Kociolek. 1031 * Really add Debian menu icon for all packages. 1032 * Install symbolsg.fnt for the custom package. 1033 1034 -- Christian Marillat <marillat@debian.org> Thu, 10 Jul 2003 07:52:28 +0200 1035 1036 mplayer (1:0.90-0.2) unstable; urgency=low 1037 1038 * build against libpng10-dev 1039 * Build the 386 package with --enable-runtime-cpudetection. This is a 1040 preliminary test for the 1.0 version. I intent for 1.0 to release only 1041 one package with this option enabled. 1042 * Build against the latest libvorbis for sarge. 1043 * Build without nvidia-glx, this enable openGL support. 1044 1045 -- Christian Marillat <marillat@debian.org> Wed, 14 May 2003 10:37:21 +0200 1046 1047 mplayer (1:0.90-0.1) unstable; urgency=low 1048 1049 * Fix mplayer.png installation in custom target. 1050 1051 -- Christian Marillat <marillat@debian.org> Sat, 19 Apr 2003 21:03:48 +0200 1052 1053 mplayer (1:0.90-0.0) unstable; urgency=low 1054 1055 * New upstream release. 1056 1057 -- Christian Marillat <marillat@debian.org> Sun, 13 Apr 2003 11:58:41 +0200 1058 1059 mplayer (0.90rc5-0.1) unstable; urgency=low 1060 1061 * Doesn't build against libdirectfb, because this library depends on 1062 libpng3 and this break gtk pixmap themes who are compiled against 1063 libpng2. If you want the directfb support build your own package. 1064 * Install the new default skin 1065 1066 -- Christian Marillat <marillat@debian.org> Tue, 8 Apr 2003 12:44:30 +0200 1067 1068 mplayer (0.90rc5-0.0) unstable; urgency=low 1069 1070 * New 0.9 pre release. 1071 1072 -- Christian Marillat <marillat@debian.org> Tue, 18 Mar 2003 16:46:37 +0100 1073 1074 mplayer (0.90rc4-0.3) unstable; urgency=low 1075 1076 * Hack to add svgalib-dummyg1 dependency 1077 * Build against the latest libvorbis 1078 1079 -- Christian Marillat <marillat@debian.org> Sun, 16 Mar 2003 08:32:50 +0100 1080 1081 mplayer (0.90rc4-0.2) unstable; urgency=low 1082 1083 * Remove the libmagick-dev hack and add libimlib2-dev in Build-depends 1084 1085 -- Christian Marillat <marillat@debian.org> Thu, 20 Feb 2003 23:22:13 +0100 1086 1087 mplayer (0.90rc4-0.1) unstable; urgency=low 1088 1089 * Add libaudiofile-dev in Build-Depends. 1090 1091 -- Christian Marillat <marillat@debian.org> Wed, 12 Feb 2003 14:51:39 +0100 1092 1093 mplayer (0.90rc4-0.0) unstable; urgency=low 1094 1095 * New 0.9 pre release. 1096 1097 -- Christian Marillat <marillat@debian.org> Mon, 10 Feb 2003 15:29:54 +0100 1098 1099 mplayer (0.90rc3-0.0) unstable; urgency=low 1100 1101 * New 0.9 pre release. 1102 * Build with --enable-joystick 1103 * Added Danish comment in desktop file thanks to Morten Brix Pedersen 1104 * Add more cleanup for ppc build. Thanks to Nicolai Langfeldt and Yves Combe 1105 * Updated the default theme to 1.7 1106 1107 -- Christian Marillat <marillat@debian.org> Sun, 26 Jan 2003 10:55:16 +0100 1108 1109 mplayer (0.90rc2-0.2) unstable; urgency=low 1110 1111 * Add realplayer in suggests 1112 * Add mencvcd script in mplayer packages in example directory 1113 * Need to build-depends on gawk 1114 * Move configfiles in /etc/mplayer 1115 * Add desktop files for GNOME and KDE. 1116 * In /etc/mplayer/mplayer.conf the audio output default is now sdl, should 1117 work with GNOME and KDE environment. 1118 * Removed i386 options in the custom target 1119 * Rebuild with gcc 3.2 1120 1121 -- Christian Marillat <marillat@debian.org> Wed, 15 Jan 2003 01:24:55 +0100 1122 1123 mplayer (0.90rc2-0.1) unstable; urgency=low 1124 1125 * Only create /dev/dhahelper in non devfs system. 1126 * Don't build with --enable-linux-devfs 1127 1128 -- Christian Marillat <marillat@debian.org> Fri, 27 Dec 2002 13:54:27 +0100 1129 1130 mplayer (0.90rc2-0.0) unstable; urgency=low 1131 1132 * New 0.9 pre release. 1133 * Build with --enable-tv-v4l needed for woody packages (pbuilder don't 1134 create /dev/video). 1135 * Create /dev/dhahelper in postinst and remove /dev/dhahelper in postrm, 1136 (dhahelper is not yet finished). 1137 * Build against the latest liblive.com-dev 20021221 1138 * Create the v4l devices in postinst. 1139 * Removed the obsolete gui option in /etc/mplayer.conf 1140 * No new libpostproc0 package (no change in the code). 1141 1142 -- Christian Marillat <marillat@debian.org> Wed, 25 Dec 2002 22:36:14 +0100 1143 1144 mplayer (0.90rc1-0.3) unstable; urgency=low 1145 1146 * debian/control add libmagick5-dev | libmagick-dev and remove libpng-dev 1147 in Build-depends to be sure to always build the package with the right 1148 libpng (2) in woody. 1149 1150 -- Christian Marillat <marillat@debian.org> Tue, 17 Dec 2002 12:34:50 +0100 1151 1152 mplayer (0.90rc1-0.2) unstable; urgency=low 1153 1154 * Ooooops forgot to install the default /etc/menu.conf file 1155 1156 -- Christian Marillat <marillat@debian.org> Mon, 9 Dec 2002 18:02:11 +0100 1157 1158 mplayer (0.90rc1-0.1) unstable; urgency=low 1159 1160 * Comment gui=no, then both gmplayer and mplayer now works correctly. 1161 * Add qt6codecs in Suggests 1162 * Merged Nicolas Boos changes : 1163 * Replace libdv2-dev by libdv-dev in Build-depends 1164 * Remove libdirectfb8 | libdirectfb-0.9-13 from Build-depends 1165 * Added "--enable-win32 --with-win32libdir=/usr/bin/win32" to configure 1166 and remove w32codecs from Build-depends 1167 * Replace mplayer by gmplayer in mime types. This is better to stop 1168 mplayer if something is wrong. 1169 * Call gmplayer in menu files instead of mplayer. 1170 * Build with --enable-new-conf --enable-menu for OSD menu system 1171 * Remove --enable-streaming, enabled by default. 1172 1173 -- Christian Marillat <marillat@debian.org> Mon, 9 Dec 2002 16:23:10 +0100 1174 1175 mplayer (0.90rc1-0.0) unstable; urgency=low 1176 1177 * New 0.9 pre release. 1178 1179 -- Christian Marillat <marillat@debian.org> Sun, 8 Dec 2002 02:12:48 +0100 1180 1181 mplayer (0.90pre10-0.2) unstable; urgency=low 1182 1183 * Disable the gui in /etc/mplayer.conf 1184 1185 -- Christian Marillat <marillat@debian.org> Fri, 6 Dec 2002 14:23:30 +0100 1186 1187 mplayer (0.90pre10-0.1) unstable; urgency=low 1188 1189 * debian/rules Add realplayer and xanim paths for stable/testing build 1190 * Enable the Gui in /etc/mplayer.conf 1191 * Change the cache to 1 MB in /etc/mplayer.conf 1192 * Build with --enable-freetype and add (disabled) default in /etc/mplayer.conf 1193 * Add a mime file for mplayer packages. This work correctly with galeon but 1194 not with mozilla, because mozilla try to copy the file in /tmp instead 1195 of passing the full URL to mplayer. 1196 * Add a doc-base file for mplayer-doc. 1197 1198 -- Christian Marillat <marillat@debian.org> Tue, 3 Dec 2002 18:31:31 +0100 1199 1200 mplayer (0.90pre10-0.0) unstable; urgency=low 1201 1202 * New 0.9 pre release. 1203 1204 -- Christian Marillat <marillat@debian.org> Mon, 11 Nov 2002 15:15:51 +0100 1205 1206 mplayer (0.90pre9-0.1) unstable; urgency=low 1207 1208 * Disable mmx2 for k6 and 686 again. This is still broken. 1209 1210 -- Christian Marillat <marillat@debian.org> Thu, 31 Oct 2002 02:08:03 +0100 1211 1212 mplayer (0.90pre9-0.0) unstable; urgency=low 1213 1214 * New 0.9 pre release. 1215 * Build-depends on liblzo-dev 1216 * Remove libfame-dev from Build-depends 1217 * Enable mmx2 for k6 and 686 packages. 1218 * Need a more recent liblive.com-dev package. 1219 1220 -- Christian Marillat <marillat@debian.org> Sat, 26 Oct 2002 16:00:46 +0200 1221 1222 mplayer (0.90pre8-0.3) unstable; urgency=low 1223 1224 * debian/control Replace libdirectfb-0.9-12 by libdirectfb-0.9-13 1225 1226 -- Christian Marillat <marillat@debian.org> Thu, 10 Oct 2002 17:49:49 +0200 1227 1228 mplayer (0.90pre8-0.2) unstable; urgency=low 1229 1230 * Build against the latest libdirectfb-dev package 0.9.13-1 1231 1232 -- Christian Marillat <marillat@debian.org> Thu, 10 Oct 2002 16:56:08 +0200 1233 1234 mplayer (0.90pre8-0.1) unstable; urgency=low 1235 1236 * debian/control Remove libpng-dev and add libdirectfb10 | libdirectfb-0.9-12 1237 in build-depends 1238 * debian/control replace libdv-dev by libdv2-dev 1239 * Build-Conflicts with libarts. Can be installed with KDE3. 1240 1241 -- Christian Marillat <marillat@debian.org> Thu, 26 Sep 2002 18:23:05 +0200 1242 1243 mplayer (0.90pre8-0.0) unstable; urgency=low 1244 1245 * New 0.9 pre release. 1246 * debian/control replace divx-codecs by w32codecs 1247 1248 -- Christian Marillat <marillat@debian.org> Thu, 19 Sep 2002 20:21:12 +0200 1249 1250 mplayer (0.90pre7-0.1) unstable; urgency=low 1251 1252 * custom target is build with --enable-gui 1253 * Add libpng-dev in build-depends 1254 * Build with --enable-live for real video streaming. 1255 1256 -- Christian Marillat <marillat@debian.org> Sun, 15 Sep 2002 17:47:10 +0200 1257 1258 mplayer (0.90pre7-0.0) unstable; urgency=low 1259 1260 * New 0.9 pre release. 1261 * Remove em8300 build-conflicts, seems to doesn't work with some config. 1262 * The latest dvdnav works. 1263 * Update upstream home page. 1264 1265 -- Christian Marillat <marillat@debian.org> Thu, 5 Sep 2002 17:18:20 +0200 1266 1267 mplayer (0.90pre6-0.4) unstable; urgency=low 1268 1269 * Replace all libdvdcss* by libdvdcss on move to suggests. 1270 * Compiled against GL 1271 1272 -- Christian Marillat <marillat@debian.org> Tue, 20 Aug 2002 14:07:06 +0200 1273 1274 mplayer (0.90pre6-0.3) unstable; urgency=low 1275 1276 * Build the k6 package with --disable-mmx2 1277 * Remove xanim-modules build-dependdency 1278 1279 -- Christian Marillat <marillat@debian.org> Fri, 16 Aug 2002 17:11:39 +0200 1280 1281 mplayer (0.90pre6-0.2) unstable; urgency=low 1282 1283 * uudecode skin for the custom package. 1284 1285 -- Christian Marillat <marillat@debian.org> Sat, 10 Aug 2002 17:46:47 +0200 1286 1287 mplayer (0.90pre6-0.1) unstable; urgency=low 1288 1289 * Add libfame-dev in build-denpendcy 1290 * Update default skin to latest version. 1291 * Default codec is now 5 (libavcodec) in mplayer.conf 1292 * Add the libarts hack 1293 * Latest sid dvdnav 0.1.3 doesn't work with mplayer, then ndvdnav support 1294 is removed 1295 * Don't build cutom package for myself. 1296 * Update -doc description 1297 1298 -- Christian Marillat <marillat@debian.org> Thu, 8 Aug 2002 21:06:04 +0200 1299 1300 mplayer (0.90pre6-0.0) unstable; urgency=low 1301 1302 * New 0.9 pre release. 1303 * Add libdvdcss2 in recommends. 1304 * Use libxvidencore0 instead of libdivxencore0/libdivxdecore0 1305 1306 -- Christian Marillat <marillat@debian.org> Tue, 6 Aug 2002 15:44:43 +0200 1307 1308 mplayer (0.90pre5-0.7) unstable; urgency=low 1309 1310 * Add a lot of missing build-dependencies. 1311 1312 -- Christian Marillat <marillat@debian.org> Fri, 2 Aug 2002 21:48:38 +0200 1313 1314 mplayer (0.90pre5-0.6) unstable; urgency=low 1315 1316 * Remove em8300 in Build-Conflicts 1317 1318 -- Christian Marillat <marillat@debian.org> Mon, 22 Jul 2002 11:23:10 +0200 1319 1320 mplayer (0.90pre5-0.5) unstable; urgency=low 1321 1322 * debian/rules Fix typos Thanks to Gregor Hoffleit 1323 1324 -- Christian Marillat <marillat@debian.org> Thu, 11 Jul 2002 17:03:10 +0200 1325 1326 mplayer (0.90pre5-0.4) unstable; urgency=low 1327 1328 * Build the 686 package with --disable-mmx2 1329 * Build statically against libavcodec. 1330 1331 -- Christian Marillat <marillat@debian.org> Wed, 10 Jul 2002 07:14:50 +0200 1332 1333 mplayer (0.90pre5-0.3) unstable; urgency=low 1334 1335 * debian/rules fix broken dh_shlibdeps call. 1336 1337 -- Christian Marillat <marillat@debian.org> Sun, 7 Jul 2002 18:36:07 +0200 1338 1339 mplayer (0.90pre5-0.2) unstable; urgency=low 1340 1341 * Added libarts1 dependency (Big hack) 1342 1343 -- Christian Marillat <marillat@debian.org> Sun, 7 Jul 2002 17:44:49 +0200 1344 1345 mplayer (0.90pre5-0.1) unstable; urgency=low 1346 1347 * Build with libdvdnav 1348 * Build mencoder packages. 1349 * Default video output is x11, otherwise the gui doesn't work. 1350 1351 -- Christian Marillat <marillat@debian.org> Sat, 6 Jul 2002 15:59:24 +0200 1352 1353 mplayer (0.90pre5-0.0) unstable; urgency=low 1354 1355 * New 0.9 pre release. 1356 * Build with --enable-xinerama 1357 1358 -- Christian Marillat <marillat@debian.org> Sat, 8 Jun 2002 12:09:37 +0200 1359 1360 mplayer (0.90pre4-0.0) unstable; urgency=low 1361 1362 * New 0.9 pre release. 1363 1364 -- Christian Marillat <marillat@debian.org> Sat, 18 May 2002 18:49:16 +0200 1365 1366 mplayer (0.90pre3-0.0) unstable; urgency=low 1367 1368 * New 0.9 pre release. 1369 1370 -- Christian Marillat <marillat@debian.org> Sat, 4 May 2002 11:02:50 +0200 1371 1372 mplayer (0.90pre2-0.4) unstable; urgency=low 1373 1374 * Shit s/alsa-headers/alsa-headers-0.5/ 1375 1376 -- Christian Marillat <marillat@debian.org> Fri, 3 May 2002 01:27:56 +0200 1377 1378 mplayer (0.90pre2-0.3) unstable; urgency=low 1379 1380 * debian/control.marillat remove some build-dependencies libsdl1.1-dev alsa-headers-0.5 1381 1382 -- Christian Marillat <marillat@debian.org> Fri, 3 May 2002 01:20:41 +0200 1383 1384 mplayer (0.90pre2-0.2) unstable; urgency=low 1385 1386 * Correct manpage path. 1387 1388 -- Christian Marillat <marillat@debian.org> Thu, 2 May 2002 22:26:25 +0200 1389 1390 mplayer (0.90pre2-0.1) unstable; urgency=low 1391 1392 * New 0.9 pre release. 1393 1394 -- Christian Marillat <marillat@debian.org> Wed, 1 May 2002 15:29:01 +0200 1395 1396 mplayer (0.90pre1-0.2) unstable; urgency=low 1397 1398 * Remove some build-dependencies libsdl1.1-dev alsa-headers-0.5 1399 1400 -- Christian Marillat <marillat@debian.org> Wed, 1 May 2002 15:05:46 +0200 1401 1402 mplayer (0.90pre1-0.1) unstable; urgency=low 1403 1404 * News upstream release. 1405 * Added support for dxr3. 1406 1407 -- Christian Marillat <marillat@debian.org> Tue, 23 Apr 2002 11:46:33 +0200 1408 1409 mplayer (0.60-cvs20020420-1) unstable; urgency=low 1410 1411 * New cvs release. 1412 1413 -- Christian Marillat <marillat@debian.org> Fri, 19 Apr 2002 22:58:13 +0200 1414 1415 mplayer (0.60-10) unstable; urgency=low 1416 1417 * Build without directfb support. This doesn't work with 0.9.9 1418 1419 -- Christian Marillat <marillat@debian.org> Mon, 25 Mar 2002 16:49:46 +0100 1420 1421 mplayer (0.60-9) unstable; urgency=low 1422 1423 * Only sources changes. 1424 Inverted libsdl1.1-dev | libsdl1.2-dev 1425 Add 2 control files, for beter user build. 1426 * Did some changes in /etc/mplayer.conf: 1427 Add 8 MB for disk cache. 1428 Commented out autoq=63 1429 Use opendivx codec by default (vfm 3) 1430 * Remove unused /usr/share/mplayer/codecs.conf 1431 * Remove unused directory /usr/share/mplayer/font 1432 1433 -- Christian Marillat <marillat@debian.org> Fri, 22 Feb 2002 15:57:32 +0100 1434 1435 mplayer (0.60-8) unstable; urgency=low 1436 1437 * Added divx-codecs and xanim-modules in Build-depends. 1438 * debian:rules Reverted my hack, in -7, when removing empty packages. 1439 1440 -- Christian Marillat <marillat@debian.org> Tue, 12 Feb 2002 11:22:15 +0100 1441 1442 mplayer (0.60-7) unstable; urgency=low 1443 1444 * Rebuild against the latest libdirectfb8 package. 1445 1446 -- Christian Marillat <marillat@debian.org> Sun, 10 Feb 2002 16:03:04 +0100 1447 1448 mplayer (0.60-6) unstable; urgency=low 1449 1450 * debian/rules Build only the custom target if you'are not me :-) 1451 1452 -- Christian Marillat <marillat@debian.org> Sun, 3 Feb 2002 18:39:20 +0100 1453 1454 mplayer (0.60-5) unstable; urgency=low 1455 1456 * Add a new target mplayer-custom. This target is only for your computer. 1457 If you want more or less option edit debian/rules. 1458 1459 -- Christian Marillat <marillat@debian.org> Wed, 30 Jan 2002 16:46:15 +0100 1460 1461 mplayer (0.60-4) unstable; urgency=low 1462 1463 * Move libdvdcss0 on Recommends: and remove libdvdcss1 from Depends 1464 1465 -- Christian Marillat <marillat@debian.org> Mon, 28 Jan 2002 14:01:42 +0100 1466 1467 mplayer (0.60-3) unstable; urgency=low 1468 1469 * Move all documenattions in -doc package 1470 1471 -- Christian Marillat <marillat@debian.org> Tue, 22 Jan 2002 13:52:47 +0100 1472 1473 mplayer (0.60-2) unstable; urgency=low 1474 1475 * Compiled against the latest directfb0 1476 1477 -- Christian Marillat <marillat@debian.org> Mon, 21 Jan 2002 18:12:08 +0100 1478 1479 mplayer (0.60-1) unstable; urgency=low 1480 1481 * New upstream release. 1482 * Build with --enable-directfb 1483 1484 -- Christian Marillat <marillat@debian.org> Thu, 3 Jan 2002 17:03:52 +0100 1485 1486 mplayer (0.50-cvs20011220-1) unstable; urgency=low 1487 1488 * New cvs release who fix a md5sum problem. 1489 1490 -- Christian Marillat <marillat@debian.org> Fri, 21 Dec 2001 00:58:14 +0100 1491 1492 mplayer (0.50-cvs20011219-1) unstable; urgency=low 1493 1494 * New cvs release. 1495 * Build-depends on sharutils 1496 1497 -- Christian Marillat <marillat@debian.org> Tue, 18 Dec 2001 16:06:12 +0100 1498 1499 mplayer (0.50-cvs20011206-1) unstable; urgency=low 1500 1501 * New cvs release. 1502 * Build with --enable-3dfx --enable-tdfxfb --enable-directfb 1503 * Install english documentation in all pacakes. 1504 * More generic hack to change cpu optimization 1505 1506 -- Christian Marillat <marillat@debian.org> Thu, 6 Dec 2001 16:45:40 +0100 1507 1508 mplayer (0.50-cvs20011114-1) unstable; urgency=low 1509 1510 * New cvs release. 1511 * Support for morgan mjpeg 1512 1513 -- Christian Marillat <marillat@debian.org> Wed, 14 Nov 2001 10:56:23 +0100 1514 1515 mplayer (0.50-cvs20011110-1) unstable; urgency=low 1516 1517 * New cvs release. 1518 1519 -- Christian Marillat <marillat@debian.org> Sat, 10 Nov 2001 14:50:48 +0100 1520 1521 mplayer (0.50-cvs20011107-1) unstable; urgency=low 1522 1523 * New cvs release. 1524 * very nice, New option -cache <n> 1525 * Build with --enable-largefiles 1526 * Build with mad support (MPEG audio decoder library) 1527 * Build against libffmpeg0 1528 1529 -- Christian Marillat <marillat@debian.org> Wed, 7 Nov 2001 15:49:48 +0100 1530 1531 mplayer (0.50-cvs20011019-1) unstable; urgency=low 1532 1533 * New cvs release. 1534 * New French doc. 1535 * Recompiled against the new libsdl1.2debian 1536 1537 -- Christian Marillat <marillat@debian.org> Fri, 19 Oct 2001 14:32:15 +0200 1538 1539 mplayer (0.50-1) unstable; urgency=low 1540 1541 * New upstream release. 1542 * Enable streaming 1543 1544 -- Christian Marillat <marillat@debian.org> Mon, 8 Oct 2001 18:23:54 +0200 1545 1546 mplayer (0.18-cvs20010911-1) unstable; urgency=low 1547 1548 * New cvs release. 1549 * First attempt with gui interface. The binary is called gmplayer (Not very 1550 usable at all, but ...) The CLI is still here. 1551 * DVD support with liblibdvdread added since the latest release. 1552 * Add Debian menu 1553 * In /etc/mplayer.conf : 1554 Use sdl:x11 for video driver 1555 Use double-buffering 1556 Use opendivx by default (More fast) 1557 1558 -- Christian Marillat <marillat@debian.org> Tue, 11 Sep 2001 14:26:26 +0200 1559 1560 mplayer (0.18-cvs20010812-3) unstable; urgency=low 1561 1562 * Add 3 new packages mplayer-386, mplayer-686, mplayer-k6 1563 * Move documentation in mplayer-doc 1564 1565 -- Christian Marillat <marillat@debian.org> Sat, 25 Aug 2001 15:15:15 +0200 1566 1567 mplayer (0.18-cvs20010812-2) unstable; urgency=low 1568 1569 * Build with lirc support 1570 * Build with ffmpeg support 1571 1572 -- Christian Marillat <marillat@debian.org> Thu, 16 Aug 2001 15:06:22 +0200 1573 1574 mplayer (0.18-cvs20010812-1) unstable; urgency=low 1575 1576 * New cvs release. 1577 * Compiled with opendivx. 1578 * Updated /etc/mplayer.conf 1579 1580 -- Christian Marillat <marillat@debian.org> Sun, 12 Aug 2001 18:30:28 +0200 1581 1582 mplayer (0.18-cvs20010722-1) unstable; urgency=low 1583 1584 * cvs realease. 1585 * Really compiled with libcss 1586 * Compiled with --enable-fbdev 1587 * setgid fibmap_mplayer 1588 1589 -- Christian Marillat <marillat@debian.org> Sun, 22 Jul 2001 11:31:49 +0200 1590 1591 mplayer (0.18-0.1) unstable; urgency=low 1592 1593 * Don't compress codecs.conf 1594 * Change all doc paths (replace DOCS by /usr/share/doc/mplayer) 1595 * Build with libcss 1596 * Build with --enable-xmga 1597 1598 -- Christian Marillat <marillat@debian.org> Fri, 6 Jul 2001 20:45:26 +0200 1599 1600 mplayer (0.18-0.0) unstable; urgency=low 1601 1602 * News upstream release. 1603 1604 -- Christian Marillat <marillat@debian.org> Fri, 6 Jul 2001 14:24:19 +0200 1605 1606 mplayer (0.17a-0.0) unstable; urgency=low 1607 1608 * Real upstream version number. 1609 1610 -- Christian Marillat <marillat.christian@wanadoo.fr> Wed, 23 May 2001 01:24:44 +0200 1611 1612 mplayer (0.17-0.0) unstable; urgency=low 1613 1614 * new upstream release. 1615 1616 -- Christian Marillat <marillat.christian@wanadoo.fr> Sat, 28 Apr 2001 16:55:23 +0200 1617 1618 mplayer (0.11-1) unstable; urgency=low 1619 1620 * Initial release. 1621 1622 -- Christian Marillat <marillat.christian@wanadoo.fr> Mon, 26 Feb 2001 12:24:04 +0100 -
mplayer-1.0.rc2svn20071207
old new 1 #!/usr/bin/make -f 2 3 #export DH_VERBOSE=1 4 5 include /usr/share/dpatch/dpatch.make 6 7 NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) 8 9 ifeq ($(NCPUS),-1) 10 NCPUS:=1 11 endif 12 13 ifeq ($(NCPUS),0) 14 NCPUS:=1 15 endif 16 17 CC:=ccache $(CC) 18 CXX:=ccache $(CXX) 19 20 REVISION=25315 21 22 DEBIAN_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) 23 24 ifeq "$(DEB_BUILD_OPTIONS)" "marillat" 25 CONTROL=control.marillat 26 else 27 ifeq "$(DEBIAN_ARCH)" "i386" 28 CONTROL=control.others 29 FLAVOURS=-custom 30 else 31 ifeq "$(DEBIAN_ARCH)" "powerpc" 32 CONTROL=control.powerpc 33 FLAVOURS=-g4 34 else 35 ifeq "$(DEBIAN_ARCH)" "amd64" 36 CONTROL=control.amd64 37 endif 38 ifeq "$(DEBIAN_ARCH)" "sparc" 39 CONTROL=control.sparc 40 else 41 ifeq "$(DEBIAN_ARCH)" "ia64" 42 CONTROL=control.ia64 43 FLAVOURS=-itanium2 44 else 45 ifeq "$(DEBIAN_ARCH)" "hppa" 46 CONTROL=control.hppa 47 else 48 ifeq "$(DEBIAN_ARCH)" "alpha" 49 CONTROL=control.alpha 50 endif 51 ifeq "$(DEBIAN_ARCH)" "ppc64" 52 CONTROL=control.ppc64 53 endif 54 endif 55 endif 56 endif 57 endif 58 endif 59 endif 60 61 # Split up config options 62 CONFIG_DIRS=--prefix=/usr --confdir=/etc/mplayer --datadir=/usr/share/mplayer 63 CONFIG_MGA=--enable-xmga --enable-mga 64 CONFIG_3DFX=--enable-tdfxfb --enable-s3fb 65 CONFIG_FB=--enable-fbdev --enable-directfb 66 CONFIG_CONTROL=--enable-joystick 67 CONFIG_AUDIO=--enable-faad-external --disable-tremor-internal \ 68 --enable-libamr_nb --enable-libamr_wb --enable-pulse 69 CONFIG_MISC=--language=all --enable-largefiles --enable-menu \ 70 --with-extraincdir="/usr/include/ffmpeg -I./libavformat -I./libswscale -I./libavutil -I./libpostproc -I./libavcodec" --enable-radio \ 71 --disable-libdvdcss-internal --enable-lirc --enable-radio-capture --enable-png 72 73 CONFIG_XVMC=--enable-xvmc --with-xvmclib=XvMCW 74 CONFIG_WIN32=--enable-win32dll 75 76 # Options common to all architectures 77 CONFIG_ARCH_INDEP=$(CONFIG_DIRS) $(CONFIG_MGA) $(CONFIG_CONTROL) \ 78 $(CONFIG_AUDIO) $(CONFIG_MISC) $(CONFIG_XVMC) $(CONFIG_FB) 79 80 # Options common to all amd64 configurations 81 CONFIG_AMD64_ALL=$(CONFIG_ARCH_INDEP) $(CONFIG_3DFX) 82 83 # $(CONFIG_LIBAVCODEC_EXTERNAL) 84 85 # Options comon to all i386 configurations 86 CONFIG_I386_ALL=$(CONFIG_ARCH_INDEP) $(CONFIG_WIN32) $(CONFIG_3DFX) \ 87 --realcodecsdir=/usr/lib/codecs --xanimcodecsdir=/usr/lib/codecs 88 89 # $(CONFIG_LIBAVCODEC_EXTERNAL) 90 91 # Options common to all ia64 configurations 92 CONFIG_IA64_ALL=$(CONFIG_ARCH_INDEP) --disable-win32dll $(CONFIG_3DFX) --enable-gui 93 94 # $(CONFIG_LIBAVCODEC_EXTERNAL) 95 96 # Options common to all alpha configurations 97 CONFIG_ALPHA_ALL=$(CONFIG_ARCH_INDEP) --disable-win32dll $(CONFIG_3DFX) 98 99 # $(CONFIG_LIBAVCODEC_EXTERNAL) 100 101 # Options common to all sparc configurations 102 CONFIG_SPARC_ALL=$(CONFIG_ARCH_INDEP) 103 104 # $(CONFIG_LIBAVCODEC_EXTERNAL) 105 106 # Options common to all hppa configurations 107 CONFIG_HPPA_ALL=$(CONFIG_ARCH_INDEP) --disable-win32dll 108 109 # $(CONFIG_LIBAVCODEC_EXTERNAL) 110 111 # Options common to all powerpc configurations 112 CONFIG_PPC_ALL=$(CONFIG_ARCH_INDEP) --enable-gui --disable-win32dll \ 113 --realcodecsdir=/usr/local/lib/codecs --disable-vidix-internal --disable-vidix-external 114 115 # Options common to all ppc64 configurations 116 CONFIG_PPC64_ALL=$(CONFIG_ARCH_INDEP) --enable-gui --disable-win32dll \ 117 --realcodecsdir=/usr/local/lib/codecs --disable-vidix-internal --disable-vidix-external 118 119 CONFIGURE_MPLAYER=$(CONFIG_I386_ALL) --enable-runtime-cpudetection --enable-gui --disable-mencoder 120 CONFIGURE_NOGUI=$(CONFIG_I386_ALL) --enable-runtime-cpudetection 121 122 CONFIGURE_PPC=$(CONFIG_PPC_ALL) --disable-altivec 123 124 CONFIGURE_G4=$(CONFIG_PPC_ALL) --enable-altivec 125 126 CONFIGURE_AMD64=$(CONFIG_AMD64_ALL) --enable-runtime-cpudetection --enable-gui --disable-mencoder 127 CONFIGURE_AMD64_NOGUI=$(CONFIG_AMD64_ALL) --enable-runtime-cpudetection 128 129 CONFIGURE_SPARC=$(CONFIG_SPARC_ALL) --enable-gui --disable-mencoder 130 CONFIGURE_SPARC_NOGUI=$(CONFIG_SPARC_ALL) 131 132 CONFIGURE_IA64_1=$(CONFIG_IA64_ALL) 133 CONFIGURE_IA64_2=$(CONFIG_IA64_ALL) 134 135 CONFIGURE_ALPHA=$(CONFIG_ALPHA_ALL) --enable-gui --disable-mencoder 136 CONFIGURE_ALPHA_NOGUI=$(CONFIG_ALPHA_ALL) 137 138 CONFIGURE_HPPA=$(CONFIG_HPPA_ALL) --enable-gui --disable-mencoder 139 CONFIGURE_HPPA_NOGUI=$(CONFIG_HPPA_ALL) 140 141 CONFIGURE_PPC64=$(CONFIG_PPC64_ALL) --enable-gui --disable-mencoder 142 CONFIGURE_PPC64_NOGUI=$(CONFIG_PPC64_ALL) 143 144 CONFIGURE_CUSTOM=$(CONFIG_I386_ALL) 145 146 configure: configure-stamp 147 configure-stamp: patch-stamp 148 dh_testdir 149 # dh_testroot 150 151 cp debian/$(CONTROL) debian/control 152 153 dh_installdirs -a -A etc/mplayer usr/share/man/man1 \ 154 usr/bin usr/share/applications usr/share/pixmaps \ 155 usr/share/man/cs/man1 usr/share/man/de/man1 usr/share/man/es/man1 \ 156 usr/share/man/fr/man1 usr/share/man/hu/man1 usr/share/man/it/man1 \ 157 usr/share/man/pl/man1 usr/share/man/ru/man1 usr/share/mime-info \ 158 usr/share/application-registry usr/share/icons/hicolor/32x32/apps \ 159 usr/share/icons/hicolor/48x48/apps 160 161 # Copy files 162 for arch in $(FLAVOURS); do \ 163 cp debian/mime debian/mplayer$$arch.mime; \ 164 cp debian/postinst debian/mplayer$$arch.postinst; \ 165 cp debian/preinst debian/mplayer$$arch.preinst; \ 166 cp debian/postrm debian/mplayer$$arch.postrm; \ 167 cp debian/links debian/mplayer$$arch.links; \ 168 cp debian/examples debian/mplayer$$arch.examples; \ 169 done 170 171 ifeq "$(DEB_BUILD_OPTIONS)" "marillat" 172 ifeq "$(DEBIAN_ARCH)" "i386" 173 ############################## nogui ############################# 174 175 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_NOGUI) 176 177 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 178 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315 (C) 2000-2007 MPlayer Team\"" >> version.h 179 180 # exit 1 181 182 $(MAKE) 183 184 # -j $(NCPUS) 185 186 $(MAKE) install prefix=$(CURDIR)/debian/mplayer-nogui/usr \ 187 CONFDIR=$(CURDIR)/debian/mplayer-nogui/etc/mplayer \ 188 DATADIR=$(CURDIR)/debian/mplayer-nogui/usr/share/mplayer \ 189 LIBDIR=$(CURDIR)/debian/mplayer-nogui/usr/lib \ 190 MANDIR=$(CURDIR)/debian/mplayer-nogui/usr/share/man \ 191 BINDIR=$(CURDIR)/debian/mplayer-nogui/usr/bin 192 193 cp debian/mime-nogui debian/mplayer-nogui.mime 194 cp etc/example.conf debian/mplayer-nogui/etc/mplayer/mplayer.conf 195 cp etc/input.conf debian/mplayer-nogui/etc/mplayer 196 cp etc/menu.conf debian/mplayer-nogui/etc/mplayer 197 cp debian/mplayer-nogui.applications debian/mplayer-nogui/usr/share/application-registry/mplayer.applications 198 cp debian/mplayer.keys debian/mplayer-nogui/usr/share/mime-info 199 200 # Mencoder 201 mv debian/mplayer-nogui/usr/bin/mencoder debian/mencoder/usr/bin 202 cp debian/mplayer-nogui/usr/share/man/man1/mplayer.1 debian/mencoder/usr/share/man/man1/mencoder.1 203 204 # This suck 205 @for page in cs de es fr hu it pl ru; do \ 206 cp debian/mplayer-nogui/usr/share/man/$$page/man1/mplayer.1 \ 207 debian/mencoder/usr/share/man/$$page/man1/mencoder.1; \ 208 done 209 210 [ ! -f Makefile ] || $(MAKE) distclean 211 212 ############################ mplayer ############################### 213 214 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_MPLAYER) 215 216 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 217 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 218 219 $(MAKE) 220 221 # -j $(NCPUS) 222 223 $(MAKE) install prefix=$(CURDIR)/debian/mplayer/usr \ 224 CONFDIR=$(CURDIR)/debian/mplayer/etc/mplayer \ 225 DATADIR=$(CURDIR)/debian/mplayer/usr/share/mplayer \ 226 LIBDIR=$(CURDIR)/debian/mplayer/usr/lib \ 227 MANDIR=$(CURDIR)/debian/mplayer/usr/share/man \ 228 BINDIR=$(CURDIR)/debian/mplayer/usr/bin 229 230 cp etc/example.conf debian/mplayer/etc/mplayer/mplayer.conf 231 cp etc/input.conf debian/mplayer/etc/mplayer 232 cp etc/menu.conf debian/mplayer/etc/mplayer 233 cp debian/mplayer.applications debian/mplayer/usr/share/application-registry 234 cp debian/mplayer.keys debian/mplayer/usr/share/mime-info 235 cp debian/gmplayer.keys debian/mplayer/usr/share/mime-info 236 237 [ ! -f Makefile ] || $(MAKE) distclean 238 239 #; $(MAKE) distclean -C gui 240 241 endif # i386 242 endif # marillat 243 244 ifneq "$(DEB_BUILD_OPTIONS)" "marillat" 245 ifeq "$(DEBIAN_ARCH)" "powerpc" 246 ########################## generic powerpc ####################### 247 248 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_PPC) 249 250 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 251 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 252 253 perl -i -pe 's,-mtune=(\w+),-mtune=powerpc,' config.mak 254 perl -i -pe 's,-mcpu=(\w+),-mcpu=powerpc,' config.mak 255 perl -i -pe 's,-maltivec,-mno-altivec,' config.mak 256 perl -i -pe 's,-mabi=altivec,-mabi=no-altivec,' config.mak 257 258 perl -i -pe 's,#define HAVE_ALTIVEC 1,#undef HAVE_ALTIVEC,' config.h 259 perl -i -pe 's,#define HAVE_ALTIVEC_H 1,#undef HAVE_ALTIVEC_H,' config.h 260 perl -i -pe 's,HAVE_ALTIVEC = yes,HAVE_ALTIVEC = no,' config.mak 261 262 $(MAKE) -j $(NCPUS) 263 264 $(MAKE) install prefix=$(CURDIR)/debian/mplayer/usr \ 265 CONFDIR=$(CURDIR)/debian/mplayer/etc/mplayer \ 266 DATADIR=$(CURDIR)/debian/mplayer/usr/share/mplayer \ 267 LIBDIR=$(CURDIR)/debian/mplayer/usr/lib \ 268 MANDIR=$(CURDIR)/debian/mplayer/usr/share/man \ 269 BINDIR=$(CURDIR)/debian/mplayer/usr/bin 270 271 cp etc/example.conf debian/mplayer/etc/mplayer/mplayer.conf 272 cp etc/input.conf debian/mplayer/etc/mplayer 273 cp etc/menu.conf debian/mplayer/etc/mplayer 274 cp debian/mplayer.applications debian/mplayer/usr/share/application-registry 275 cp debian/mplayer.keys debian/mplayer/usr/share/mime-info 276 cp debian/gmplayer.keys debian/mplayer/usr/share/mime-info 277 278 # This suck 279 @for page in cs de es fr hu it pl ru; do \ 280 cp debian/mplayer/usr/share/man/$$page/man1/mplayer.1 \ 281 debian/mencoder/usr/share/man/$$page/man1/mencoder.1; \ 282 done 283 cp debian/mplayer/usr/share/man/man1/mplayer.1 debian/mencoder/usr/share/man/man1/mencoder.1 284 mv debian/mplayer/usr/bin/mencoder debian/mencoder/usr/bin 285 286 [ ! -f Makefile ] || $(MAKE) distclean 287 288 ######################## powerpc with altivec #################### 289 290 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_G4) 291 292 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 293 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 294 295 perl -i -pe 's,-mtune=(\w+),-mtune=7450,' config.mak 296 perl -i -pe 's,-mcpu=(\w+),-mcpu=7450,' config.mak 297 298 $(MAKE) -j $(NCPUS) 299 300 $(MAKE) install prefix=$(CURDIR)/debian/mplayer-g4/usr \ 301 CONFDIR=$(CURDIR)/debian/mplayer-g4/etc/mplayer \ 302 DATADIR=$(CURDIR)/debian/mplayer-g4/usr/share/mplayer \ 303 LIBDIR=$(CURDIR)/debian/mplayer-g4/usr/lib \ 304 MANDIR=$(CURDIR)/debian/mplayer-g4/usr/share/man \ 305 BINDIR=$(CURDIR)/debian/mplayer-g4/usr/bin 306 307 cp etc/example.conf debian/mplayer-g4/etc/mplayer/mplayer.conf 308 cp etc/input.conf debian/mplayer-g4/etc/mplayer 309 cp etc/menu.conf debian/mplayer-g4/etc/mplayer 310 cp debian/mplayer.applications debian/mplayer-g4/usr/share/application-registry 311 cp debian/mplayer.keys debian/mplayer-g4/usr/share/mime-info 312 cp debian/gmplayer.keys debian/mplayer-g4/usr/share/mime-info 313 cp etc/menu.conf debian/mplayer-g4/etc/mplayer 314 315 # Mencoder 316 cp debian/mplayer-g4/usr/share/man/man1/mplayer.1 debian/mencoder-g4/usr/share/man/man1/mencoder.1 317 rm debian/mplayer-g4/usr/share/man/man1/mencoder.1 318 mv debian/mplayer-g4/usr/bin/mencoder debian/mencoder-g4/usr/bin 319 320 [ ! -f Makefile ] || $(MAKE) distclean 321 322 #; $(MAKE) distclean -C gui 323 324 else # powerpc 325 ifeq "$(DEBIAN_ARCH)" "ppc64" 326 ########################## ppc64 nogui ####################### 327 328 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_PPC64_NOGUI) 329 330 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 331 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 332 333 perl -i -pe 's,-mtune=(\w+),-mtune=G5,' config.mak 334 perl -i -pe 's,-mcpu=(\w+),-mcpu=G5 -falign-loops=16,' config.mak 335 336 $(MAKE) -j $(NCPUS) 337 338 $(MAKE) install prefix=$(CURDIR)/debian/mplayer-nogui/usr \ 339 CONFDIR=$(CURDIR)/debian/mplayer-nogui/etc/mplayer \ 340 DATADIR=$(CURDIR)/debian/mplayer-nogui/usr/share/mplayer \ 341 LIBDIR=$(CURDIR)/debian/mplayer-nogui/usr/lib \ 342 MANDIR=$(CURDIR)/debian/mplayer-nogui/usr/share/man \ 343 BINDIR=$(CURDIR)/debian/mplayer-nogui/usr/bin 344 345 cp debian/mime-nogui debian/mplayer-nogui.mime 346 cp etc/example.conf debian/mplayer-nogui/etc/mplayer/mplayer.conf 347 cp etc/input.conf debian/mplayer-nogui/etc/mplayer 348 cp etc/menu.conf debian/mplayer-nogui/etc/mplayer 349 cp debian/mplayer-nogui.applications debian/mplayer-nogui/usr/share/application-registry/mplayer.applications 350 cp debian/mplayer.keys debian/mplayer-nogui/usr/share/mime-info 351 352 # Mencoder 353 cp debian/mplayer-nogui/usr/share/man/man1/mplayer.1 debian/mencoder/usr/share/man/man1/mencoder.1 354 mv debian/mplayer-nogui/usr/bin/mencoder debian/mencoder/usr/bin 355 356 [ ! -f Makefile ] || $(MAKE) distclean 357 358 ############################ ppc64 ############################### 359 360 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_PPC64) 361 362 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 363 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 364 365 perl -i -pe 's,-mtune=(\w+),-mtune=G5,' config.mak 366 perl -i -pe 's,-mcpu=(\w+),-mcpu=G5 -falign-loops=16,' config.mak 367 368 $(MAKE) -j $(NCPUS) 369 370 $(MAKE) install prefix=$(CURDIR)/debian/mplayer/usr \ 371 CONFDIR=$(CURDIR)/debian/mplayer/etc/mplayer \ 372 DATADIR=$(CURDIR)/debian/mplayer/usr/share/mplayer \ 373 LIBDIR=$(CURDIR)/debian/mplayer/usr/lib \ 374 MANDIR=$(CURDIR)/debian/mplayer/usr/share/man \ 375 BINDIR=$(CURDIR)/debian/mplayer/usr/bin 376 377 cp etc/example.conf debian/mplayer/etc/mplayer/mplayer.conf 378 cp etc/input.conf debian/mplayer/etc/mplayer 379 cp etc/menu.conf debian/mplayer/etc/mplayer 380 cp debian/mplayer.applications debian/mplayer/usr/share/application-registry 381 cp debian/mplayer.keys debian/mplayer/usr/share/mime-info 382 cp debian/gmplayer.keys debian/mplayer/usr/share/mime-info 383 384 # This suck 385 @for page in cs de es fr hu it pl ru; do \ 386 cp debian/mplayer/usr/share/man/$$page/man1/mplayer.1 \ 387 debian/mencoder/usr/share/man/$$page/man1/mencoder.1; \ 388 done 389 390 [ ! -f Makefile ] || $(MAKE) distclean 391 392 #; $(MAKE) distclean -C gui 393 394 else # ppc64 395 ifeq "$(DEBIAN_ARCH)" "amd64" 396 ######################### amd64 nogui ############################ 397 398 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_AMD64_NOGUI) 399 400 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 401 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 402 403 # exit 1 404 405 $(MAKE) 406 407 # -j $(NCPUS) 408 409 $(MAKE) install prefix=$(CURDIR)/debian/mplayer-nogui/usr \ 410 CONFDIR=$(CURDIR)/debian/mplayer-nogui/etc/mplayer \ 411 DATADIR=$(CURDIR)/debian/mplayer-nogui/usr/share/mplayer \ 412 LIBDIR=$(CURDIR)/debian/mplayer-nogui/usr/lib \ 413 MANDIR=$(CURDIR)/debian/mplayer-nogui/usr/share/man \ 414 BINDIR=$(CURDIR)/debian/mplayer-nogui/usr/bin 415 416 cp debian/mime-nogui debian/mplayer-nogui.mime 417 cp etc/example.conf debian/mplayer-nogui/etc/mplayer/mplayer.conf 418 cp etc/input.conf debian/mplayer-nogui/etc/mplayer 419 cp etc/menu.conf debian/mplayer-nogui/etc/mplayer 420 cp debian/mplayer-nogui.applications debian/mplayer-nogui/usr/share/application-registry/mplayer.applications 421 cp debian/mplayer.keys debian/mplayer-nogui/usr/share/mime-info 422 423 # Mencoder 424 cp debian/mplayer-nogui/usr/share/man/man1/mplayer.1 debian/mencoder/usr/share/man/man1/mencoder.1 425 mv debian/mplayer-nogui/usr/bin/mencoder debian/mencoder/usr/bin 426 427 [ ! -f Makefile ] || $(MAKE) distclean 428 429 ############################ amd64 ############################### 430 431 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_AMD64) 432 433 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 434 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 435 436 $(MAKE) 437 438 # -j $(NCPUS) 439 440 $(MAKE) install prefix=$(CURDIR)/debian/mplayer/usr \ 441 CONFDIR=$(CURDIR)/debian/mplayer/etc/mplayer \ 442 DATADIR=$(CURDIR)/debian/mplayer/usr/share/mplayer \ 443 LIBDIR=$(CURDIR)/debian/mplayer/usr/lib \ 444 MANDIR=$(CURDIR)/debian/mplayer/usr/share/man \ 445 BINDIR=$(CURDIR)/debian/mplayer/usr/bin 446 447 cp etc/example.conf debian/mplayer/etc/mplayer/mplayer.conf 448 cp etc/input.conf debian/mplayer/etc/mplayer 449 cp etc/menu.conf debian/mplayer/etc/mplayer 450 cp debian/mplayer.applications debian/mplayer/usr/share/application-registry 451 cp debian/mplayer.keys debian/mplayer/usr/share/mime-info 452 cp debian/gmplayer.keys debian/mplayer/usr/share/mime-info 453 454 # This suck 455 @for page in cs de es fr hu it pl ru; do \ 456 cp debian/mplayer/usr/share/man/$$page/man1/mplayer.1 \ 457 debian/mencoder/usr/share/man/$$page/man1/mencoder.1; \ 458 done 459 460 [ ! -f Makefile ] || $(MAKE) distclean 461 462 #; $(MAKE) distclean -C gui 463 464 else # amd64 465 ifeq "$(DEBIAN_ARCH)" "sparc" 466 ######################### sparc nogui ############################ 467 468 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_SPARC_NOGUI) 469 470 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 471 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 472 473 $(MAKE) -j $(NCPUS) 474 475 $(MAKE) install prefix=$(CURDIR)/debian/mplayer-nogui/usr \ 476 CONFDIR=$(CURDIR)/debian/mplayer-nogui/etc/mplayer \ 477 DATADIR=$(CURDIR)/debian/mplayer-nogui/usr/share/mplayer \ 478 LIBDIR=$(CURDIR)/debian/mplayer-nogui/usr/lib \ 479 MANDIR=$(CURDIR)/debian/mplayer-nogui/usr/share/man \ 480 BINDIR=$(CURDIR)/debian/mplayer-nogui/usr/bin 481 482 cp debian/mime-nogui debian/mplayer-nogui.mime 483 cp etc/example.conf debian/mplayer-nogui/etc/mplayer/mplayer.conf 484 cp etc/input.conf debian/mplayer-nogui/etc/mplayer 485 cp etc/menu.conf debian/mplayer-nogui/etc/mplayer 486 cp debian/mplayer-nogui.applications debian/mplayer-nogui/usr/share/application-registry/mplayer.applications 487 cp debian/mplayer.keys debian/mplayer-nogui/usr/share/mime-info 488 489 # mencoder 490 cp debian/mplayer-nogui/usr/share/man/man1/mplayer.1 debian/mencoder/usr/share/man/man1/mencoder.1 491 mv debian/mplayer-nogui/usr/bin/mencoder debian/mencoder/usr/bin 492 493 [ ! -f Makefile ] || $(MAKE) distclean 494 495 ########################## sparc ################################# 496 497 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_SPARC) 498 499 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 500 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 501 502 $(MAKE) -j $(NCPUS) 503 504 $(MAKE) install prefix=$(CURDIR)/debian/mplayer/usr \ 505 CONFDIR=$(CURDIR)/debian/mplayer/etc/mplayer \ 506 DATADIR=$(CURDIR)/debian/mplayer/usr/share/mplayer \ 507 LIBDIR=$(CURDIR)/debian/mplayer/usr/lib \ 508 MANDIR=$(CURDIR)/debian/mplayer/usr/share/man \ 509 BINDIR=$(CURDIR)/debian/mplayer/usr/bin 510 511 cp etc/example.conf debian/mplayer/etc/mplayer/mplayer.conf 512 cp etc/input.conf debian/mplayer/etc/mplayer 513 cp etc/menu.conf debian/mplayer/etc/mplayer 514 cp debian/mplayer.applications debian/mplayer/usr/share/application-registry 515 cp debian/mplayer.keys debian/mplayer/usr/share/mime-info 516 cp debian/gmplayer.keys debian/mplayer/usr/share/mime-info 517 518 else # sparc 519 ifeq "$(DEB_BUILD_ARCH)" "ia64" 520 ######################### ia64 Itanium 1 ############################ 521 522 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_IA64_1) 523 524 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 525 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 526 527 $(MAKE) -j $(NCPUS) 528 529 $(MAKE) install prefix=$(CURDIR)/debian/mplayer/usr \ 530 CONFDIR=$(CURDIR)/debian/mplayer/etc/mplayer \ 531 DATADIR=$(CURDIR)/debian/mplayer/usr/share/mplayer \ 532 LIBDIR=$(CURDIR)/debian/mplayer/usr/lib \ 533 MANDIR=$(CURDIR)/debian/mplayer/usr/share/man \ 534 BINDIR=$(CURDIR)/debian/mplayer/usr/bin 535 536 cp etc/example.conf debian/mplayer/etc/mplayer/mplayer.conf 537 cp etc/input.conf debian/mplayer/etc/mplayer 538 cp etc/menu.conf debian/mplayer/etc/mplayer 539 cp debian/mplayer-nogui.applications debian/mplayer/usr/share/application-registry/mplayer.applications 540 cp debian/mplayer.keys debian/mplayer/usr/share/mime-info 541 542 # mencoder 543 cp debian/mplayer/usr/share/man/man1/mplayer.1 debian/mencoder/usr/share/man/man1/mencoder.1 544 mv debian/mplayer/usr/bin/mencoder debian/mencoder/usr/bin 545 546 [ ! -f Makefile ] || $(MAKE) distclean 547 548 ########################## ia64 Itanium 2 ################################# 549 550 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_IA64_2) 551 552 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 553 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 554 555 perl -i -pe 's,-mtune=(\w+),-mtune=itanium2,' config.mak 556 557 $(MAKE) -j $(NCPUS) 558 559 $(MAKE) install prefix=$(CURDIR)/debian/mplayer-itanium2/usr \ 560 CONFDIR=$(CURDIR)/debian/mplayer-itanium2/etc/mplayer \ 561 DATADIR=$(CURDIR)/debian/mplayer-itanium2/usr/share/mplayer \ 562 LIBDIR=$(CURDIR)/debian/mplayer-itanium2/usr/lib \ 563 MANDIR=$(CURDIR)/debian/mplayer-itanium2/usr/share/man \ 564 BINDIR=$(CURDIR)/debian/mplayer-itanium2/usr/bin 565 566 cp etc/example.conf debian/mplayer-itanium2/etc/mplayer/mplayer.conf 567 cp etc/input.conf debian/mplayer-itanium2/etc/mplayer 568 cp etc/menu.conf debian/mplayer-itanium2/etc/mplayer 569 cp debian/mplayer.applications debian/mplayer-itanium2/usr/share/application-registry 570 cp debian/mplayer.keys debian/mplayer-itanium2/usr/share/mime-info 571 cp debian/gmplayer.keys debian/mplayer-itanium2/usr/share/mime-info 572 573 # mencoder 574 cp debian/mplayer-itanium2/usr/share/man/man1/mplayer.1 debian/mencoder-itanium2/usr/share/man/man1/mencoder.1 575 mv debian/mplayer-itanium2/usr/bin/mencoder debian/mencoder-itanium2/usr/bin 576 577 else # ia64 578 ifeq "$(DEB_BUILD_ARCH)" "hppa" 579 ######################### hppa nogui ############################ 580 581 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_HPPA_NOGUI) 582 583 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 584 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 585 586 $(MAKE) -j $(NCPUS) 587 588 $(MAKE) install prefix=$(CURDIR)/debian/mplayer-nogui/usr \ 589 CONFDIR=$(CURDIR)/debian/mplayer-nogui/etc/mplayer \ 590 DATADIR=$(CURDIR)/debian/mplayer-nogui/usr/share/mplayer \ 591 LIBDIR=$(CURDIR)/debian/mplayer-nogui/usr/lib \ 592 MANDIR=$(CURDIR)/debian/mplayer-nogui/usr/share/man \ 593 BINDIR=$(CURDIR)/debian/mplayer-nogui/usr/bin 594 595 cp debian/mime-nogui debian/mplayer-nogui.mime 596 cp etc/example.conf debian/mplayer-nogui/etc/mplayer/mplayer.conf 597 cp etc/input.conf debian/mplayer-nogui/etc/mplayer 598 cp etc/menu.conf debian/mplayer-nogui/etc/mplayer 599 cp debian/mplayer-nogui.applications debian/mplayer-nogui/usr/share/application-registry/mplayer.applications 600 cp debian/mplayer.keys debian/mplayer-nogui/usr/share/mime-info 601 602 # mencoder 603 cp debian/mplayer-nogui/usr/share/man/man1/mplayer.1 debian/mencoder/usr/share/man/man1/mencoder.1 604 mv debian/mplayer-nogui/usr/bin/mencoder debian/mencoder/usr/bin 605 606 [ ! -f Makefile ] || $(MAKE) distclean 607 608 ########################## hppa ################################# 609 610 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_HPPA) 611 612 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 613 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 614 615 $(MAKE) -j $(NCPUS) 616 617 $(MAKE) install prefix=$(CURDIR)/debian/mplayer/usr \ 618 CONFDIR=$(CURDIR)/debian/mplayer/etc/mplayer \ 619 DATADIR=$(CURDIR)/debian/mplayer/usr/share/mplayer \ 620 LIBDIR=$(CURDIR)/debian/mplayer/usr/lib \ 621 MANDIR=$(CURDIR)/debian/mplayer/usr/share/man \ 622 BINDIR=$(CURDIR)/debian/mplayer/usr/bin 623 624 cp etc/example.conf debian/mplayer/etc/mplayer/mplayer.conf 625 cp etc/input.conf debian/mplayer/etc/mplayer 626 cp etc/menu.conf debian/mplayer/etc/mplayer 627 cp debian/mplayer.applications debian/mplayer/usr/share/application-registry 628 cp debian/mplayer.keys debian/mplayer/usr/share/mime-info 629 cp debian/gmplayer.keys debian/mplayer/usr/share/mime-info 630 else # hppa 631 ifeq "$(DEB_BUILD_ARCH)" "alpha" 632 ######################### alpha nogui ############################ 633 634 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_HPPA_NOGUI) 635 636 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 637 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 638 639 $(MAKE) -j $(NCPUS) 640 641 $(MAKE) install prefix=$(CURDIR)/debian/mplayer-nogui/usr \ 642 CONFDIR=$(CURDIR)/debian/mplayer-nogui/etc/mplayer \ 643 DATADIR=$(CURDIR)/debian/mplayer-nogui/usr/share/mplayer \ 644 LIBDIR=$(CURDIR)/debian/mplayer-nogui/usr/lib \ 645 MANDIR=$(CURDIR)/debian/mplayer-nogui/usr/share/man \ 646 BINDIR=$(CURDIR)/debian/mplayer-nogui/usr/bin 647 648 cp debian/mime-nogui debian/mplayer-nogui.mime 649 cp etc/example.conf debian/mplayer-nogui/etc/mplayer/mplayer.conf 650 cp etc/input.conf debian/mplayer-nogui/etc/mplayer 651 cp etc/menu.conf debian/mplayer-nogui/etc/mplayer 652 cp debian/mplayer-nogui.applications debian/mplayer-nogui/usr/share/application-registry/mplayer.applications 653 cp debian/mplayer.keys debian/mplayer-nogui/usr/share/mime-info 654 655 # mencoder 656 cp debian/mplayer-nogui/usr/share/man/man1/mplayer.1 debian/mencoder/usr/share/man/man1/mencoder.1 657 mv debian/mplayer-nogui/usr/bin/mencoder debian/mencoder/usr/bin 658 659 [ ! -f Makefile ] || $(MAKE) distclean 660 661 ########################## alpha ################################# 662 663 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_HPPA) 664 665 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 666 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 667 668 $(MAKE) -j $(NCPUS) 669 670 $(MAKE) install prefix=$(CURDIR)/debian/mplayer/usr \ 671 CONFDIR=$(CURDIR)/debian/mplayer/etc/mplayer \ 672 DATADIR=$(CURDIR)/debian/mplayer/usr/share/mplayer \ 673 LIBDIR=$(CURDIR)/debian/mplayer/usr/lib \ 674 MANDIR=$(CURDIR)/debian/mplayer/usr/share/man \ 675 BINDIR=$(CURDIR)/debian/mplayer/usr/bin 676 677 cp etc/example.conf debian/mplayer/etc/mplayer/mplayer.conf 678 cp etc/input.conf debian/mplayer/etc/mplayer 679 cp etc/menu.conf debian/mplayer/etc/mplayer 680 cp debian/mplayer.applications debian/mplayer/usr/share/application-registry 681 cp debian/mplayer.keys debian/mplayer/usr/share/mime-info 682 cp debian/gmplayer.keys debian/mplayer/usr/share/mime-info 683 else # alpha 684 ############################ Custom ############################## 685 686 CC="$(CC)" CXX="$(CXX)" ./configure $(CONFIGURE_CUSTOM) 687 688 echo "#define VERSION \"dev-SVN-r25315\"" > version.h 689 echo "#define MP_TITLE \"MPlayer dev-SVN-r25315\"" >> version.h 690 691 $(MAKE) -j $(NCPUS) 692 693 $(MAKE) install prefix=$(CURDIR)/debian/mplayer-custom/usr \ 694 CONFDIR=$(CURDIR)/debian/mplayer-custom/etc/mplayer \ 695 DATADIR=$(CURDIR)/debian/mplayer-custom/usr/share/mplayer \ 696 LIBDIR=$(CURDIR)/debian/mplayer-custom/usr/lib \ 697 MANDIR=$(CURDIR)/debian/mplayer-custom/usr/share/man \ 698 BINDIR=$(CURDIR)/debian/mplayer-custom/usr/bin 699 700 cp etc/example.conf debian/mplayer-custom/etc/mplayer/mplayer.conf 701 cp etc/menu.conf debian/mplayer-custom/etc/mplayer 702 cp debian/mplayer.applications debian/mplayer-custom/usr/share/application-registry 703 cp debian/mplayer.keys debian/mplayer-custom/usr/share/mime-info 704 cp etc/input.conf debian/mplayer-custom/etc/mplayer 705 706 # This suck 707 for page in cs de es fr hu it pl ru; do \ 708 cp debian/mplayer-custom/usr/share/man/$$page/man1/mplayer.1 debian/mencoder-custom/usr/share/man/$$page/man1/mencoder.1; \ 709 done 710 cp debian/mplayer-custom/usr/share/man/man1/mplayer.1 debian/mencoder-custom/usr/share/man/man1/mencoder.1 711 mv debian/mplayer-custom/usr/bin/mencoder debian/mencoder-custom/usr/bin 712 endif 713 endif 714 endif 715 endif 716 endif 717 endif 718 endif 719 endif 720 721 # Remove fibmap_mplayer 722 find -name fibmap_mplayer | xargs -r rm 723 724 # Remove mencode.1 in mplayer-* packages 725 find debian/mplayer* -name mencoder.1 | xargs -r rm 726 727 find debian -type d | xargs rmdir -p --ignore-fail-on-non-empty 728 729 touch configure-stamp 730 731 build: build-stamp 732 build-stamp: configure-stamp 733 # dh_testdir 734 735 # $(MAKE) dep 736 # $(MAKE) 737 738 # touch build-stamp 739 740 clean: 741 dh_testdir 742 # dh_testroot 743 rm -rf configure-stamp build-stamp 744 745 -$(MAKE) distclean 746 -$(MAKE) distclean -C gui 747 748 debian/rules unpatch 749 750 dh_clean build codec-cfg loader/DirectShow/test.divx \ 751 debian/README.debian debian/dirs debian/templates config.h \ 752 debian/postinst.templates debian/config debian/TODO.Debian \ 753 TOOLS/cpuinfo build-stamp configure-stamp libac3/mmx/imdct512_kni.o \ 754 libac3/mmx/srfft_kni.o linux/lrmi.o linux/vbelib.o libdha/libdha.so.0.1 \ 755 debian/mplayer-*.mime \ 756 debian/mplayer-*.postinst \ 757 debian/mplayer-*.preinst \ 758 debian/mplayer-*.postrm \ 759 debian/mplayer-*.links \ 760 debian/mplayer-*.examples \ 761 libavcodec/libavcodec.a version.h \ 762 libavcodec/eac3dec.c libavcodec/eac3.h libavcodec/ac3dec.h 763 764 find -name config.mak | xargs -r rm 765 766 # perl -i -pe 's,-march=(\D+)(\d+),-march=i486,' config.mak 767 # perl -i -pe 's,-mtune=(\D+)(\d+),-mtune=i486,' config.mak 768 769 cp debian/$(CONTROL) debian/control 770 771 install: build 772 dh_testdir 773 dh_testroot 774 # dh_clean -k 775 # dh_installdirs etc 776 777 # $(MAKE) install prefix=$(CURDIR)/debian/${package}/usr 778 779 # cp etc/example.conf debian/${package}/etc/mplayer/mplayer.conf 780 781 # Build architecture-independent files here. 782 binary-indep: build install 783 dh_testdir -i 784 dh_testroot -i 785 dh_installdocs -i DOCS/HTML DOCS/tech 786 dh_installchangelogs -i Changelog 787 dh_link -i 788 dh_compress -i 789 dh_fixperms -i 790 dh_installdeb -i 791 dh_gencontrol -i 792 dh_md5sums -i 793 dh_builddeb -i 794 795 # Build architecture-dependent files here. 796 binary-arch: build install 797 dh_testdir -a 798 dh_testroot -a 799 # dh_installdebconf 800 dh_installdocs -a -A debian/README.Debian 801 dh_installexamples -A etc/codecs.conf 802 dh_installmenu -a 803 dh_desktop -a -pmplayer 804 dh_installmime -a 805 # dh_installman -A DOCS/mencoder.1 806 dh_installchangelogs -A -a Changelog 807 808 dh_link -a 809 dh_strip -a 810 dh_compress -a 811 dh_fixperms -a 812 # dh_makeshlibs -ldebian/mplayer-*/usr/lib 813 dh_installdeb -a 814 # dh_perl 815 dh_shlibdeps -a 816 817 # Hack to add svgalib-dummyg1 dependency 818 perl -pi -e 's/libsvga1(\s*\(.*?\))?/$$& | svgalib-dummyg1$$1/' \ 819 debian/*.substvars 820 821 dh_gencontrol -s 822 dh_md5sums -s 823 dh_builddeb -s 824 825 binary: binary-indep binary-arch 826 .PHONY: build clean binary-indep binary-arch binary install configure -
mplayer-1.0.rc2svn20071207
old new 1 Source: mplayer 2 Section: graphics 3 Priority: extra 4 Maintainer: Christian Marillat <marillat@debian.org> 5 Bugs: mailto:marillat@debian.org 6 Homepage: http://www.mplayerhq.hu/ 7 Standards-Version: 3.7.3 8 Build-Depends: debhelper (>> 5), libncurses5-dev, libxv-dev, libfaac-dev, ccache, 9 libesd0-dev, liblircclient-dev, libgtk2.0-dev, libvorbis-dev, libsdl1.2-dev, 10 libmad0-dev, libasound2-dev (>= 1.0.1), liblzo2-dev, libfaad-dev, libxvmc-dev, 11 gawk, libjpeg62-dev, libaudiofile-dev, libsmbclient-dev, libfribidi-dev, 12 libpng3-dev, libungif4-dev, libggi2-dev, libaa1-dev, liblame-dev, dpatch, 13 libcdparanoia0-dev, libxvidcore4-dev, libdv-dev, libcaca-dev, libdts-dev, 14 liblivemedia-dev (>= 2004.05.01), libfreetype6-dev, em8300-headers, ladspa-sdk, 15 libgl1-mesa-swx11-dev | libgl-dev, libdirectfb-dev (>= 1.0.1), libdvdread-dev, libtheora-dev, 16 libglu1-mesa-dev, libartsc0-dev, libfontconfig-dev, libaudio-dev, libspeex-dev, 17 libx264-dev (>= 0.svn20070309-4), libdvdnav-dev, libxxf86dga-dev, libjack-dev, 18 libvstream-dev, libmpcdec-dev, libxinerama-dev, libtwolame-dev, libpulse-dev, 19 libopenal-dev, libamrwb-dev, libamrnb-dev 20 21 Package: mplayer 22 Architecture: sparc 23 Depends: ${shlibs:Depends}, mplayer-skin 24 Suggests: libdvdcss, mplayer-doc 25 Conflicts: mplayer-custom, mplayer-sparc, libconfhelper-perl 26 Replaces: mplayer-custom, mplayer-sparc 27 Description: The Ultimate Movie Player For Linux 28 It plays most mpeg, avi and asf files, supported by many native and win32 29 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 30 big feature of mplayer is the wide range of supported output drivers. It 31 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 32 this way all drivers of SDL) and some lowlevel card-specific drivers (for 33 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 34 so you can enjoy movies in fullscreen. 35 . 36 This version is for generic Sparc CPUs. 37 38 Package: mplayer-nogui 39 Architecture: sparc 40 Depends: ${shlibs:Depends} 41 Suggests: w32codecs (>= 1:20050412-0.1), libdvdcss, mplayer-doc 42 Conflicts: mplayer-386, mplayer-586, mplayer-k6, mplayer-custom, mplayer, mplayer-skin, libconfhelper-perl 43 Replaces: mplayer-386, mplayer-586, mplayer-k6, mplayer-custom, mplayer 44 Provides: mplayer 45 Description: The Ultimate Movie Player For Linux 46 It plays most mpeg, avi and asf files, supported by many native and win32 47 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 48 big feature of mplayer is the wide range of supported output drivers. It 49 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 50 this way all drivers of SDL) and some lowlevel card-specific drivers (for 51 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 52 so you can enjoy movies in fullscreen. 53 . 54 This version doesn't have the User Interface in GTK+. 55 56 Package: mencoder 57 Architecture: sparc 58 Depends: ${shlibs:Depends} 59 Suggests: libdvdcss, mplayer-doc 60 Conflicts: mencoder-custom, mencoder-sparc, mplayer-sparc 61 Replaces: mencoder-custom, mencoder-sparc, mplayer 62 Description: MPlayer's Movie Encoder 63 A simple movie encoder, designed to encode MPlayer-playable movies 64 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 65 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 66 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 67 video resizing abilities. 68 . 69 This version is for generic Sparc CPUs. 70 71 Package: mplayer-doc 72 Architecture: all 73 Section: doc 74 Description: Documentation for mplayer 75 This package contains the documentation Chinese, English, French, German, 76 Hungarian, Italian and Polish. -
mplayer-1.0.rc2svn20071207
old new 1 This package was debianized by Christian Marillat <marillat@debian.org> on 2 Mon, 26 Feb 2001 12:24:04 +0100. 3 4 It was downloaded from http://www.mplayerhq.hu/ 5 6 Copyright 2000-2007 7 8 You should have received a copy of the GNU General Public License with the 9 Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; if 10 not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth 11 Floor, Boston, MA 02110-1301, USA. -
debian/patches/01_mcpu-sparc.dpatch
old new 1 #! /bin/sh /usr/share/dpatch/dpatch-run 2 ## 01_mplayer.conf.dpatch by Christian Marillat <marillat@debian.org> 3 ## 4 ## All lines beginning with ## DP:' are a description of the patch. 5 ## DP: Replace xterm by x-terminal-emulator. 6 7 @DPATCH@ 8 9 --- mplayer-1.0.orig/libswscale/Makefile 2007-09-11 16:09:46.000000000 +0200 10 +++ mplayer-1.0/libswscale/Makefile 2007-09-11 16:11:14.000000000 +0200 11 @@ -9,6 +9,11 @@ 12 13 OBJS = rgb2rgb.o swscale.o 14 15 +ifeq ($(ARCH_SPARC),yes) 16 +OBJS-$(ARCH_SPARC) += yuv2rgb.o 17 +yuv2rgb.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc 18 +endif 19 + 20 OBJS-$(CONFIG_GPL) += yuv2rgb.o 21 OBJS-$(HAVE_ALTIVEC) += yuv2rgb_altivec.o 22 -
debian/patches/03_eac3.dpatch
old new 1 #! /bin/sh /usr/share/dpatch/dpatch-run 2 ## 02_filter_pv.c.dpatch by Christian Marillat <marillat@debian.org> 3 ## 4 ## All lines beginning with ## DP:' are a description of the patch. 5 ## DP: Replace xterm by x-terminal-emulator. 6 7 @DPATCH@ 8 9 --- mplayer-1.0.rc2svn20071207/libavcodec/ac3.c 2007-09-14 00:02:17.000000000 +0200 10 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/ac3.c 2007-09-14 00:03:58.000000000 +0200 11 @@ -173,7 +173,7 @@ 12 } 13 14 void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end, 15 - int snroffset, int floor, uint8_t *bap) 16 + int snroffset, int floor, const uint8_t *baptab, uint8_t *bap) 17 { 18 int i, j, k, end1, v, address; 19 20 @@ -190,7 +190,7 @@ 21 end1 = FFMIN(bndtab[j] + ff_ac3_bndsz[j], end); 22 for (k = i; k < end1; k++) { 23 address = av_clip((psd[i] - v) >> 5, 0, 63); 24 - bap[i] = ff_ac3_baptab[address]; 25 + bap[i] = baptab[address]; 26 i++; 27 } 28 } while (end > bndtab[j++]); 29 @@ -215,7 +215,7 @@ 30 deltbae, deltnseg, deltoffst, deltlen, deltba, 31 mask); 32 33 - ff_ac3_bit_alloc_calc_bap(mask, psd, start, end, snroffset, s->floor, bap); 34 + ff_ac3_bit_alloc_calc_bap(mask, psd, start, end, snroffset, s->floor, ff_ac3_baptab, bap); 35 } 36 37 /** 38 39 --- mplayer-1.0.rc2svn20071207/libavcodec/ac3.h 2007-09-14 00:02:17.000000000 +0200 40 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/ac3.h 2007-09-14 00:03:58.000000000 +0200 41 @@ -161,10 +161,11 @@ 42 * @param[in] end ending bin location 43 * @param[in] snroffset SNR adjustment 44 * @param[in] floor noise floor 45 + * @param[in] baptab bit allocation pointer table 46 * @param[out] bap bit allocation pointers 47 */ 48 void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end, 49 - int snroffset, int floor, uint8_t *bap); 50 + int snroffset, int floor, const uint8_t *baptab, uint8_t *bap); 51 52 void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap, 53 int8_t *exp, int start, int end, 54 55 56 --- mplayer-1.0.rc2svn20071207/libavcodec/ac3dec.c 2007-12-03 18:11:12.000000000 +0100 57 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/ac3dec.c 2007-12-03 19:06:29.000000000 +0100 58 @@ -38,28 +38,24 @@ 59 #include "dsputil.h" 60 #include "random.h" 61 62 -/** 63 - * Table of bin locations for rematrixing bands 64 - * reference: Section 7.5.2 Rematrixing : Frequency Band Definitions 65 - */ 66 -static const uint8_t rematrix_band_tab[5] = { 13, 25, 37, 61, 253 }; 67 +#include "ac3dec.h" 68 69 /** 70 * table for exponent to scale_factor mapping 71 - * scale_factors[i] = 2 ^ -i 72 + * ff_ac3_scale_factors[i] = 2 ^ -i 73 */ 74 -static float scale_factors[25]; 75 +float ff_ac3_scale_factors[25]; 76 77 /** table for grouping exponents */ 78 -static uint8_t exp_ungroup_tab[128][3]; 79 +uint8_t ff_ac3_exp_ungroup_tbl[128][3]; 80 81 82 /** tables for ungrouping mantissas */ 83 -static float b1_mantissas[32][3]; 84 -static float b2_mantissas[128][3]; 85 -static float b3_mantissas[8]; 86 -static float b4_mantissas[128][2]; 87 -static float b5_mantissas[16]; 88 +float ff_ac3_b1_mantissas[32][3]; 89 +float ff_ac3_b2_mantissas[128][3]; 90 +float ff_ac3_b3_mantissas[8]; 91 +float ff_ac3_b4_mantissas[128][2]; 92 +float ff_ac3_b5_mantissas[16]; 93 94 /** 95 * Quantization table: levels for symmetric. bits for asymmetric. 96 @@ -71,18 +67,10 @@ 97 }; 98 99 /** dynamic range table. converts codes to scale factors. */ 100 -static float dynrng_tab[256]; 101 +float ff_ac3_dynrng_tbl[256]; 102 103 /** dialog normalization table */ 104 -static float dialnorm_tab[32]; 105 - 106 -/** Adjustments in dB gain */ 107 -#define LEVEL_MINUS_3DB 0.7071067811865476 108 -#define LEVEL_MINUS_4POINT5DB 0.5946035575013605 109 -#define LEVEL_MINUS_6DB 0.5000000000000000 110 -#define LEVEL_MINUS_9DB 0.3535533905932738 111 -#define LEVEL_ZERO 0.0000000000000000 112 -#define LEVEL_ONE 1.0000000000000000 113 +float ff_ac3_dialnorm_tbl[32]; 114 115 static const float gain_levels[6] = { 116 LEVEL_ZERO, 117 @@ -123,7 +111,7 @@ 118 /* override ac3.h to include coupling channel */ 119 #undef AC3_MAX_CHANNELS 120 #define AC3_MAX_CHANNELS 7 121 -#define CPL_CH 0 122 + 123 124 #define AC3_OUTPUT_LFEON 8 125 126 @@ -201,7 +189,7 @@ 127 /** 128 * Generate a Kaiser-Bessel Derived Window. 129 */ 130 -static void ac3_window_init(float *window) 131 +void ff_ac3_window_init(float *window) 132 { 133 int i, j; 134 double sum = 0.0, bessel, tmp; 135 @@ -236,7 +224,7 @@ 136 /* 137 * Initialize tables at runtime. 138 */ 139 -static void ac3_tables_init(void) 140 +void ff_ac3_tables_init(void) 141 { 142 int i; 143 144 @@ -244,57 +232,57 @@ 145 reference: Section 7.3.5 Ungrouping of Mantissas */ 146 for(i=0; i<32; i++) { 147 /* bap=1 mantissas */ 148 - b1_mantissas[i][0] = symmetric_dequant( i / 9 , 3); 149 - b1_mantissas[i][1] = symmetric_dequant((i % 9) / 3, 3); 150 - b1_mantissas[i][2] = symmetric_dequant((i % 9) % 3, 3); 151 + ff_ac3_b1_mantissas[i][0] = symmetric_dequant( i / 9 , 3); 152 + ff_ac3_b1_mantissas[i][1] = symmetric_dequant((i % 9) / 3, 3); 153 + ff_ac3_b1_mantissas[i][2] = symmetric_dequant((i % 9) % 3, 3); 154 } 155 for(i=0; i<128; i++) { 156 /* bap=2 mantissas */ 157 - b2_mantissas[i][0] = symmetric_dequant( i / 25 , 5); 158 - b2_mantissas[i][1] = symmetric_dequant((i % 25) / 5, 5); 159 - b2_mantissas[i][2] = symmetric_dequant((i % 25) % 5, 5); 160 + ff_ac3_b2_mantissas[i][0] = symmetric_dequant( i / 25 , 5); 161 + ff_ac3_b2_mantissas[i][1] = symmetric_dequant((i % 25) / 5, 5); 162 + ff_ac3_b2_mantissas[i][2] = symmetric_dequant((i % 25) % 5, 5); 163 164 /* bap=4 mantissas */ 165 - b4_mantissas[i][0] = symmetric_dequant(i / 11, 11); 166 - b4_mantissas[i][1] = symmetric_dequant(i % 11, 11); 167 + ff_ac3_b4_mantissas[i][0] = symmetric_dequant(i / 11, 11); 168 + ff_ac3_b4_mantissas[i][1] = symmetric_dequant(i % 11, 11); 169 } 170 /* generate ungrouped mantissa tables 171 reference: Tables 7.21 and 7.23 */ 172 for(i=0; i<7; i++) { 173 /* bap=3 mantissas */ 174 - b3_mantissas[i] = symmetric_dequant(i, 7); 175 + ff_ac3_b3_mantissas[i] = symmetric_dequant(i, 7); 176 } 177 for(i=0; i<15; i++) { 178 /* bap=5 mantissas */ 179 - b5_mantissas[i] = symmetric_dequant(i, 15); 180 + ff_ac3_b5_mantissas[i] = symmetric_dequant(i, 15); 181 } 182 183 /* generate dynamic range table 184 reference: Section 7.7.1 Dynamic Range Control */ 185 for(i=0; i<256; i++) { 186 int v = (i >> 5) - ((i >> 7) << 3) - 5; 187 - dynrng_tab[i] = powf(2.0f, v) * ((i & 0x1F) | 0x20); 188 + ff_ac3_dynrng_tbl[i] = powf(2.0f, v) * ((i & 0x1F) | 0x20); 189 } 190 191 /* generate dialog normalization table 192 references: Section 5.4.2.8 dialnorm 193 Section 7.6 Dialogue Normalization */ 194 for(i=1; i<32; i++) { 195 - dialnorm_tab[i] = expf((i-31) * M_LN10 / 20.0f); 196 + ff_ac3_dialnorm_tbl[i] = expf((i-31) * M_LN10 / 20.0f); 197 } 198 - dialnorm_tab[0] = dialnorm_tab[31]; 199 + ff_ac3_dialnorm_tbl[0] = ff_ac3_dialnorm_tbl[31]; 200 201 /* generate scale factors for exponents and asymmetrical dequantization 202 reference: Section 7.3.2 Expansion of Mantissas for Asymmetric Quantization */ 203 for (i = 0; i < 25; i++) 204 - scale_factors[i] = pow(2.0, -i); 205 + ff_ac3_scale_factors[i] = pow(2.0, -i); 206 207 /* generate exponent tables 208 reference: Section 7.1.3 Exponent Decoding */ 209 for(i=0; i<128; i++) { 210 - exp_ungroup_tab[i][0] = i / 25; 211 - exp_ungroup_tab[i][1] = (i % 25) / 5; 212 - exp_ungroup_tab[i][2] = (i % 25) % 5; 213 + ff_ac3_exp_ungroup_tbl[i][0] = i / 25; 214 + ff_ac3_exp_ungroup_tbl[i][1] = (i % 25) / 5; 215 + ff_ac3_exp_ungroup_tbl[i][2] = (i % 25) % 5; 216 } 217 } 218 219 @@ -308,10 +296,10 @@ 220 ctx->avctx = avctx; 221 222 ac3_common_init(); 223 - ac3_tables_init(); 224 + ff_ac3_tables_init(); 225 ff_mdct_init(&ctx->imdct_256, 8, 1); 226 ff_mdct_init(&ctx->imdct_512, 9, 1); 227 - ac3_window_init(ctx->window); 228 + ff_ac3_window_init(ctx->window); 229 dsputil_init(&ctx->dsp, avctx); 230 av_init_random(0, &ctx->dith_state); 231 232 @@ -382,7 +370,7 @@ 233 /* read the rest of the bsi. read twice for dual mono mode. */ 234 i = !(ctx->acmod); 235 do { 236 - ctx->dialnorm[i] = dialnorm_tab[get_bits(gb, 5)]; // dialog normalization 237 + ctx->dialnorm[i] = ff_ac3_dialnorm_tbl[get_bits(gb, 5)]; // dialogue normalization 238 if (get_bits1(gb)) 239 skip_bits(gb, 8); //skip compression 240 if (get_bits1(gb)) 241 @@ -433,7 +421,7 @@ 242 * Decode the grouped exponents according to exponent strategy. 243 * reference: Section 7.1.3 Exponent Decoding 244 */ 245 -static void decode_exponents(GetBitContext *gb, int expstr, int ngrps, 246 +void ff_ac3_decode_exponents(GetBitContext *gb, int expstr, int ngrps, 247 uint8_t absexp, int8_t *dexps) 248 { 249 int i, j, grp, grpsize; 250 @@ -444,9 +432,9 @@ 251 grpsize = expstr + (expstr == EXP_D45); 252 for(grp=0,i=0; grp<ngrps; grp++) { 253 expacc = get_bits(gb, 7); 254 - dexp[i++] = exp_ungroup_tab[expacc][0]; 255 - dexp[i++] = exp_ungroup_tab[expacc][1]; 256 - dexp[i++] = exp_ungroup_tab[expacc][2]; 257 + dexp[i++] = ff_ac3_exp_ungroup_tbl[expacc][0]; 258 + dexp[i++] = ff_ac3_exp_ungroup_tbl[expacc][1]; 259 + dexp[i++] = ff_ac3_exp_ungroup_tbl[expacc][2]; 260 } 261 262 /* convert to absolute exps and expand groups */ 263 @@ -485,49 +473,29 @@ 264 } 265 266 /** 267 - * Grouped mantissas for 3-level 5-level and 11-level quantization 268 - */ 269 -typedef struct { 270 - float b1_mant[3]; 271 - float b2_mant[3]; 272 - float b4_mant[2]; 273 - int b1ptr; 274 - int b2ptr; 275 - int b4ptr; 276 -} mant_groups; 277 - 278 -/** 279 * Get the transform coefficients for a particular channel 280 * reference: Section 7.3 Quantization and Decoding of Mantissas 281 */ 282 -static int get_transform_coeffs_ch(AC3DecodeContext *ctx, int ch_index, mant_groups *m) 283 +int ff_ac3_get_transform_coeffs_ch(mant_groups *m, GetBitContext *gb, 284 + uint8_t *exps, uint8_t *bap, float *coeffs, int start, int end, 285 + AVRandomState *dith_state) 286 { 287 - GetBitContext *gb = &ctx->gb; 288 - int i, gcode, tbap, start, end; 289 - uint8_t *exps; 290 - uint8_t *bap; 291 - float *coeffs; 292 - 293 - exps = ctx->dexps[ch_index]; 294 - bap = ctx->bap[ch_index]; 295 - coeffs = ctx->transform_coeffs[ch_index]; 296 - start = ctx->startmant[ch_index]; 297 - end = ctx->endmant[ch_index]; 298 + int i, gcode, tbap; 299 300 for (i = start; i < end; i++) { 301 tbap = bap[i]; 302 switch (tbap) { 303 case 0: 304 - coeffs[i] = ((av_random(&ctx->dith_state) & 0xFFFF) / 65535.0f) - 0.5f; 305 + coeffs[i] = ((av_random(dith_state) & 0xFFFF) * LEVEL_MINUS_3DB) / 32768.0f; 306 break; 307 308 case 1: 309 if(m->b1ptr > 2) { 310 gcode = get_bits(gb, 5); 311 - m->b1_mant[0] = b1_mantissas[gcode][0]; 312 - m->b1_mant[1] = b1_mantissas[gcode][1]; 313 - m->b1_mant[2] = b1_mantissas[gcode][2]; 314 - m->b1ptr = 0; 315 + m->b1_mant[0] = ff_ac3_b1_mantissas[gcode][0]; 316 + m->b1_mant[1] = ff_ac3_b1_mantissas[gcode][1]; 317 + m->b1_mant[2] = ff_ac3_b1_mantissas[gcode][2]; 318 + m->b1ptr = 0; 319 } 320 coeffs[i] = m->b1_mant[m->b1ptr++]; 321 break; 322 @@ -535,38 +503,38 @@ 323 case 2: 324 if(m->b2ptr > 2) { 325 gcode = get_bits(gb, 7); 326 - m->b2_mant[0] = b2_mantissas[gcode][0]; 327 - m->b2_mant[1] = b2_mantissas[gcode][1]; 328 - m->b2_mant[2] = b2_mantissas[gcode][2]; 329 + m->b2_mant[0] = ff_ac3_b2_mantissas[gcode][0]; 330 + m->b2_mant[1] = ff_ac3_b2_mantissas[gcode][1]; 331 + m->b2_mant[2] = ff_ac3_b2_mantissas[gcode][2]; 332 m->b2ptr = 0; 333 } 334 coeffs[i] = m->b2_mant[m->b2ptr++]; 335 break; 336 337 case 3: 338 - coeffs[i] = b3_mantissas[get_bits(gb, 3)]; 339 + coeffs[i] = ff_ac3_b3_mantissas[get_bits(gb, 3)]; 340 break; 341 342 case 4: 343 if(m->b4ptr > 1) { 344 gcode = get_bits(gb, 7); 345 - m->b4_mant[0] = b4_mantissas[gcode][0]; 346 - m->b4_mant[1] = b4_mantissas[gcode][1]; 347 + m->b4_mant[0] = ff_ac3_b4_mantissas[gcode][0]; 348 + m->b4_mant[1] = ff_ac3_b4_mantissas[gcode][1]; 349 m->b4ptr = 0; 350 } 351 coeffs[i] = m->b4_mant[m->b4ptr++]; 352 break; 353 354 case 5: 355 - coeffs[i] = b5_mantissas[get_bits(gb, 4)]; 356 + coeffs[i] = ff_ac3_b5_mantissas[get_bits(gb, 4)]; 357 break; 358 359 default: 360 /* asymmetric dequantization */ 361 - coeffs[i] = get_sbits(gb, qntztab[tbap]) * scale_factors[qntztab[tbap]-1]; 362 + coeffs[i] = get_sbits(gb, qntztab[tbap]) * ff_ac3_scale_factors[qntztab[tbap]-1]; 363 break; 364 } 365 - coeffs[i] *= scale_factors[exps[i]]; 366 + coeffs[i] *= ff_ac3_scale_factors[exps[i]]; 367 } 368 369 return 0; 370 @@ -618,13 +586,19 @@ 371 372 for (ch = 1; ch <= ctx->nchans; ch++) { 373 /* transform coefficients for full-bandwidth channel */ 374 - if (get_transform_coeffs_ch(ctx, ch, &m)) 375 + if (ff_ac3_get_transform_coeffs_ch(&m, &ctx->gb, ctx->dexps[ch], 376 + ctx->bap[ch], ctx->transform_coeffs[ch], ctx->startmant[ch], 377 + ctx->endmant[ch], &ctx->dith_state)) 378 return -1; 379 /* tranform coefficients for coupling channel come right after the 380 coefficients for the first coupled channel*/ 381 if (ctx->chincpl[ch]) { 382 if (!got_cplchan) { 383 - if (get_transform_coeffs_ch(ctx, CPL_CH, &m)) { 384 + if (ff_ac3_get_transform_coeffs_ch(&m, &ctx->gb, 385 + ctx->dexps[CPL_CH], ctx->bap[CPL_CH], 386 + ctx->transform_coeffs[CPL_CH], 387 + ctx->startmant[CPL_CH], ctx->endmant[CPL_CH], 388 + &ctx->dith_state)){ 389 av_log(ctx->avctx, AV_LOG_ERROR, "error in decoupling channels\n"); 390 return -1; 391 } 392 @@ -651,22 +625,20 @@ 393 * Stereo rematrixing. 394 * reference: Section 7.5.4 Rematrixing : Decoding Technique 395 */ 396 -static void do_rematrixing(AC3DecodeContext *ctx) 397 +void ff_ac3_do_rematrixing(float (*transform_coeffs)[256], int end, int nrematbnd, int *rematflg) 398 { 399 int bnd, i; 400 - int end, bndend; 401 + int bndend; 402 float tmp0, tmp1; 403 404 - end = FFMIN(ctx->endmant[1], ctx->endmant[2]); 405 - 406 - for(bnd=0; bnd<ctx->nrematbnd; bnd++) { 407 - if(ctx->rematflg[bnd]) { 408 - bndend = FFMIN(end, rematrix_band_tab[bnd+1]); 409 - for(i=rematrix_band_tab[bnd]; i<bndend; i++) { 410 - tmp0 = ctx->transform_coeffs[1][i]; 411 - tmp1 = ctx->transform_coeffs[2][i]; 412 - ctx->transform_coeffs[1][i] = tmp0 + tmp1; 413 - ctx->transform_coeffs[2][i] = tmp0 - tmp1; 414 + for(bnd=0; bnd<nrematbnd; bnd++) { 415 + if(rematflg[bnd]) { 416 + bndend = FFMIN(end, ff_ac3_rematrix_band_tbl[bnd+1]); 417 + for(i=ff_ac3_rematrix_band_tbl[bnd]; i<bndend; i++) { 418 + tmp0 = transform_coeffs[1][i]; 419 + tmp1 = transform_coeffs[2][i]; 420 + transform_coeffs[1][i] = tmp0 + tmp1; 421 + transform_coeffs[2][i] = tmp0 - tmp1; 422 } 423 } 424 } 425 @@ -675,41 +647,41 @@ 426 /** 427 * Perform the 256-point IMDCT 428 */ 429 -static void do_imdct_256(AC3DecodeContext *ctx, int chindex) 430 +void ff_ac3_do_imdct_256(float *tmp_output, float *transform_coeffs, 431 + MDCTContext *imdct_256, float *tmp_imdct) 432 { 433 int i, k; 434 DECLARE_ALIGNED_16(float, x[128]); 435 FFTComplex z[2][64]; 436 - float *o_ptr = ctx->tmp_output; 437 438 for(i=0; i<2; i++) { 439 /* de-interleave coefficients */ 440 for(k=0; k<128; k++) { 441 - x[k] = ctx->transform_coeffs[chindex][2*k+i]; 442 + x[k] = transform_coeffs[2*k+i]; 443 } 444 445 /* run standard IMDCT */ 446 - ctx->imdct_256.fft.imdct_calc(&ctx->imdct_256, o_ptr, x, ctx->tmp_imdct); 447 + imdct_256->fft.imdct_calc(imdct_256, tmp_output, x, tmp_imdct); 448 449 /* reverse the post-rotation & reordering from standard IMDCT */ 450 for(k=0; k<32; k++) { 451 - z[i][32+k].re = -o_ptr[128+2*k]; 452 - z[i][32+k].im = -o_ptr[2*k]; 453 - z[i][31-k].re = o_ptr[2*k+1]; 454 - z[i][31-k].im = o_ptr[128+2*k+1]; 455 + z[i][32+k].re = -tmp_output[128+2*k]; 456 + z[i][32+k].im = -tmp_output[2*k]; 457 + z[i][31-k].re = tmp_output[2*k+1]; 458 + z[i][31-k].im = tmp_output[128+2*k+1]; 459 } 460 } 461 462 /* apply AC-3 post-rotation & reordering */ 463 for(k=0; k<64; k++) { 464 - o_ptr[ 2*k ] = -z[0][ k].im; 465 - o_ptr[ 2*k+1] = z[0][63-k].re; 466 - o_ptr[128+2*k ] = -z[0][ k].re; 467 - o_ptr[128+2*k+1] = z[0][63-k].im; 468 - o_ptr[256+2*k ] = -z[1][ k].re; 469 - o_ptr[256+2*k+1] = z[1][63-k].im; 470 - o_ptr[384+2*k ] = z[1][ k].im; 471 - o_ptr[384+2*k+1] = -z[1][63-k].re; 472 + tmp_output[ 2*k ] = -z[0][ k].im; 473 + tmp_output[ 2*k+1] = z[0][63-k].re; 474 + tmp_output[128+2*k ] = -z[0][ k].re; 475 + tmp_output[128+2*k+1] = z[0][63-k].im; 476 + tmp_output[256+2*k ] = -z[1][ k].re; 477 + tmp_output[256+2*k+1] = z[1][63-k].im; 478 + tmp_output[384+2*k ] = z[1][ k].im; 479 + tmp_output[384+2*k+1] = -z[1][63-k].re; 480 } 481 } 482 483 @@ -730,7 +702,8 @@ 484 485 for (ch=1; ch<=nchans; ch++) { 486 if (ctx->blksw[ch]) { 487 - do_imdct_256(ctx, ch); 488 + ff_ac3_do_imdct_256(ctx->tmp_output, ctx->transform_coeffs[ch], 489 + &ctx->imdct_256, ctx->tmp_imdct); 490 } else { 491 ctx->imdct_512.fft.imdct_calc(&ctx->imdct_512, ctx->tmp_output, 492 ctx->transform_coeffs[ch], 493 @@ -750,7 +723,7 @@ 494 /** 495 * Downmix the output to mono or stereo. 496 */ 497 -static void ac3_downmix(float samples[AC3_MAX_CHANNELS][256], int nfchans, 498 +void ff_ac3_downmix(float samples[AC3_MAX_CHANNELS][256], int nfchans, 499 int output_mode, float coef[AC3_MAX_CHANNELS][2]) 500 { 501 int i, j; 502 @@ -804,7 +777,7 @@ 503 i = !(ctx->acmod); 504 do { 505 if(get_bits1(gb)) { 506 - ctx->dynrng[i] = dynrng_tab[get_bits(gb, 8)]; 507 + ctx->dynrng[i] = ff_ac3_dynrng_tbl[get_bits(gb, 8)]; 508 } else if(blk == 0) { 509 ctx->dynrng[i] = 1.0f; 510 } 511 @@ -866,7 +839,7 @@ 512 ctx->cplco[ch][bnd] = cplcomant / 16.0f; 513 else 514 ctx->cplco[ch][bnd] = (cplcomant + 16.0f) / 32.0f; 515 - ctx->cplco[ch][bnd] *= scale_factors[cplcoexp + mstrcplco]; 516 + ctx->cplco[ch][bnd] *= ff_ac3_scale_factors[cplcoexp + mstrcplco]; 517 } 518 } 519 } 520 @@ -938,7 +911,7 @@ 521 else 522 ngrps = (ctx->endmant[ch] + grpsize - 4) / grpsize; 523 ctx->dexps[ch][0] = get_bits(gb, 4) << !ch; 524 - decode_exponents(gb, ctx->expstr[ch], ngrps, ctx->dexps[ch][0], 525 + ff_ac3_decode_exponents(gb, ctx->expstr[ch], ngrps, ctx->dexps[ch][0], 526 &ctx->dexps[ch][ctx->startmant[ch]+!!ch]); 527 if(ch != CPL_CH && ch != ctx->lfe_ch) 528 skip_bits(gb, 2); /* skip gainrng */ 529 @@ -947,8 +920,8 @@ 530 531 /* bit allocation information */ 532 if (get_bits1(gb)) { 533 - ctx->bit_alloc_params.sdecay = ff_sdecaytab[get_bits(gb, 2)] >> ctx->bit_alloc_params.halfratecod; 534 - ctx->bit_alloc_params.fdecay = ff_fdecaytab[get_bits(gb, 2)] >> ctx->bit_alloc_params.halfratecod; 535 + ctx->bit_alloc_params.sdecay = ff_sdecaytab[get_bits(gb, 2)]; 536 + ctx->bit_alloc_params.fdecay = ff_fdecaytab[get_bits(gb, 2)]; 537 ctx->bit_alloc_params.sgain = ff_sgaintab[get_bits(gb, 2)]; 538 ctx->bit_alloc_params.dbknee = ff_dbkneetab[get_bits(gb, 2)]; 539 ctx->bit_alloc_params.floor = ff_floortab[get_bits(gb, 3)]; 540 @@ -1027,6 +1000,7 @@ 541 ctx->startmant[ch], ctx->endmant[ch], 542 ctx->snroffst[ch], 543 ctx->bit_alloc_params.floor, 544 + ff_ac3_baptab, 545 ctx->bap[ch]); 546 } 547 } 548 @@ -1047,16 +1021,13 @@ 549 550 /* recover coefficients if rematrixing is in use */ 551 if(ctx->acmod == AC3_ACMOD_STEREO) 552 - do_rematrixing(ctx); 553 + ff_ac3_do_rematrixing(ctx->transform_coeffs, 554 + FFMIN(ctx->endmant[1], ctx->endmant[2]), 555 + ctx->nrematbnd, ctx->rematflg); 556 557 /* apply scaling to coefficients (headroom, dialnorm, dynrng) */ 558 for(ch=1; ch<=ctx->nchans; ch++) { 559 float gain = 2.0f * ctx->mul_bias; 560 - if(ctx->acmod == AC3_ACMOD_DUALMONO) { 561 - gain *= ctx->dialnorm[ch-1] * ctx->dynrng[ch-1]; 562 - } else { 563 - gain *= ctx->dialnorm[0] * ctx->dynrng[0]; 564 - } 565 for(i=0; i<ctx->endmant[ch]; i++) { 566 ctx->transform_coeffs[ch][i] *= gain; 567 } 568 @@ -1067,7 +1038,7 @@ 569 /* downmix output if needed */ 570 if(ctx->nchans != ctx->out_channels && !((ctx->output_mode & AC3_OUTPUT_LFEON) && 571 ctx->nfchans == ctx->out_channels)) { 572 - ac3_downmix(ctx->output, ctx->nfchans, ctx->output_mode, 573 + ff_ac3_downmix(ctx->output, ctx->nfchans, ctx->output_mode, 574 ctx->downmix_coeffs); 575 } 576 577 @@ -1089,43 +1060,21 @@ 578 { 579 AC3DecodeContext *ctx = (AC3DecodeContext *)avctx->priv_data; 580 int16_t *out_samples = (int16_t *)data; 581 - int i, blk, ch, err; 582 + int i, blk, ch; 583 584 /* initialize the GetBitContext with the start of valid AC-3 Frame */ 585 init_get_bits(&ctx->gb, buf, buf_size * 8); 586 587 /* parse the syncinfo */ 588 - err = ac3_parse_header(ctx); 589 - if(err) { 590 - switch(err) { 591 - case AC3_PARSE_ERROR_SYNC: 592 - av_log(avctx, AV_LOG_ERROR, "frame sync error\n"); 593 - break; 594 - case AC3_PARSE_ERROR_BSID: 595 - av_log(avctx, AV_LOG_ERROR, "invalid bitstream id\n"); 596 - break; 597 - case AC3_PARSE_ERROR_SAMPLE_RATE: 598 - av_log(avctx, AV_LOG_ERROR, "invalid sample rate\n"); 599 - break; 600 - case AC3_PARSE_ERROR_FRAME_SIZE: 601 - av_log(avctx, AV_LOG_ERROR, "invalid frame size\n"); 602 - break; 603 - default: 604 - av_log(avctx, AV_LOG_ERROR, "invalid header\n"); 605 - break; 606 - } 607 - return -1; 608 + if (ac3_parse_header(ctx)) { 609 + av_log(avctx, AV_LOG_ERROR, "\n"); 610 + *data_size = 0; 611 + return buf_size; 612 } 613 614 avctx->sample_rate = ctx->sampling_rate; 615 avctx->bit_rate = ctx->bit_rate; 616 617 - /* check that reported frame size fits in input buffer */ 618 - if(ctx->frame_size > buf_size) { 619 - av_log(avctx, AV_LOG_ERROR, "incomplete frame\n"); 620 - return -1; 621 - } 622 - 623 /* channel config */ 624 ctx->out_channels = ctx->nchans; 625 if (avctx->channels == 0) { 626 @@ -1153,10 +1102,88 @@ 627 *data_size = 0; 628 return ctx->frame_size; 629 } 630 - for (i = 0; i < 256; i++) 631 - for (ch = 0; ch < ctx->out_channels; ch++) 632 - *(out_samples++) = ctx->int_output[ch][i]; 633 - } 634 + for (i = 0; i < 256; i++) 635 + if (ctx->lfeon) { 636 + switch (ctx->out_channels) { 637 + case 6: 638 + *(out_samples++) = ctx->int_output[0][i]; // FL 639 + *(out_samples++) = ctx->int_output[2][i]; // FR 640 + *(out_samples++) = ctx->int_output[1][i]; // FC 641 + *(out_samples++) = ctx->int_output[5][i]; // LFE 642 + *(out_samples++) = ctx->int_output[3][i]; // BL 643 + *(out_samples++) = ctx->int_output[4][i]; // BC 644 + break; 645 + case 5: 646 + if (ctx->acmod == 5) { 647 + *(out_samples++) = ctx->int_output[0][i]; // FL 648 + *(out_samples++) = ctx->int_output[2][i]; // FR 649 + *(out_samples++) = ctx->int_output[1][i]; // FC 650 + *(out_samples++) = ctx->int_output[4][i]; // LFE 651 + *(out_samples++) = ctx->int_output[3][i]; // BC 652 + } else { // acmod 6 653 + *(out_samples++) = ctx->int_output[0][i]; // FL 654 + *(out_samples++) = ctx->int_output[1][i]; // FR 655 + *(out_samples++) = ctx->int_output[4][i]; // LFE 656 + *(out_samples++) = ctx->int_output[2][i]; // BL 657 + *(out_samples++) = ctx->int_output[3][i]; // BR 658 + } 659 + break; 660 + case 4: 661 + if (ctx->acmod == 3) { 662 + *(out_samples++) = ctx->int_output[0][i]; // FL 663 + *(out_samples++) = ctx->int_output[2][i]; // FR 664 + *(out_samples++) = ctx->int_output[1][i]; // FC 665 + *(out_samples++) = ctx->int_output[3][i]; // LFE 666 + } else { // acmod 4 667 + *(out_samples++) = ctx->int_output[0][i]; // FL 668 + *(out_samples++) = ctx->int_output[1][i]; // FR 669 + *(out_samples++) = ctx->int_output[3][i]; // LFE 670 + *(out_samples++) = ctx->int_output[2][i]; // BC 671 + } 672 + break; 673 + default: 674 + for (ch = 0; ch < avctx->channels; ch++) 675 + *(out_samples++) = ctx->int_output[ch][i]; 676 + } 677 + } else { 678 + switch (ctx->out_channels) { 679 + case 5: 680 + *(out_samples++) = ctx->int_output[0][i]; // FL 681 + *(out_samples++) = ctx->int_output[2][i]; // FR 682 + *(out_samples++) = ctx->int_output[1][i]; // FC 683 + *(out_samples++) = ctx->int_output[3][i]; // BL 684 + *(out_samples++) = ctx->int_output[4][i]; // BC 685 + break; 686 + case 4: 687 + if (ctx->acmod == 5) { 688 + *(out_samples++) = ctx->int_output[0][i]; // FL 689 + *(out_samples++) = ctx->int_output[2][i]; // FR 690 + *(out_samples++) = ctx->int_output[1][i]; // FC 691 + *(out_samples++) = ctx->int_output[3][i]; // BC 692 + } else { // acmod 6 693 + *(out_samples++) = ctx->int_output[0][i]; // FL 694 + *(out_samples++) = ctx->int_output[1][i]; // FR 695 + *(out_samples++) = ctx->int_output[2][i]; // BL 696 + *(out_samples++) = ctx->int_output[3][i]; // BR 697 + } 698 + break; 699 + case 3: 700 + if (ctx->acmod == 3) { 701 + *(out_samples++) = ctx->int_output[0][i]; // FL 702 + *(out_samples++) = ctx->int_output[2][i]; // FR 703 + *(out_samples++) = ctx->int_output[1][i]; // FC 704 + } else { // acmod 4 705 + *(out_samples++) = ctx->int_output[0][i]; // FL 706 + *(out_samples++) = ctx->int_output[1][i]; // FR 707 + *(out_samples++) = ctx->int_output[2][i]; // BC 708 + } 709 + break; 710 + default: 711 + for (ch = 0; ch < ctx->out_channels; ch++) 712 + *(out_samples++) = ctx->int_output[ch][i]; 713 + } 714 + } 715 + } 716 *data_size = NB_BLOCKS * 256 * avctx->channels * sizeof (int16_t); 717 return ctx->frame_size; 718 } 719 720 721 --- mplayer-1.0.rc2svn20071207/libavcodec/ac3dec.h 2007-09-26 18:28:13.000000000 +0200 722 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/ac3dec.h 2007-09-26 18:06:07.000000000 +0200 723 @@ -0,0 +1,103 @@ 724 +/* 725 + * Common code between AC3 encoder and decoder 726 + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard. 727 + * 728 + * This file is part of FFmpeg. 729 + * 730 + * FFmpeg is free software; you can redistribute it and/or 731 + * modify it under the terms of the GNU Lesser General Public 732 + * License as published by the Free Software Foundation; either 733 + * version 2.1 of the License, or (at your option) any later version. 734 + * 735 + * FFmpeg is distributed in the hope that it will be useful, 736 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 737 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 738 + * Lesser General Public License for more details. 739 + * 740 + * You should have received a copy of the GNU Lesser General Public 741 + * License along with FFmpeg; if not, write to the Free Software 742 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 743 + */ 744 + 745 +/** 746 + * @file ac3.h 747 + * Common code between AC3 encoder and decoder. 748 + */ 749 + 750 +#ifndef AC3DEC_H 751 +#define AC3DEC_H 752 + 753 +#include "ac3tab.h" 754 +#include "bitstream.h" 755 +#include "random.h" 756 + 757 +#define CPL_CH 0 758 + 759 +void ff_ac3_window_init(float *window); 760 +void ff_ac3_tables_init(void); 761 + 762 +/** tables for ungrouping mantissas */ 763 +extern float ff_ac3_b1_mantissas[32][3]; 764 +extern float ff_ac3_b2_mantissas[128][3]; 765 +extern float ff_ac3_b3_mantissas[8]; 766 +extern float ff_ac3_b4_mantissas[128][2]; 767 +extern float ff_ac3_b5_mantissas[16]; 768 + 769 +/** dynamic range table. converts codes to scale factors. */ 770 +extern float ff_ac3_dynrng_tbl[256]; 771 + 772 +/** dialogue normalization table */ 773 +extern float ff_ac3_dialnorm_tbl[32]; 774 + 775 +/** 776 + * table for exponent to scale_factor mapping 777 + * ff_ac3_scale_factors[i] = 2 ^ -i 778 + */ 779 +extern float ff_ac3_scale_factors[25]; 780 + 781 +/** table for grouping exponents */ 782 +extern uint8_t ff_ac3_exp_ungroup_tbl[128][3]; 783 + 784 +/** 785 + * Decode the grouped exponents according to exponent strategy. 786 + * reference: Section 7.1.3 Exponent Decoding 787 + */ 788 +void ff_ac3_decode_exponents(GetBitContext *gb, int expstr, int ngrps, 789 + uint8_t absexp, int8_t *dexps); 790 + 791 +/** 792 + * Grouped mantissas for 3-level 5-level and 11-level quantization 793 + */ 794 +typedef struct { 795 + float b1_mant[3]; 796 + float b2_mant[3]; 797 + float b4_mant[2]; 798 + int b1ptr; 799 + int b2ptr; 800 + int b4ptr; 801 +} mant_groups; 802 + 803 +int ff_ac3_get_transform_coeffs_ch(mant_groups *m, GetBitContext *gb, uint8_t *exps, 804 + uint8_t *bap, float *coeffs, int start, int end, AVRandomState *dith_state); 805 + 806 +void ff_ac3_do_rematrixing(float (*transform_coeffs)[256], int end, int nrematbnd, int *rematflg); 807 + 808 +void ff_ac3_do_imdct_256(float *tmp_output, float *transform_coeffs, 809 + MDCTContext *imdct_256, float *tmp_imdct); 810 + 811 +void ff_ac3_downmix(float samples[AC3_MAX_CHANNELS][256], int nfchans, 812 + int output_mode, float coef[AC3_MAX_CHANNELS][2]); 813 + 814 +/** Adjustments in dB gain */ 815 +#define LEVEL_PLUS_3DB 1.4142135623730950 816 +#define LEVEL_PLUS_1POINT5DB 1.1892071150027209 817 +#define LEVEL_MINUS_1POINT5DB 0.8408964152537145 818 +#define LEVEL_MINUS_3DB 0.7071067811865476 819 +#define LEVEL_MINUS_4POINT5DB 0.5946035575013605 820 +#define LEVEL_MINUS_6DB 0.5000000000000000 821 +#define LEVEL_MINUS_9DB 0.3535533905932738 822 +#define LEVEL_ZERO 0.0000000000000000 823 +#define LEVEL_ONE 1.0000000000000000 824 + 825 + 826 +#endif /* AC3DEC_H */ 827 828 --- mplayer-1.0.rc2svn20071207/libavcodec/ac3tab.c 2007-09-14 00:02:17.000000000 +0200 829 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/ac3tab.c 2007-09-14 00:03:58.000000000 +0200 830 @@ -25,6 +25,7 @@ 831 */ 832 833 #include "ac3tab.h" 834 +#include "ac3.h" 835 836 /** 837 * Possible frame sizes. 838 @@ -127,32 +128,32 @@ 839 }; 840 841 const uint8_t ff_ac3_latab[260]= { 842 -0x40,0x3f,0x3e,0x3d,0x3c,0x3b,0x3a,0x39,0x38,0x37, 843 -0x36,0x35,0x34,0x34,0x33,0x32,0x31,0x30,0x2f,0x2f, 844 -0x2e,0x2d,0x2c,0x2c,0x2b,0x2a,0x29,0x29,0x28,0x27, 845 -0x26,0x26,0x25,0x24,0x24,0x23,0x23,0x22,0x21,0x21, 846 -0x20,0x20,0x1f,0x1e,0x1e,0x1d,0x1d,0x1c,0x1c,0x1b, 847 -0x1b,0x1a,0x1a,0x19,0x19,0x18,0x18,0x17,0x17,0x16, 848 -0x16,0x15,0x15,0x15,0x14,0x14,0x13,0x13,0x13,0x12, 849 -0x12,0x12,0x11,0x11,0x11,0x10,0x10,0x10,0x0f,0x0f, 850 -0x0f,0x0e,0x0e,0x0e,0x0d,0x0d,0x0d,0x0d,0x0c,0x0c, 851 -0x0c,0x0c,0x0b,0x0b,0x0b,0x0b,0x0a,0x0a,0x0a,0x0a, 852 -0x0a,0x09,0x09,0x09,0x09,0x09,0x08,0x08,0x08,0x08, 853 -0x08,0x08,0x07,0x07,0x07,0x07,0x07,0x07,0x06,0x06, 854 -0x06,0x06,0x06,0x06,0x06,0x06,0x05,0x05,0x05,0x05, 855 -0x05,0x05,0x05,0x05,0x04,0x04,0x04,0x04,0x04,0x04, 856 -0x04,0x04,0x04,0x04,0x04,0x03,0x03,0x03,0x03,0x03, 857 -0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x02, 858 -0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02, 859 -0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x01,0x01, 860 -0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 861 -0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 862 -0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, 863 -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 864 -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 865 -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 866 -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 867 -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 868 +0x0040,0x003f,0x003e,0x003d,0x003c,0x003b,0x003a,0x0039,0x0038,0x0037, 869 +0x0036,0x0035,0x0034,0x0034,0x0033,0x0032,0x0031,0x0030,0x002f,0x002f, 870 +0x002e,0x002d,0x002c,0x002c,0x002b,0x002a,0x0029,0x0029,0x0028,0x0027, 871 +0x0026,0x0026,0x0025,0x0024,0x0024,0x0023,0x0023,0x0022,0x0021,0x0021, 872 +0x0020,0x0020,0x001f,0x001e,0x001e,0x001d,0x001d,0x001c,0x001c,0x001b, 873 +0x001b,0x001a,0x001a,0x0019,0x0019,0x0018,0x0018,0x0017,0x0017,0x0016, 874 +0x0016,0x0015,0x0015,0x0015,0x0014,0x0014,0x0013,0x0013,0x0013,0x0012, 875 +0x0012,0x0012,0x0011,0x0011,0x0011,0x0010,0x0010,0x0010,0x000f,0x000f, 876 +0x000f,0x000e,0x000e,0x000e,0x000d,0x000d,0x000d,0x000d,0x000c,0x000c, 877 +0x000c,0x000c,0x000b,0x000b,0x000b,0x000b,0x000a,0x000a,0x000a,0x000a, 878 +0x000a,0x0009,0x0009,0x0009,0x0009,0x0009,0x0008,0x0008,0x0008,0x0008, 879 +0x0008,0x0008,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0006,0x0006, 880 +0x0006,0x0006,0x0006,0x0006,0x0006,0x0006,0x0005,0x0005,0x0005,0x0005, 881 +0x0005,0x0005,0x0005,0x0005,0x0004,0x0004,0x0004,0x0004,0x0004,0x0004, 882 +0x0004,0x0004,0x0004,0x0004,0x0004,0x0003,0x0003,0x0003,0x0003,0x0003, 883 +0x0003,0x0003,0x0003,0x0003,0x0003,0x0003,0x0003,0x0003,0x0003,0x0002, 884 +0x0002,0x0002,0x0002,0x0002,0x0002,0x0002,0x0002,0x0002,0x0002,0x0002, 885 +0x0002,0x0002,0x0002,0x0002,0x0002,0x0002,0x0002,0x0002,0x0001,0x0001, 886 +0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001, 887 +0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001, 888 +0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001, 889 +0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 890 +0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 891 +0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 892 +0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 893 +0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 894 }; 895 896 const uint16_t ff_ac3_hth[50][3]= { 897 @@ -208,6 +209,16 @@ 898 { 0x0840,0x0840,0x04e0 }, 899 }; 900 901 +const uint8_t ff_ac3_hebaptab[64] = { 902 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 903 + 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 904 + 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 905 + 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 906 + 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 907 + 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 908 + 19, 19, 19, 19, 909 +}; 910 + 911 const uint8_t ff_ac3_baptab[64]= { 912 0, 1, 1, 1, 1, 1, 2, 2, 3, 3, 913 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 914 @@ -218,6 +229,11 @@ 915 15, 15, 15, 15, 916 }; 917 918 +const uint8_t ff_bits_vs_hebap[20] = { 919 + 0, 2, 3, 4, 5, 7, 8, 9, 3, 4, 920 + 5, 6, 7, 8, 9, 10, 11, 12, 14, 16, 921 +}; 922 + 923 const uint8_t ff_sdecaytab[4]={ 924 0x0f, 0x11, 0x13, 0x15, 925 }; 926 @@ -247,3 +263,1145 @@ 927 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 928 3, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 24, 24, 24, 24, 24 929 }; 930 + 931 +/** 932 + * Quantization table: levels for symmetric. bits for asymmetric. 933 + * reference: Table 7.18 Mapping of bap to Quantizer 934 + */ 935 +const uint8_t ff_qntztab[16] = { 936 + 0, 3, 5, 7, 11, 15, 937 + 5, 6, 7, 8, 9, 10, 11, 12, 14, 16 938 +}; 939 + 940 +const uint8_t ff_eac3_blocks[4] = { 941 + 1, 2, 3, 6 942 +}; 943 + 944 +const uint8_t ff_nfchans_tbl[8] = { 2, 1, 2, 3, 3, 4, 4, 5 }; 945 + 946 +/** 947 + * Table E3.6 948 + * Large mantissa inverse quantization (remapping) constants 949 + * ff_eac3_gaq_remap[hebap+8][x<0,x>=0][Gk=1,2,4][a,b] 950 + */ 951 +const int16_t ff_eac3_gaq_remap[12][2][3][2] = { 952 +{{{ 4681, 0}, { -10923, 16384}, { -4681, 8192}}, 953 + {{ 4681, 0}, { -10923, -5461}, { -4681, -1170}}}, 954 +{{{ 2185, 0}, { -14043, 16384}, { -6554, 8192}}, 955 + {{ 2185, 0}, { -14043, -11703}, { -6554, -4915}}}, 956 +{{{ 1057, 0}, { -15292, 16384}, { -7399, 8192}}, 957 + {{ 1057, 0}, { -15292, -14199}, { -7399, -6606}}}, 958 +{{{ 520, 0}, { -15855, 16384}, { -7802, 8192}}, 959 + {{ 520, 0}, { -15855, -15327}, { -7802, -7412}}}, 960 +{{{ 258, 0}, { -16124, 16384}, { -7998, 8192}}, 961 + {{ 258, 0}, { -16124, -15864}, { -7998, -7805}}}, 962 +{{{ 129, 0}, { -16255, 16384}, { -8096, 8192}}, 963 + {{ 129, 0}, { -16255, -16126}, { -8096, -7999}}}, 964 +{{{ 64, 0}, { -16320, 16384}, { -8144, 8192}}, 965 + {{ 64, 0}, { -16320, -16255}, { -8144, -8096}}}, 966 +{{{ 32, 0}, { -16352, 16384}, { -8168, 8192}}, 967 + {{ 32, 0}, { -16352, -16320}, { -8168, -8144}}}, 968 +{{{ 16, 0}, { -16368, 16384}, { -8180, 8192}}, 969 + {{ 16, 0}, { -16368, -16352}, { -8180, -8168}}}, 970 +{{{ 8, 0}, { 0, 0}, { 0, 0}}, 971 + {{ 8, 0}, { 0, 0}, { 0, 0}}}, 972 +{{{ 2, 0}, { 0, 0}, { 0, 0}}, 973 + {{ 2, 0}, { 0, 0}, { 0, 0}}}, 974 +{{{ 0, 0}, { 0, 0}, { 0, 0}}, 975 + {{ 0, 0}, { 0, 0}, { 0, 0}}}, 976 +}; 977 + 978 +/** 979 + * Map GAQ mode and gaqgain to Gk 980 + * Gk = 1 << ff_gaq_gk[GAQ Mode][gaqgain] 981 + */ 982 +const uint8_t ff_gaq_gk[4][3]={ 983 + {0, 0, 0}, 984 + {0, 1, 0}, 985 + {0, 2, 0}, 986 + {0, 1, 2} 987 +}; 988 + 989 +const int16_t ff_vq_hebap1[4][6] = { 990 +{ 7167, 4739, 1106, 4269, 10412, 4820}, 991 +{ -5702, -3187, -14483, -1392, -2027, 849}, 992 +{ 633, 6199, 7009, -12779, -2306, -2636}, 993 +{ -1468, -7031, 7592, 10617, -5946, -3062}, 994 +}; 995 +const int16_t ff_vq_hebap2[8][6] = { 996 +{ -12073, 608, -7019, 590, 4000, 869}, 997 +{ 6692, 15689, -6178, -9239, -74, 133}, 998 +{ 1855, -989, 20596, -2920, -4475, 225}, 999 +{ -1194, -3901, -821, -6566, -875, -20298}, 1000 +{ -2762, -3181, -4094, -5623, -16945, 9765}, 1001 +{ 1547, 6839, 1980, 20233, -1071, -4986}, 1002 +{ 6221, -17915, -5516, 6266, 358, 1162}, 1003 +{ 3753, -1066, 4283, -3227, 15928, 10186}, 1004 +}; 1005 +const int16_t ff_vq_hebap3[16][6] = { 1006 +{ -10028, 20779, 10982, -4560, 798, -68}, 1007 +{ 11050, 20490, -6617, -5342, -1797, -1631}, 1008 +{ 3977, -542, 7118, -1166, 18844, 14678}, 1009 +{ -4320, -96, -7295, -492, -22050, -4277}, 1010 +{ 2692, 5856, 5530, 21862, -7212, -5325}, 1011 +{ -135, -23391, 962, 8115, -644, 382}, 1012 +{ -1563, 3400, -3299, 4693, -6892, 22398}, 1013 +{ 3535, 3030, 7296, 6214, 20476, -12099}, 1014 +{ 57, -6823, 1848, -22349, -5919, 6823}, 1015 +{ -821, -3655, -387, -6253, -1735, -22373}, 1016 +{ -6046, 1586, -18890, -14392, 9214, 705}, 1017 +{ -5716, 264, -17964, 14618, 7921, -337}, 1018 +{ -110, 108, 8, 74, -89, -50}, 1019 +{ 6612, -1517, 21687, -1658, -7949, -246}, 1020 +{ 21667, -6335, -8290, -101, -1349, -22}, 1021 +{ -22003, -6476, 7974, 648, 2054, -331}, 1022 +}; 1023 +const int16_t ff_vq_hebap4[32][6] = { 1024 +{ 6636, -4593, 14173, -17297, -16523, 864}, 1025 +{ 3658, 22540, 104, -1763, -84, 6}, 1026 +{ 21580, -17815, -7282, -1575, -2078, -320}, 1027 +{ -2233, 10017, -2728, 14938, -13640, -17659}, 1028 +{ -1564, -17738, -19161, 13735, 2757, 2951}, 1029 +{ 4520, 5510, 7393, 10799, 19231, -13770}, 1030 +{ 399, 2976, -1099, 5013, -1159, 22095}, 1031 +{ 3624, -2359, 4680, -2238, 22702, 3765}, 1032 +{ -4201, -8285, -6810, -12390, -18414, 15382}, 1033 +{ -5198, -6869, -10047, -8364, -16022, -20562}, 1034 +{ -142, -22671, -368, 4391, -464, -13}, 1035 +{ 814, -1118, -1089, -22019, 74, 1553}, 1036 +{ -1618, 19222, -17642, -13490, 842, -2309}, 1037 +{ 4689, 16490, 20813, -15387, -4164, -3968}, 1038 +{ -3308, 11214, -13542, 13599, -19473, 13770}, 1039 +{ 1817, 854, 21225, -966, -1643, -268}, 1040 +{ -2587, -107, -20154, 376, 1174, -304}, 1041 +{ -2919, 453, -5390, 750, -22034, -978}, 1042 +{ -19012, 16839, 10000, -3580, 2211, 1459}, 1043 +{ 1363, -2658, -33, -4067, 1165, -21985}, 1044 +{ -8592, -2760, -17520, -15985, 14897, 1323}, 1045 +{ 652, -9331, 3253, -14622, 12181, 19692}, 1046 +{ -6361, 5773, -15395, 17291, 16590, -2922}, 1047 +{ -661, -601, 1609, 22610, 992, -1045}, 1048 +{ 4961, 9107, 11225, 7829, 16320, 18627}, 1049 +{ -21872, -1433, 138, 1470, -1891, -196}, 1050 +{ -19499, -18203, 11056, -516, 2543, -2249}, 1051 +{ -1196, -17574, 20150, 11462, -401, 2619}, 1052 +{ 4638, -8154, 11891, -15759, 17615, -14955}, 1053 +{ -83, 278, 323, 55, -154, 232}, 1054 +{ 7788, 1462, 18395, 15296, -15763, -1131}, 1055 +}; 1056 +const int16_t ff_vq_hebap5[128][6] = { 1057 +{ -3394, -19730, 2963, 9590, 4660, 19673}, 1058 +{ -15665, -6405, 17671, 3860, -8232, -19429}, 1059 +{ 4467, 412, -17873, -8037, 691, -17307}, 1060 +{ 3580, 2363, 6886, 3763, 6379, -20522}, 1061 +{ -17230, -14133, -1396, -23939, 8373, -12537}, 1062 +{ -8073, -21469, -15638, 3214, 8105, -5965}, 1063 +{ 4343, 5169, 2683, -16822, -5146, -16558}, 1064 +{ 6348, -10668, 12995, -25500, -22090, 4091}, 1065 +{ -2880, -8366, -5968, -17158, -2638, 23132}, 1066 +{ -5095, -14281, -22371, 21741, 3689, 2961}, 1067 +{ -2443, -17739, 25155, 2707, 1594, 7}, 1068 +{ -18379, 9010, 4270, 731, -426, -640}, 1069 +{ -23695, 24732, 5642, 612, -308, -964}, 1070 +{ -767, 1268, 225, 1635, 173, 916}, 1071 +{ 5455, 6493, 4902, 10560, 23041, -17140}, 1072 +{ 17219, -21054, -18716, 4936, -3420, 3357}, 1073 +{ -1390, 15488, -21946, -14611, 1339, 542}, 1074 +{ -6866, -2254, -12070, -3075, -19981, -20622}, 1075 +{ -1803, 11775, 1343, 8917, 693, 24497}, 1076 +{ -21610, 9462, 4681, 9254, -7815, 15904}, 1077 +{ -5559, -3018, -9169, -1347, -22547, 12868}, 1078 +{ -366, 5076, -1727, 20427, -283, -2923}, 1079 +{ -1886, -6313, -939, -2081, -1399, 3513}, 1080 +{ -3161, -537, -5075, 11268, 19396, 989}, 1081 +{ 2345, 4153, 5769, -4273, 233, -399}, 1082 +{ -21894, -1138, -16474, 5902, 5488, -3211}, 1083 +{ 10007, -12530, 18829, 20932, -1158, 1790}, 1084 +{ -1165, 5014, -1199, 6415, -8418, -21038}, 1085 +{ 1892, -3534, 3815, -5846, 16427, 20288}, 1086 +{ -2664, -11627, -4147, -18311, -22710, 14848}, 1087 +{ 17256, 10419, 7764, 12040, 18956, 2525}, 1088 +{ -21419, -18685, -10897, 4368, -7051, 4539}, 1089 +{ -1574, 2050, 5760, 24756, 15983, 17678}, 1090 +{ -538, -22867, 11067, 10301, 385, 528}, 1091 +{ -8465, -3025, -16357, -23237, 16491, 3654}, 1092 +{ 5840, 575, 11890, 1947, 25157, 6653}, 1093 +{ 6625, -3516, -1964, 3850, -390, -116}, 1094 +{ 18005, 20900, 14323, -7621, -10922, 11802}, 1095 +{ -4857, -2932, -13334, -7815, 21622, 2267}, 1096 +{ -579, -9431, -748, -21321, 12367, 8265}, 1097 +{ -8317, 1375, -17847, 2921, 9062, 22046}, 1098 +{ 18398, 8635, -1503, -2418, -18295, -14734}, 1099 +{ -2987, 15129, -3331, 22300, 13878, -13639}, 1100 +{ 5874, -19026, 15587, 11350, -20738, 1971}, 1101 +{ 1581, -6955, -21440, 2455, 65, 414}, 1102 +{ 515, -4468, -665, -4672, 125, -19222}, 1103 +{ 21495, -20301, -1872, -1926, -211, -1022}, 1104 +{ 5189, -12250, -1775, -23550, -4546, 5813}, 1105 +{ 321, -6331, 14646, 6975, -1773, 867}, 1106 +{ -13814, 3180, 7927, 444, 19552, 3146}, 1107 +{ -6660, 12252, -1972, 17408, -24280, -12956}, 1108 +{ -745, 14356, -1107, 23742, -9631, -18344}, 1109 +{ 18284, -7909, -7531, 19118, 7721, -12659}, 1110 +{ 1926, 15101, -12848, 2153, 21631, 1864}, 1111 +{ -2130, 23416, 17056, -15597, -1544, 87}, 1112 +{ 8314, -11824, 14581, -20591, 7891, -2099}, 1113 +{ 19600, 22814, -17304, -2040, 285, -3863}, 1114 +{ -8214, -18322, 10724, -13744, -13469, -1666}, 1115 +{ 14351, 4880, -20034, 964, -4221, -180}, 1116 +{ -24598, -16635, 19724, 5925, 4777, 4414}, 1117 +{ -2495, 23493, -16141, 2918, -1038, -2010}, 1118 +{ 18974, -2540, 13343, 1405, -6194, -1136}, 1119 +{ 2489, 13670, 22638, -7311, -129, -2792}, 1120 +{ -13962, 16775, 23012, 728, 3397, 162}, 1121 +{ 3038, 993, 8774, -21969, -6609, 910}, 1122 +{ -12444, -22386, -2626, -5295, 19520, 9872}, 1123 +{ -1911, -18274, -18506, -14962, 4760, 7119}, 1124 +{ 8298, -2978, 25886, 7660, -7897, 1020}, 1125 +{ 6132, 15127, 18757, -24370, -6529, -6627}, 1126 +{ 7924, 12125, -9459, -23962, 5502, 937}, 1127 +{ -17056, -5373, 2522, 327, 1129, -390}, 1128 +{ 15774, 19955, -10380, 11172, -3107, 14853}, 1129 +{ -11904, -8091, -17928, -22287, -17237, -6803}, 1130 +{ -12862, -2172, -6509, 5927, 12458, -22355}, 1131 +{ -497, 322, 1038, -6643, -5404, 20311}, 1132 +{ 1083, -22984, -8494, 12130, -762, 2623}, 1133 +{ 5067, 19712, -1901, -30, -325, 85}, 1134 +{ 987, -5830, 4212, -9030, 9121, -25038}, 1135 +{ -7868, 7284, -12292, 12914, -21592, 20941}, 1136 +{ -1630, -7694, -2187, -8525, -5604, -25196}, 1137 +{ -6668, 388, -22535, 1526, 9082, 193}, 1138 +{ -7867, -22308, 5163, 362, 944, -259}, 1139 +{ 3824, -11850, 7591, -23176, 25342, 23771}, 1140 +{ -10504, 4123, -21111, 21173, 22439, -838}, 1141 +{ -4723, 21795, 6184, -122, 1642, -717}, 1142 +{ 24504, 19887, -2043, 986, 7, -55}, 1143 +{ -27313, -135, 2437, 259, 89, 307}, 1144 +{ 24446, -3873, -5391, -820, -2387, 361}, 1145 +{ 5529, 5784, 18682, 242, -21896, -4003}, 1146 +{ 22304, 4483, 722, -12242, 7570, 15448}, 1147 +{ 8673, 3009, 20437, 21108, -21100, -3080}, 1148 +{ -1132, 2705, -1825, 5420, -785, 18532}, 1149 +{ 16932, -13517, -16509, -14858, -20327, -14221}, 1150 +{ 2219, 1380, 21474, -1128, 327, 83}, 1151 +{ -2177, 21517, -3856, -14180, -204, -2191}, 1152 +{ 953, -9426, 15874, -10710, -3231, 21030}, 1153 +{ -421, -1377, 640, -8239, -20976, 2174}, 1154 +{ 4309, 18514, -9100, -18319, -15518, 3704}, 1155 +{ -5943, 449, -8387, 1075, -22210, -4992}, 1156 +{ 2953, 12788, 18285, 1430, 14937, 21731}, 1157 +{ -2913, 401, -4739, -20105, 1699, -1147}, 1158 +{ 3449, 5241, 8853, 22134, -7547, 1451}, 1159 +{ -2154, 8584, 18120, -15614, 19319, -5991}, 1160 +{ 3501, 2841, 5897, 6397, 8630, 23018}, 1161 +{ 2467, 2956, 379, 5703, -22047, -2189}, 1162 +{ -16963, -594, 18822, -5295, 1640, 774}, 1163 +{ 2896, -1424, 3586, -2292, 19910, -1822}, 1164 +{ -18575, 21219, -14001, -12573, 16466, 635}, 1165 +{ -1998, -19314, -16527, 12208, -16576, -7854}, 1166 +{ -9674, 1012, -21645, 2883, -12712, 2321}, 1167 +{ -1005, 471, -3629, 8045, -11087, 25533}, 1168 +{ 4141, -21472, -2673, 756, -663, -523}, 1169 +{ 6490, 8531, 19289, 18949, 6092, -9347}, 1170 +{ 16965, 24599, 14024, 10072, -536, -10438}, 1171 +{ -8147, 2145, -23028, -17073, 5451, -4401}, 1172 +{ -14873, 20520, -18303, -9717, -11885, -17831}, 1173 +{ -2290, -14120, 2070, 22467, 1671, 725}, 1174 +{ -8538, 14629, 3521, -20577, 6673, 8200}, 1175 +{ 20248, 4410, -1366, -585, 1229, -2449}, 1176 +{ 7467, -7148, 13667, -8246, 22392, -17320}, 1177 +{ -1932, 3875, -9064, -3812, 958, 265}, 1178 +{ -4399, 2959, -15911, 19598, 4954, -1105}, 1179 +{ 18009, -9923, -18137, -3862, 11178, 5821}, 1180 +{ -14596, -1227, 9660, 21619, 11228, -11721}, 1181 +{ -721, -1700, 109, -2142, 61, -6772}, 1182 +{ -24619, -22520, 5608, -1957, -1761, -1012}, 1183 +{ -23728, -4451, -2688, -14679, -4266, 9919}, 1184 +{ 8495, -894, 20438, -13820, -17267, 139}, 1185 +}; 1186 +const int16_t ff_vq_hebap6[256][6] = { 1187 +{ 10154, 7365, 16861, 18681, -22893, -3636}, 1188 +{ -2619, -3788, -5529, -5192, -9009, -20298}, 1189 +{ -5583, -22800, 21297, 7012, 745, 720}, 1190 +{ 428, -1459, 109, -3082, 361, -8403}, 1191 +{ 8161, 22401, 241, 1755, -874, -2824}, 1192 +{ 1140, 12643, 2306, 22263, -25146, -17557}, 1193 +{ -2609, 3379, 10337, -19730, -15468, -23944}, 1194 +{ -4040, -12796, -25772, 13096, 3905, 1315}, 1195 +{ 4624, -23799, 13608, 25317, -1175, 2173}, 1196 +{ -97, 13747, -5122, 23255, 4214, -22145}, 1197 +{ 6878, -322, 18264, -854, -11916, -733}, 1198 +{ 17280, -12669, -9693, 23563, -16240, -1309}, 1199 +{ 5802, -4968, 19526, -21194, -24622, -183}, 1200 +{ 5851, -16137, 15229, -9496, -1538, 377}, 1201 +{ 14096, 25057, 13419, 8290, 23320, 16818}, 1202 +{ -7261, 118, -15867, 19097, 9781, -277}, 1203 +{ -4288, 21589, -13288, -16259, 16633, -4862}, 1204 +{ 4909, -19217, 23411, 14705, -722, 125}, 1205 +{ 19462, -4732, -1928, -11527, 20770, 5425}, 1206 +{ -27562, -2881, -4331, 384, -2103, 1367}, 1207 +{ -266, -9175, 5441, 26333, -1924, 4221}, 1208 +{ -2970, -20170, -21816, 5450, -7426, 5344}, 1209 +{ -221, -6696, 603, -9140, 1308, -27506}, 1210 +{ 9621, -8380, -1967, 9403, -1651, 22817}, 1211 +{ 7566, -5250, -4165, 1385, -990, 560}, 1212 +{ -1262, 24738, -19057, 10741, 7585, -7098}, 1213 +{ 451, 20130, -9949, -6015, -2188, -1458}, 1214 +{ 22249, 9380, 9096, 10959, -2365, -3724}, 1215 +{ 18668, -650, -1234, 11092, 7678, 5969}, 1216 +{ 19207, -1485, -1076, -731, -684, 43}, 1217 +{ -4973, 13430, 20139, 60, 476, -935}, 1218 +{ -20029, 8710, 2499, 1016, -1158, 335}, 1219 +{ -26413, 18598, -2201, -669, 3409, 793}, 1220 +{ -4726, 8875, -24607, -9646, 3643, -283}, 1221 +{ 13303, -21404, -3691, -1184, -1970, 1612}, 1222 +{ 173, 60, 919, 1229, 6942, -665}, 1223 +{ 16377, 16991, 5341, -14015, -2304, -20390}, 1224 +{ 25334, -10609, 11947, -7653, -6363, 14058}, 1225 +{ 23929, -13259, -7226, -937, 234, -187}, 1226 +{ 6311, -1877, 12506, -1879, 18751, -23341}, 1227 +{ 621, 6445, 3354, -24274, 8406, 5315}, 1228 +{ -3297, -5034, -4704, -5080, -25730, 5347}, 1229 +{ -1275, -13295, -965, -23318, 1214, 26259}, 1230 +{ -6252, 10035, -20105, 15301, -16073, 5136}, 1231 +{ 9562, -3911, -19510, 4745, 22270, -4171}, 1232 +{ 7978, -19600, 14024, -5745, -20855, 8939}, 1233 +{ 7, -4039, 991, -6065, 52, -19423}, 1234 +{ 3485, 2969, 7732, 7786, 25312, 6206}, 1235 +{ -959, -12812, -1840, -22743, 7324, 10830}, 1236 +{ -4686, 1678, -10172, -5205, 4294, -1271}, 1237 +{ 3889, 1302, 7450, 638, 20374, -3133}, 1238 +{ -12496, -9123, 18463, -12343, -7238, 18552}, 1239 +{ -6185, 8649, -6903, -895, 17109, 16604}, 1240 +{ -9896, 28579, 2845, 1640, 2925, -298}, 1241 +{ 14968, -25988, 14878, -24012, 1815, -6474}, 1242 +{ 26107, 5166, 21225, 15873, 21617, 14825}, 1243 +{ -21684, 16438, 20504, -14346, -7114, -4162}, 1244 +{ 28647, 90, -1572, 789, -902, -75}, 1245 +{ -1479, 2471, -4061, 3612, -2240, 10914}, 1246 +{ 8616, 17491, 17255, -17456, 17022, -16357}, 1247 +{ -20722, -18597, 25274, 17720, -3573, 1695}, 1248 +{ -997, 6129, -6303, 11250, -11359, -19739}, 1249 +{ -74, -4001, -1584, 13384, 162, -144}, 1250 +{ -529, 21068, 7923, -11396, 422, -26}, 1251 +{ 7102, -13531, -20055, 2629, -178, -429}, 1252 +{ 9201, 1368, -22238, 2623, -20499, 24889}, 1253 +{ -432, 6675, -266, 8723, 80, 28024}, 1254 +{ 19493, -3108, -9261, 1910, -21777, 5345}, 1255 +{ 14079, -11489, 12604, 6079, 19877, 1315}, 1256 +{ 10947, 9837, -18612, 15742, 4792, 605}, 1257 +{ -1777, 3758, -4087, 21696, 6024, -576}, 1258 +{ 3567, -3578, 16379, 2680, -1752, 716}, 1259 +{ -5049, -1399, -4550, -652, -17721, -3366}, 1260 +{ -3635, -4372, -6522, -22152, 7382, 1458}, 1261 +{ 12242, 19190, 5646, -7815, -20289, 21344}, 1262 +{ -7508, 19952, 23542, -9753, 5669, -1990}, 1263 +{ -2275, 15438, 10907, -17879, 6497, 13582}, 1264 +{ -15894, -15646, -4716, 6019, 24250, -6179}, 1265 +{ -2049, -6856, -1208, 918, 17735, -69}, 1266 +{ -3721, 9099, -16065, -23621, 5981, -2344}, 1267 +{ 7862, -8918, 24033, 25508, -11033, -741}, 1268 +{ -12588, 19468, 14649, 15451, -21226, 1171}, 1269 +{ 2102, 1147, 2789, 4096, 2179, 8750}, 1270 +{ -18214, -17758, -10366, -5203, -1066, -3541}, 1271 +{ -2819, -19958, -11921, 6032, 8315, 10374}, 1272 +{ -9078, -2100, 19431, -17, 732, -689}, 1273 +{ -14512, -19224, -7095, 18727, 1870, 22906}, 1274 +{ 3912, 659, 25597, -4006, 9619, 877}, 1275 +{ 2616, 22695, -5770, 17920, 3812, 20220}, 1276 +{ 2561, 26847, -5245, -10908, 2256, -517}, 1277 +{ -4974, 198, -21983, -3608, 22174, -18924}, 1278 +{ 21308, -1211, 19144, 16691, -1588, 11390}, 1279 +{ -1790, 3959, -3488, 7003, -7107, 20877}, 1280 +{ -6108, -17955, -18722, 24763, 16508, 3211}, 1281 +{ 20462, -24987, -20361, 4484, -5111, -478}, 1282 +{ -6378, -1998, -10229, -561, -22039, -22339}, 1283 +{ 3047, -18850, 7586, 14743, -19862, 6351}, 1284 +{ -5047, 1405, -9672, 1055, -21881, 11170}, 1285 +{ 3481, -9699, 6526, -16655, 22813, 21907}, 1286 +{ -18570, 17501, 14664, 1291, 5026, 19676}, 1287 +{ 16134, -19810, -16956, -17939, -16933, 5800}, 1288 +{ -8224, 4908, 8935, 2272, -1140, -23217}, 1289 +{ 1572, 2753, -1598, 2143, -3346, -21926}, 1290 +{ -9832, -1060, -27818, 1214, 7289, 150}, 1291 +{ 98, 1538, 535, 17429, -23198, -901}, 1292 +{ 21340, -20146, 3297, -1744, -8207, -21462}, 1293 +{ -4166, -4633, -17902, 5478, 1285, 136}, 1294 +{ 18713, 21003, 24818, 11421, 1282, -4618}, 1295 +{ -3535, 7636, -265, 2141, -829, -2035}, 1296 +{ -3184, 19713, 2775, -2, 1090, 104}, 1297 +{ -6771, -20185, 2938, -2125, -36, 1268}, 1298 +{ 9560, 9430, 9586, 22100, 13827, 6296}, 1299 +{ -535, -20018, 4276, -1868, -448, -17183}, 1300 +{ -24352, 14244, -13647, -21040, 2271, 11555}, 1301 +{ -2646, 15437, -4589, 18638, -4299, -622}, 1302 +{ -20064, 4169, 18115, -1404, 13722, -1825}, 1303 +{ -16359, 9080, 744, 22021, 125, 10794}, 1304 +{ 9644, -14607, -18479, -14714, 11174, -20754}, 1305 +{ -326, -23762, 6144, 7909, 602, 1540}, 1306 +{ -6650, 6634, -12683, 21396, 20785, -6839}, 1307 +{ 4252, -21043, 5628, 18687, 23860, 8328}, 1308 +{ 17986, 5704, -5245, -18093, -555, 3219}, 1309 +{ 6091, 14232, -5117, -17456, -19452, -11649}, 1310 +{ -21586, 11302, 15434, 25590, 6777, -26683}, 1311 +{ 21355, -8244, 5877, -3540, 6079, -2567}, 1312 +{ 2603, -2455, 5421, -12286, -19100, 5574}, 1313 +{ -1721, -26393, -23664, 22904, -349, 3787}, 1314 +{ 2189, -1203, 5340, 3249, -22617, 104}, 1315 +{ -1664, -11020, -2857, -20723, -24049, 19900}, 1316 +{ 22873, -7345, -18481, -14616, -8400, -12965}, 1317 +{ 3777, 3958, 8239, 20494, -6991, -1201}, 1318 +{ -160, -1613, -793, -8681, 573, 776}, 1319 +{ 4297, -3786, 20373, 6082, -5321, -18400}, 1320 +{ 18745, 2463, 12546, -7749, -7734, -2183}, 1321 +{ 11074, -4720, 22119, 1825, -24351, 4080}, 1322 +{ 1503, -19178, -1569, 13, -313, 375}, 1323 +{ 318, -575, 2544, 178, 102, 40}, 1324 +{ -15996, -26897, 5008, 3320, 686, 1159}, 1325 +{ 25755, 26886, 574, -5930, -3916, 1407}, 1326 +{ -9148, -7665, -2875, -8384, -18663, 26400}, 1327 +{ -7445, -18040, -18396, 8802, -2252, -21886}, 1328 +{ 7851, 11773, 27485, -12847, -1410, 19590}, 1329 +{ 2240, 5947, 11247, 15980, -6499, 24280}, 1330 +{ 21673, -18515, 9771, 6550, -2730, 334}, 1331 +{ -4149, 1576, -11010, 89, -24429, -5710}, 1332 +{ 7720, 1478, 21412, -25025, -8385, 9}, 1333 +{ -2448, 10218, -12756, -16079, 1161, -21284}, 1334 +{ -8757, -14429, -22918, -14812, 2629, 13844}, 1335 +{ -7252, 2843, -9639, 2882, -14625, 24497}, 1336 +{ -674, -6530, 414, -23333, -21343, 454}, 1337 +{ 2104, -6312, 10887, 18087, -1199, 175}, 1338 +{ -493, -562, -2739, 118, -1074, 93}, 1339 +{ -10011, -4075, -28071, 22180, 15077, -636}, 1340 +{ -4637, -16408, -9003, -20418, -11608, -20932}, 1341 +{ 4815, 15892, 24238, -13634, -3074, -1059}, 1342 +{ -6724, 4610, -18772, -15283, -16685, 23988}, 1343 +{ 15349, -674, -3682, 21679, 4475, -12088}, 1344 +{ 4756, 2593, 5354, 6001, 15063, 26490}, 1345 +{ -23815, -17251, 6944, 378, 694, 670}, 1346 +{ 23392, -8839, -14713, 7544, -876, 11088}, 1347 +{ 3640, 3336, 22593, -3495, -2328, -113}, 1348 +{ 284, 6914, 3097, 10171, 6638, -18621}, 1349 +{ 2472, 5976, 11054, -11936, -603, -663}, 1350 +{ 16175, 16441, 13164, -4043, 4667, 7431}, 1351 +{ 19338, 15534, -6533, 1681, -4857, 17048}, 1352 +{ 17027, 532, -19064, -1441, -5130, 1085}, 1353 +{ -12617, -17609, 2062, -25332, 19009, -16121}, 1354 +{ 10056, -21000, -13634, -2949, 15367, 19934}, 1355 +{ -648, -1605, 10046, -1592, 13296, 19808}, 1356 +{ -1054, 10744, 538, 24938, 9630, -9052}, 1357 +{ -10099, 3042, -25076, -24052, 13971, 100}, 1358 +{ 6547, 6907, 7031, 10348, 23775, -17886}, 1359 +{ -22793, -1984, -1393, -3330, 9267, 14317}, 1360 +{ -14346, -3967, 3042, 16254, -17303, 9646}, 1361 +{ -21393, 23628, 16773, 716, 2663, 114}, 1362 +{ -19016, -3038, 1574, -245, 1463, -793}, 1363 +{ 22410, 23441, -14637, -530, 17310, 13617}, 1364 +{ -11582, 7935, -13954, 23465, -24628, 26550}, 1365 +{ -1045, 3679, -2218, 10572, 20999, -3702}, 1366 +{ -15513, 197, 16718, -24603, 4945, 5}, 1367 +{ 10781, 4335, 26790, -9059, -16152, -2840}, 1368 +{ 16075, -24100, -3933, -6833, 12645, -7029}, 1369 +{ 2096, -25572, -8370, 6814, 11, 1178}, 1370 +{ -11848, -583, -8889, -20543, -10471, -380}, 1371 +{ -2487, 24777, -21639, -19341, 1660, -732}, 1372 +{ 2313, 13679, 4085, 24549, 24691, -21179}, 1373 +{ -2366, -504, -4130, -10570, 23668, 1961}, 1374 +{ 20379, 17809, -9506, 3733, -18954, -6292}, 1375 +{ -3856, 16802, -929, -20310, -17739, 6797}, 1376 +{ 12431, 6078, -11272, -14450, 6913, 23476}, 1377 +{ 7636, -1655, 23017, 10719, -8292, 838}, 1378 +{ -8559, -1235, -18096, 3897, 16093, 1490}, 1379 +{ -3586, 8276, 15165, -3791, -21149, 1741}, 1380 +{ -4497, 21739, 2366, -278, -4792, 15549}, 1381 +{ -23122, -13708, 7668, 16232, 24120, 15025}, 1382 +{ -20043, 12821, -20160, 16691, -11655, -16081}, 1383 +{ -12601, 20239, 3496, -2549, -6745, -11850}, 1384 +{ 4441, 7812, 20783, 17080, 11523, -9643}, 1385 +{ 24766, 8494, -23298, -3262, 11101, -7120}, 1386 +{ -10107, -7623, -22152, -18303, 26645, 9550}, 1387 +{ -25549, 477, 7874, -1538, 1123, -168}, 1388 +{ 470, 9834, -347, 23945, -10381, -9467}, 1389 +{ -4096, -9702, -6856, -21544, 20845, 7174}, 1390 +{ 5370, 9748, -23765, -1190, 512, -1538}, 1391 +{ -1006, -10046, -12649, 19234, -1790, -890}, 1392 +{ 15108, 23620, -15646, -2522, -1203, -1325}, 1393 +{ -7406, -2605, 1095, -247, -473, 177}, 1394 +{ 8089, 4, 12424, -22284, 10405, -7728}, 1395 +{ 22196, 10775, -5043, 690, 534, -212}, 1396 +{ -3153, -1418, -16835, 18426, 15821, 22956}, 1397 +{ 5681, -2229, 3196, -3414, -21817, -14807}, 1398 +{ 19, 787, 1032, 170, -8295, -645}, 1399 +{ -882, -2319, -27105, 432, -4392, 1499}, 1400 +{ -1354, -11819, -76, -20380, -10293, 11328}, 1401 +{ 211, -4753, -4675, -6933, -13538, 14479}, 1402 +{ 6043, 5260, -459, -462, 143, -65}, 1403 +{ -2572, 7256, -3317, 9212, -23184, -9990}, 1404 +{ -24882, -9532, 18874, 6101, 2429, -14482}, 1405 +{ 8314, 2277, 14192, 3512, 25881, 22000}, 1406 +{ 208, 20218, -281, -24778, -63, -1183}, 1407 +{ 1095, -6034, 2706, -21935, -2655, 563}, 1408 +{ 23, -5930, 243, -8989, 5345, 20558}, 1409 +{ -15466, 12699, 4160, 11087, 20621, -10416}, 1410 +{ 20995, -85, -8468, 194, 1003, -9515}, 1411 +{ -19637, -3335, -14081, 3574, -23381, -667}, 1412 +{ -2076, 3489, -3192, -19367, 539, -1530}, 1413 +{ 7352, -15213, 22596, 19369, 1043, 16627}, 1414 +{ -1872, -413, 1235, -5276, -3550, 21903}, 1415 +{ 7931, -2008, 16968, -6799, 29393, -2475}, 1416 +{ -13589, 8389, -23636, -22091, -14178, -14297}, 1417 +{ -11575, -20090, 16056, -1848, 15721, 4500}, 1418 +{ 3849, -16581, 20161, -21155, 7778, 11864}, 1419 +{ -6547, -1273, -18837, -11218, 11636, 1044}, 1420 +{ 2528, -6691, -17917, -11362, -4894, -1008}, 1421 +{ 1241, 4260, 2319, 6111, 3485, 20209}, 1422 +{ 3014, -3048, 5316, -4539, 20831, 8702}, 1423 +{ -1790, -14683, 278, 13956, -10065, -10547}, 1424 +{ -22732, -7957, -1154, 13821, -1484, -1247}, 1425 +{ -7317, -615, 13094, 18927, 9897, 1452}, 1426 +{ 2552, -2338, 3424, -4630, 11124, -19584}, 1427 +{ -11125, -20553, -10855, -10783, -20767, 6833}, 1428 +{ 984, -15095, 5775, 25125, 5377, -19799}, 1429 +{ 517, 13272, -7458, -1711, 20612, -6013}, 1430 +{ -21417, 13251, -20795, 13449, 17281, 13104}, 1431 +{ -15811, -16248, 23093, -4037, -8195, 871}, 1432 +{ 582, 12571, -21129, -14766, -9187, 5685}, 1433 +{ 4318, -1776, 11425, -17763, -9921, 577}, 1434 +{ 6013, 16830, 17655, -25766, -4400, -3550}, 1435 +{ -13744, -16541, 3636, -3330, -21091, -15886}, 1436 +{ 6565, -11147, 8649, -13114, 23345, -13565}, 1437 +{ -2542, -9046, -7558, 29240, 3701, -383}, 1438 +{ -10612, 24995, 1893, -8210, 20920, -16210}, 1439 +{ 5276, 16726, 10659, 19940, -4799, -19324}, 1440 +{ -532, -9300, 27856, 4965, -241, 536}, 1441 +{ -765, -20706, -3412, 18870, 2765, 1420}, 1442 +{ -3059, 2708, -19022, -331, 3537, 116}, 1443 +}; 1444 +const int16_t ff_vq_hebap7[512][6] = { 1445 +{ -21173, 21893, 10390, 13646, 10718, -9177}, 1446 +{ -22519, -8193, 18328, -6629, 25518, -10848}, 1447 +{ 6800, -13758, -13278, 22418, 14667, -20938}, 1448 +{ 2347, 10516, 1125, -3455, 5569, 27136}, 1449 +{ -6617, 11851, -24524, 22937, 20362, -6019}, 1450 +{ -21768, 10681, -19615, -15021, -8478, -2081}, 1451 +{ -2745, 8684, -4895, 27739, 7554, -11961}, 1452 +{ -1020, 2460, -954, 4754, -627, -16368}, 1453 +{ -19702, 23097, 75, -13684, -2644, 2108}, 1454 +{ 4049, -2872, 5851, -4459, 22150, 12560}, 1455 +{ -21304, -17129, -730, 7419, -11658, -10523}, 1456 +{ 11332, 1792, 26666, 23518, -19561, -491}, 1457 +{ -17827, -16777, -13606, -14389, -22029, -2464}, 1458 +{ 1091, -5967, -7975, -16977, -20432, -21931}, 1459 +{ 18388, -1103, 1933, 13342, -17463, 18114}, 1460 +{ 22646, 17345, -9966, 17919, 18274, 698}, 1461 +{ 1484, 20297, -5754, -26515, 4941, -22263}, 1462 +{ -2603, 4587, -5842, 18464, 8767, -2568}, 1463 +{ -2797, -1602, 21713, 3099, -25683, 3224}, 1464 +{ -19027, 4693, -5007, 6060, 1972, -15095}, 1465 +{ -2189, 9516, -530, 20669, -4662, -8301}, 1466 +{ -22325, -8887, 2529, -11352, 5476, 998}, 1467 +{ 22100, -5052, 1651, -2657, 4615, 2319}, 1468 +{ 20855, -3078, -3330, 4105, 13470, 3069}, 1469 +{ 85, 17289, 10264, -14752, 214, 90}, 1470 +{ -26365, -18849, -19352, 19244, -10218, 9909}, 1471 +{ -9739, 20497, -6579, -6983, 2891, -738}, 1472 +{ 20575, -15860, -22913, 6870, 76, 327}, 1473 +{ 8744, -12877, -22945, -2372, -19424, -9771}, 1474 +{ -12886, 16183, 21084, 3821, 749, -13792}, 1475 +{ -15995, 18399, 2391, -17661, 19484, -6018}, 1476 +{ 1423, 11734, 4051, 19290, 6857, -19681}, 1477 +{ -5200, 9766, 18246, 2463, 18764, -4852}, 1478 +{ -597, 19498, 1323, -9096, -308, -1104}, 1479 +{ -3099, -25731, -15665, 25332, 4634, 2635}, 1480 +{ 19623, -2384, -7913, 11796, -9333, -14084}, 1481 +{ 2642, 26453, -21091, -10354, -1693, -1711}, 1482 +{ 22031, 21625, 11580, -22915, -4141, 129}, 1483 +{ -6122, 3542, 915, -261, -17, -383}, 1484 +{ 1696, 6704, -1425, 20838, 857, -4416}, 1485 +{ 1423, -15280, -8550, -9667, 5210, 5687}, 1486 +{ -4520, -613, -11683, 5618, 4230, 619}, 1487 +{ 937, -4963, -14102, -17104, -6906, -5952}, 1488 +{ -15068, -481, -7237, -14894, 18876, 21673}, 1489 +{ -25658, 2910, 1143, -327, -458, -995}, 1490 +{ -9656, -819, -24900, 2804, 20225, 1083}, 1491 +{ -1111, -3682, -1788, -19492, 966, 821}, 1492 +{ 7293, -21759, 10790, -7059, -23293, -1723}, 1493 +{ -282, -11093, 170, -20950, -28926, 12615}, 1494 +{ 17938, 3713, -1563, 885, 5, 564}, 1495 +{ 6116, 22696, 2242, -6951, 9975, -6132}, 1496 +{ 4338, 26808, -3705, 1976, -1079, -2570}, 1497 +{ -661, -7901, -2668, -15194, 17722, 4375}, 1498 +{ -4174, -11053, 717, -22506, 1562, 12252}, 1499 +{ -6405, 18334, 6103, 6983, 5956, 18195}, 1500 +{ 9851, 5370, 23604, -6861, -6569, -62}, 1501 +{ 21964, 13359, -683, 3785, 2168, 209}, 1502 +{ -3569, -1127, -19724, -1544, 1308, -803}, 1503 +{ -3083, 16049, -13791, -3077, 4294, 23713}, 1504 +{ -9999, 9943, -15872, 12934, -23631, 21699}, 1505 +{ 9722, 22837, 12192, 15091, 5533, 4837}, 1506 +{ 2243, 2099, 1243, 4089, 4748, 12956}, 1507 +{ 4007, -2468, 3353, -3092, 8843, 17024}, 1508 +{ 4330, 6127, 5549, 9249, 11226, 28592}, 1509 +{ -9586, -8825, 236, 1009, 455, -964}, 1510 +{ 6829, 19290, -1018, 200, 1821, 578}, 1511 +{ 5196, 957, 10372, 3330, -12800, -127}, 1512 +{ -3022, -8193, -14557, 22061, 5920, 1053}, 1513 +{ 10982, 25942, -24546, -23278, -11905, -6789}, 1514 +{ 22667, -11010, 5736, 2567, 23705, -10253}, 1515 +{ -3343, -4233, -5458, 20667, -10843, -3605}, 1516 +{ -4131, -3612, 4575, -829, -350, -847}, 1517 +{ -3303, 3451, -7398, -11604, 3023, 455}, 1518 +{ 3200, -9547, 3202, -22893, 11184, -26466}, 1519 +{ -14093, -4117, 15382, 14295, -10915, -20377}, 1520 +{ 3807, -11016, 22052, 14370, -15328, -7733}, 1521 +{ -6291, -17719, -1560, 12048, -19805, -443}, 1522 +{ -6147, -4234, -160, 8363, 22638, 11911}, 1523 +{ 19197, 1175, 7422, -9875, -4136, 4704}, 1524 +{ -72, -7652, -112, -11955, -3230, 27175}, 1525 +{ 3274, 5963, 7501, -17019, 866, -25452}, 1526 +{ 737, 1861, 1833, 2022, 2384, 4755}, 1527 +{ -5217, 7512, 3323, 2715, 3065, -1606}, 1528 +{ 4247, 565, 5629, 2497, 18019, -4920}, 1529 +{ -2833, -17920, -8062, 15738, -1018, 2136}, 1530 +{ 3050, -19483, 16930, 29835, -10222, 15153}, 1531 +{ -11346, 118, -25796, -13761, 15320, -468}, 1532 +{ -4824, 4960, -4263, 1575, -10593, 19561}, 1533 +{ -8203, -1409, -763, -1139, -607, 1408}, 1534 +{ -2203, -11415, 2021, -6388, -2600, 711}, 1535 +{ -413, -2511, -216, -3519, -28267, 1719}, 1536 +{ -14446, 17050, 13917, 13499, -25762, -16121}, 1537 +{ 19228, 7341, -12301, 682, -3791, -199}, 1538 +{ -4193, 20746, -15651, 11349, 5860, -824}, 1539 +{ -21490, -3546, -3, -1705, -3959, 9213}, 1540 +{ 15445, -1876, 2012, -19627, 16228, -4845}, 1541 +{ -2867, -3733, -7354, -175, -20119, 11174}, 1542 +{ -3571, -24587, 19700, 6654, 979, -654}, 1543 +{ 21820, -7430, -6639, -10767, -8362, 15543}, 1544 +{ 14827, 17977, -7204, -3409, 1906, -17288}, 1545 +{ 3525, -3947, -1415, -2798, 17648, 2082}, 1546 +{ -6580, -15255, -17913, 1337, 15338, 21158}, 1547 +{ 6210, 9698, 15155, -24666, -22507, -3999}, 1548 +{ -1740, -593, 1095, -7779, 25058, 5601}, 1549 +{ 21415, -432, -1658, -6898, -1438, -14454}, 1550 +{ -6943, 700, -12139, -745, -24187, 22466}, 1551 +{ 6287, 3283, 11006, 3844, 19184, 14781}, 1552 +{ -22502, 15274, 5443, -2808, -970, -3343}, 1553 +{ 3257, -3708, 4744, -8301, 22814, -10208}, 1554 +{ 24346, -20970, 19846, 987, -11958, -6277}, 1555 +{ 3906, -19701, 13060, -1609, 18641, 7466}, 1556 +{ -26409, -22549, 16305, 2014, 10975, 18032}, 1557 +{ -7039, 4655, -14818, 18739, 15789, 1296}, 1558 +{ 9310, -1681, 14667, -3326, 26535, -11853}, 1559 +{ 5728, 5917, 13400, 10020, -2236, -24704}, 1560 +{ 1741, -6727, 12695, -22009, 4080, 5450}, 1561 +{ -2621, 9393, 21143, -25938, -3162, -2529}, 1562 +{ 20672, 18894, -13939, 6990, -8260, 15811}, 1563 +{ -23818, 11183, -13639, 11868, 16045, 2630}, 1564 +{ 18361, -10220, 829, 856, -1010, 157}, 1565 +{ 14400, -4678, 5153, -13290, -27434, -11028}, 1566 +{ 21613, 11256, 17453, 7604, 13130, -484}, 1567 +{ 7, 1236, 573, 4214, 5576, -3081}, 1568 +{ 916, -9092, 1285, -8958, 1185, -28699}, 1569 +{ 21587, 23695, 19116, -2885, -14282, -8438}, 1570 +{ 23414, -6161, 12978, 3061, -9351, 2236}, 1571 +{ -3070, -7344, -20140, 5788, 582, -551}, 1572 +{ -3993, 315, -7773, 8224, -28082, -12465}, 1573 +{ 13766, -15357, 19205, -20624, 13043, -19247}, 1574 +{ 3777, -177, 8029, -1001, 17812, 5162}, 1575 +{ -7308, -4327, -18096, -620, -1350, 14932}, 1576 +{ 14756, -1221, -12819, -14922, -547, 27125}, 1577 +{ 2234, 1708, 2764, 5416, 7986, -25163}, 1578 +{ 2873, 3636, 3992, 5344, 10142, 21259}, 1579 +{ 1158, 5379, 508, -10514, 290, -1615}, 1580 +{ 1114, 24789, 16575, -25168, -298, -2832}, 1581 +{ -1107, -6144, -1918, -7791, -2971, -23276}, 1582 +{ 4016, 10793, 17317, -4342, -20982, -3383}, 1583 +{ -4494, -207, -9951, -3575, 7947, 1154}, 1584 +{ -7576, 8117, -14047, 16982, -26457, -27540}, 1585 +{ -15164, 16096, -16844, -8886, -23720, 15906}, 1586 +{ 24922, 5680, -1874, 420, 132, 117}, 1587 +{ -506, -19310, -198, 412, -311, 752}, 1588 +{ -1906, 3981, -7688, 16566, -19291, -14722}, 1589 +{ -399, -729, -3807, -4196, -12395, 7639}, 1590 +{ 3368, 2330, 9092, 23686, -10290, -1705}, 1591 +{ -3148, 2596, -7986, 14602, -4807, 16627}, 1592 +{ 8057, 1481, 49, 17205, 24869, 7474}, 1593 +{ -19304, -513, 11905, 2346, 5588, 3365}, 1594 +{ -5063, -21812, 11370, 10896, 4881, 261}, 1595 +{ 4794, 20577, 5109, -6025, -8049, -1521}, 1596 +{ 8125, -14756, 20639, -14918, 23941, -3650}, 1597 +{ 12451, 1381, 3613, 8687, -24002, 4848}, 1598 +{ 6726, 10643, 10086, 25217, -25159, -1065}, 1599 +{ 6561, 13977, 2911, 21737, 16465, -26050}, 1600 +{ -1776, 2575, -19606, -16800, 3032, 6679}, 1601 +{ 15012, -17910, -8438, -21554, -27111, 11808}, 1602 +{ 3448, -924, -15913, -1135, 5126, -20613}, 1603 +{ 7720, 2226, 17463, 5434, 28942, 17552}, 1604 +{ 1246, 15614, -11743, 24618, -17539, 3272}, 1605 +{ 3215, 17950, 2783, -722, -22672, 5979}, 1606 +{ -5678, -3184, -26087, 26034, 6583, 3302}, 1607 +{ 20310, -3555, -2715, -444, -1487, 1526}, 1608 +{ -20640, -21970, -12207, -25793, 8863, -1036}, 1609 +{ 17888, 570, -16102, 8329, -2553, 15275}, 1610 +{ -2677, 9950, -1879, 16477, -12762, -29007}, 1611 +{ -120, -2221, 219, 97, 365, 35}, 1612 +{ 1270, -718, 1480, -2689, 1930, -7527}, 1613 +{ 1896, 8750, 1906, 18235, -12692, -6174}, 1614 +{ -3733, 13713, -9882, -15960, -1376, -7146}, 1615 +{ -10600, 8496, 15967, -8792, 7532, 20439}, 1616 +{ 3041, -13457, 1032, -26952, 5787, 24984}, 1617 +{ -4590, -8220, -9322, -6112, -17243, 25745}, 1618 +{ -17808, 6970, 3752, 626, -114, 2178}, 1619 +{ 4449, -4862, 7054, -5404, 4738, -2827}, 1620 +{ 4922, -651, 18939, -9866, 848, 1886}, 1621 +{ -336, -5410, 7234, 20444, -9583, -600}, 1622 +{ 781, -19474, -12648, 6634, 1414, 450}, 1623 +{ -3399, -16770, 11107, 13200, -5498, 21663}, 1624 +{ -3265, 4859, -5961, 7530, -10837, 28086}, 1625 +{ 10350, -12901, 25699, 25640, -639, 351}, 1626 +{ 1163, 18763, -5466, -15087, -145, -1377}, 1627 +{ -14477, 27229, -31383, -32653, 21439, -2894}, 1628 +{ 15420, 18823, 22128, 19398, 22583, 13587}, 1629 +{ -10674, 10710, 5089, -4756, 909, -20760}, 1630 +{ -12948, -20660, 7410, 2722, 3427, 11585}, 1631 +{ -1105, 18374, 19731, -9650, 22442, 19634}, 1632 +{ -296, -6798, -14677, 21603, 19796, 21399}, 1633 +{ -19350, -7501, 25446, 13144, 8588, -25298}, 1634 +{ 3092, -10618, 20896, 9249, -3326, 1796}, 1635 +{ -811, 1449, 3106, 4748, 12073, -14262}, 1636 +{ -20720, 14275, -4332, -25838, -5781, -21149}, 1637 +{ -5132, 10554, -14020, -22150, 2840, -554}, 1638 +{ 25533, 17648, 14886, -21074, 2459, 25142}, 1639 +{ -9370, -1788, -12862, -5870, -25811, -11023}, 1640 +{ 6698, 819, 10313, 166, 27581, 523}, 1641 +{ 101, -19388, 3413, 9638, 64, 806}, 1642 +{ -2742, -17931, -2576, 22818, 8553, 1126}, 1643 +{ 2972, 15203, 1792, 25434, -5728, -17265}, 1644 +{ -1419, 1604, 4398, 11452, 1731, 23787}, 1645 +{ -5136, 4625, -10653, 27981, 9897, -2510}, 1646 +{ -10528, -28033, 2999, -1530, -832, -830}, 1647 +{ -11133, -12511, 22206, -7243, -23578, -21698}, 1648 +{ 16935, -21892, 1861, -9606, 9432, 19026}, 1649 +{ 10277, 9516, 26815, 2010, -4943, -9080}, 1650 +{ 5547, -2210, 14270, -15300, -19316, 1822}, 1651 +{ -4850, -783, -8959, -3076, -20056, -3197}, 1652 +{ 8232, -2794, -17752, 13308, 3229, -991}, 1653 +{ -12237, -6581, 10315, -9552, 2260, -20648}, 1654 +{ -7000, 5529, -7553, -7490, -10342, -10266}, 1655 +{ 3641, 19479, -5972, -19097, -18570, 12805}, 1656 +{ 1283, -4164, 4198, -28473, -2498, 1866}, 1657 +{ 16047, 26826, -13053, -6316, 985, -1597}, 1658 +{ -403, 13680, 6457, 25070, 27124, -20710}, 1659 +{ -18070, -1790, -24986, 5953, -954, 26600}, 1660 +{ -24224, -15383, 24788, 1953, -1136, 187}, 1661 +{ -2289, 12505, -20738, -904, 18324, 21258}, 1662 +{ 2658, -6140, 16179, 22276, -556, 2154}, 1663 +{ -6087, 13950, -25682, -27713, 4049, -4795}, 1664 +{ -21452, 26473, 19435, -9124, 895, 303}, 1665 +{ -22200, -26177, -6026, 24729, -22926, -9030}, 1666 +{ -14276, -15982, 23732, -22851, 9268, -3841}, 1667 +{ 29482, 21923, -6213, 1679, -2059, -1120}, 1668 +{ -435, 9802, -3891, 12359, -4288, -18971}, 1669 +{ 19768, -86, 2467, 1990, -1021, -5354}, 1670 +{ 20986, -8783, -5329, -23562, -4730, 2673}, 1671 +{ -5095, 5605, -4629, 19150, 26037, -12259}, 1672 +{ 972, 6858, 4551, 27949, -4025, -2272}, 1673 +{ 6075, -3260, -4989, -373, -1571, -3730}, 1674 +{ -7256, -12992, -8820, -5109, 23054, 5054}, 1675 +{ 920, 2615, 7912, -7353, -4905, 20186}, 1676 +{ -250, 5454, 3140, 6928, -18723, -2051}, 1677 +{ -10299, -4372, 19608, 4879, -661, -1885}, 1678 +{ 14816, -8603, -19815, 6135, -21210, 14108}, 1679 +{ -11945, -2223, 5018, 11892, 22741, 406}, 1680 +{ -13184, -2613, -13256, -22433, -12482, -8380}, 1681 +{ 17066, 25267, -2273, 5056, -342, 145}, 1682 +{ 8401, -17683, 19112, 10615, -19453, 17083}, 1683 +{ 20821, -5700, 12298, -25598, 10391, 7692}, 1684 +{ 4550, 15779, 17338, -19379, -4768, 1206}, 1685 +{ -7723, 10836, -27164, -11439, 6835, -1776}, 1686 +{ 2542, 3199, 4442, 17513, -3711, -914}, 1687 +{ 20960, -16774, -5814, 11087, -70, 22961}, 1688 +{ 3305, 2919, 6256, -4800, -20966, -3230}, 1689 +{ 5924, -16547, 2183, 2733, 3446, -23306}, 1690 +{ -6061, -194, -13852, -10971, 19488, 1029}, 1691 +{ 4467, -5964, -19004, 1519, -359, 855}, 1692 +{ -1581, -7607, 22070, -11580, -10032, 17102}, 1693 +{ -12412, 2553, 4324, 22500, 5751, 12170}, 1694 +{ -25127, 17996, -6384, 1180, 1182, 9622}, 1695 +{ 23462, -8471, -4392, -2669, 7638, -16835}, 1696 +{ -5511, -2887, -10757, -20883, 7246, 1053}, 1697 +{ 2703, -20602, -7554, 7516, -7740, 5868}, 1698 +{ 20670, 21901, 457, 14969, -17657, -11921}, 1699 +{ 3603, -1595, -2177, -157, -43, 605}, 1700 +{ 2513, 8954, 10527, 22559, -16100, -16041}, 1701 +{ 6002, 4951, 6795, -4862, -22400, 18849}, 1702 +{ 7590, -1693, -24688, -3404, 14169, 1214}, 1703 +{ -4398, -6663, -6870, -10083, -24596, 9253}, 1704 +{ 10468, 17751, -7748, 147, -6314, 4419}, 1705 +{ 16187, -16557, -4119, 4302, 7625, 5409}, 1706 +{ 3303, 2735, 7458, -19902, -2254, -3702}, 1707 +{ -2077, 21609, 14870, 12545, -6081, -1764}, 1708 +{ 4678, 11740, 2859, 6953, 1919, -3871}, 1709 +{ 3522, -21853, -2469, -10453, 18893, -10742}, 1710 +{ 3759, -10191, -4866, -2659, -17831, -1242}, 1711 +{ 14991, 9351, 11870, -1573, -4848, 22549}, 1712 +{ 9509, -27152, 10734, 20851, -26185, -17878}, 1713 +{ -7170, -1392, -19495, 12746, 8198, -1988}, 1714 +{ 1883, 28158, -846, -7235, 249, 233}, 1715 +{ -7200, 669, -371, -2948, 23234, -5635}, 1716 +{ 3141, 288, 3223, -1258, -98, -27607}, 1717 +{ 17373, -23235, 5110, -11199, -2574, -11487}, 1718 +{ -4928, 1518, -5456, 670, -18278, 1951}, 1719 +{ 10334, -19865, -4649, 361, -160, -923}, 1720 +{ 18732, 14264, -3155, -7485, -3328, 5959}, 1721 +{ -3614, 21077, 7276, 3536, 8121, -1528}, 1722 +{ -8422, 500, -19182, 18929, 26392, -1039}, 1723 +{ 15639, 25668, 8375, 1903, 1945, -11979}, 1724 +{ -2716, 3389, 26850, -4587, 1803, 22}, 1725 +{ 1177, -655, 1233, -2128, 7844, 1767}, 1726 +{ -761, 8209, -19290, -4593, 1923, -343}, 1727 +{ -689, -3530, -3267, -3804, -2753, 18566}, 1728 +{ -2110, 1962, -1353, 16643, 2765, -23102}, 1729 +{ -433, 4905, 302, 13016, 15933, -5905}, 1730 +{ 3203, 4126, 11181, -5496, -2529, -1160}, 1731 +{ -1091, -6469, -1415, 5682, -268, 583}, 1732 +{ -9405, -19572, 6216, 1658, 993, -75}, 1733 +{ -1695, -4504, -2289, -4088, -6556, -16577}, 1734 +{ 4760, -892, -10902, 6516, 24199, -6011}, 1735 +{ -253, 1000, 63, -81, -115, -382}, 1736 +{ -1333, 24224, -698, -4667, -2801, -19144}, 1737 +{ -876, -28866, -21873, 12677, -6344, 3235}, 1738 +{ 16847, 21145, -26172, -3183, -396, 230}, 1739 +{ 18296, -7790, -12857, -679, -1473, 5}, 1740 +{ -10488, 11429, 25805, -1122, 1401, -438}, 1741 +{ 3782, -7429, 26720, 17567, 19257, 12542}, 1742 +{ 6332, -746, 12789, 9316, -22542, -5354}, 1743 +{ 3418, -22728, 26978, 18303, 1076, 956}, 1744 +{ -27315, -2988, 920, 235, 2233, 81}, 1745 +{ 6199, 5296, 16093, 14768, -8429, -1112}, 1746 +{ -6432, 19244, 9921, -3253, 1278, -954}, 1747 +{ 24213, 2049, -22931, 2585, -2410, -4216}, 1748 +{ 9286, 14282, -19735, -3985, -2344, 1028}, 1749 +{ -20128, 17993, -9458, 23012, -16983, 8625}, 1750 +{ -6896, -20730, 3762, 17415, 22341, 19024}, 1751 +{ 842, 24181, 25062, -5839, -78, 937}, 1752 +{ -621, 19722, -24204, -1962, -14854, -56}, 1753 +{ 22766, -5119, 17365, 23868, -19480, -6558}, 1754 +{ -2158, 17490, -21435, 3340, -12819, -20295}, 1755 +{ -9621, 17325, 715, 2265, -4123, -492}, 1756 +{ 9156, 12947, 27303, -21175, -6072, -9457}, 1757 +{ -13164, -23269, -14006, -4184, 6978, 2}, 1758 +{ 938, -13381, 3520, -24297, 22902, 19589}, 1759 +{ -4911, -19774, 19764, -9310, -12650, 3819}, 1760 +{ -5462, -4249, -6987, -6260, -13943, -25150}, 1761 +{ 9341, 10369, -13862, -6704, 22556, -519}, 1762 +{ 6651, 18768, -4855, 12570, 14730, -10209}, 1763 +{ -823, 18119, 398, -1582, -116, -363}, 1764 +{ -6935, -12694, -28392, 8552, 6961, -239}, 1765 +{ -2602, -4704, -1021, 2015, 5129, 23670}, 1766 +{ -12559, -8190, -25028, 18544, 14179, 1663}, 1767 +{ 3813, 21036, -9620, -5051, -1800, -1087}, 1768 +{ -22057, 16675, 14960, 9459, 2786, 16991}, 1769 +{ -26040, -19318, -6414, 1104, 5798, -18039}, 1770 +{ -1737, 24825, 10417, -11087, 896, -5273}, 1771 +{ -1855, 11661, -2803, 24809, -21435, -19792}, 1772 +{ -23473, -16729, -5782, 5643, 2636, 4940}, 1773 +{ -1724, 4388, -26673, -13695, 10570, -25895}, 1774 +{ 15358, -19496, 26242, -18493, 1736, 8054}, 1775 +{ 5684, 20890, 4091, -19100, -14588, -10468}, 1776 +{ 17260, -16291, 14859, -17711, -19174, 12435}, 1777 +{ -27185, -12573, 6743, -562, 976, -257}, 1778 +{ 12395, -8618, -22248, -19843, 11013, 7762}, 1779 +{ 3799, 11853, -27622, -8473, 1089, -1495}, 1780 +{ 4141, -2182, -26720, -735, -774, 1469}, 1781 +{ 3125, 13762, 4606, 29257, 18771, -9958}, 1782 +{ -17465, -9445, -17562, -2530, -6435, -3726}, 1783 +{ -1742, 4351, -6841, -19773, 9627, -10654}, 1784 +{ 7251, 3525, 10835, 5601, 25198, -23348}, 1785 +{ -10300, -17830, 631, 11640, 2044, -20878}, 1786 +{ -873, -8502, -1063, -15674, -10693, 14934}, 1787 +{ -15957, 28137, 5268, 477, -1053, 1158}, 1788 +{ -1495, -8814, -5764, -24965, 25988, 7907}, 1789 +{ -1038, -114, -2308, -1319, -6480, 1472}, 1790 +{ 4895, -17897, -25850, 5301, -188, 1581}, 1791 +{ 3200, 17225, 4346, 22101, -18543, 22028}, 1792 +{ -10250, 545, -10932, 2276, -28070, 8118}, 1793 +{ 15343, 2329, 9316, 20537, 14908, 21021}, 1794 +{ 6329, 6130, -24508, 837, -8637, -5844}, 1795 +{ 7386, -501, 10503, 20131, 11435, -4755}, 1796 +{ -2745, 24174, -9274, 15273, -8389, -5835}, 1797 +{ 2992, -2864, 6048, -7473, 11687, -19996}, 1798 +{ -883, -11954, -9976, -21829, -4436, -27178}, 1799 +{ 3458, 19626, 1280, 2597, 19849, 5255}, 1800 +{ -5315, 19133, -14518, -8946, 13749, -1352}, 1801 +{ 18642, 17655, 11001, 6817, -18418, 6336}, 1802 +{ -1697, 2244, -4640, 3948, -12890, -5273}, 1803 +{ 20428, 10542, 4170, -1012, 19439, 21691}, 1804 +{ -2943, -19735, -4208, 1320, 909, -8897}, 1805 +{ 9351, -8066, -2618, -12933, 26582, 3507}, 1806 +{ 9705, -22628, 8311, 8167, -13293, 5608}, 1807 +{ 3222, 3749, -1508, 165, -52, -196}, 1808 +{ 102, -22744, -8832, 903, -11421, -14662}, 1809 +{ -120, 5998, 19765, 13401, 3628, 5197}, 1810 +{ 8528, 5827, -1066, 774, -39, -166}, 1811 +{ 9411, -9476, 9581, -13004, 24456, 24900}, 1812 +{ 17878, 2235, -21639, 20478, 4716, -7190}, 1813 +{ -2482, 9511, 1611, -21943, 14230, -1289}, 1814 +{ 9288, -2291, 23215, -3452, -10842, 11}, 1815 +{ 9496, 3041, 5130, -3890, -21219, -22589}, 1816 +{ 14262, -9838, 20195, 14019, 91, -17200}, 1817 +{ -18591, 980, 17, 821, 120, -574}, 1818 +{ 12285, -19269, 13742, 16373, -161, 6025}, 1819 +{ -3364, 1530, -4005, 2454, -10872, -23839}, 1820 +{ 105, 5085, -260, 5790, -588, 19170}, 1821 +{ 4121, 4169, 13439, 14644, 20899, 7434}, 1822 +{ -175, 13101, -3704, 23233, 3907, 10106}, 1823 +{ -6101, 23467, 5204, -1341, 1599, 13174}, 1824 +{ -3217, -3494, 15117, -8387, -11762, -4750}, 1825 +{ 1146, 4675, -19378, 14917, -5091, 249}, 1826 +{ -21506, 10136, -16473, -13305, 18382, -8601}, 1827 +{ 628, 2447, 3344, 3130, -5115, 119}, 1828 +{ 17900, -22422, -17633, 21967, -16293, -7676}, 1829 +{ 16863, 24214, 5612, -3858, -809, 3822}, 1830 +{ -2291, 10091, -2360, -25109, -1226, 312}, 1831 +{ 2957, 11256, 26745, -13266, -3455, -1128}, 1832 +{ -19762, -2708, 4604, 6355, 1638, 25501}, 1833 +{ -19593, -7753, 3159, -85, -489, -1855}, 1834 +{ 814, 12510, 19077, -4681, -2610, -1474}, 1835 +{ -23408, -19027, 8137, 19878, 7912, -282}, 1836 +{ 839, -19652, 11927, 27278, -3211, 2266}, 1837 +{ 4020, -1110, 8226, -1274, 20922, 25060}, 1838 +{ 26576, 325, -8693, -232, -2218, -699}, 1839 +{ -11293, -4200, 1805, -6673, -22940, -1339}, 1840 +{ -2005, -15886, -1047, -27687, -13235, 14370}, 1841 +{ -22073, 1949, 13175, -15656, -1846, 8055}, 1842 +{ 3039, 12025, 7132, -24632, 413, -2347}, 1843 +{ -24048, -206, 12459, -6654, -417, -10091}, 1844 +{ 18179, -23688, -20515, -16396, 7230, 763}, 1845 +{ 5659, -5085, 13878, -23729, -11077, -19587}, 1846 +{ 11340, 501, 25040, 7616, -19658, 1605}, 1847 +{ -26650, 8878, 10544, 417, 1299, 261}, 1848 +{ 14460, 11369, -3263, 9990, 8194, 18111}, 1849 +{ 1355, -20838, -9196, -16060, -8559, -730}, 1850 +{ -1918, -20937, -18293, -2461, -2651, 4316}, 1851 +{ -2810, 24521, -10996, -25721, 308, -1234}, 1852 +{ -9075, -17280, -1833, -29342, -24213, -16631}, 1853 +{ -2843, 10165, -5339, -2888, 21858, -21340}, 1854 +{ -15832, 14849, -23780, 5184, 10113, -20639}, 1855 +{ -19535, -11361, 8413, 1486, -23658, -5759}, 1856 +{ -7512, 1027, -20794, 13732, 19892, -21934}, 1857 +{ -12132, -7022, -19175, -8840, 22125, -16490}, 1858 +{ 1937, 5210, -6318, -23788, 13141, 11082}, 1859 +{ -205, 6036, -380, 8658, -233, 28020}, 1860 +{ -5523, 7477, 7635, 23595, 9763, -2590}, 1861 +{ 21658, -28313, -3086, -300, -1032, 1744}, 1862 +{ -22352, 16646, 208, 6665, -17400, -3028}, 1863 +{ 18482, 9336, -2737, -19372, 407, -4389}, 1864 +{ -4913, -17370, 18819, -17654, 13416, 15232}, 1865 +{ 7749, 6368, 23135, -18174, 7584, -4248}, 1866 +{ -1489, -6523, 586, -10157, 14964, 25568}, 1867 +{ 3844, -6156, 4897, -13045, -22526, 5647}, 1868 +{ -8491, -2105, -24774, 905, -9326, 1456}, 1869 +{ -3040, -1476, 1166, -4428, 11236, 9204}, 1870 +{ 3397, -1451, 13598, -15841, 24540, 5819}, 1871 +{ 8483, -2993, 21547, -16916, 7741, 24018}, 1872 +{ -14932, -23758, -5332, -6664, -4497, 13267}, 1873 +{ 19379, 12916, -2142, -737, 21100, -22101}, 1874 +{ 3393, -4629, 5735, -18913, -6969, 2687}, 1875 +{ 1148, -16147, -21433, -28095, -630, -14449}, 1876 +{ 7300, 672, 18530, -17452, -10149, 351}, 1877 +{ 11356, -10974, 17212, 4624, 145, 17791}, 1878 +{ -711, -3479, -2238, 15887, 2027, 0}, 1879 +{ -28048, 1794, -593, -2758, -21852, 11535}, 1880 +{ -19683, 4937, 22004, 21523, -3148, 1790}, 1881 +{ 813, 8231, 2633, 11981, -3043, 22201}, 1882 +{ 8952, -24760, -690, 14873, -2366, -5372}, 1883 +{ 8406, -5439, -274, -642, -145, 778}, 1884 +{ -6605, 7258, 20780, -23507, -18625, 22782}, 1885 +{ -22896, -25488, 10020, -1614, 1508, -1393}, 1886 +{ 7607, 407, -24678, -16385, -1804, -4699}, 1887 +{ -10592, -19139, 10462, -3747, 8721, -6919}, 1888 +{ 13010, 5292, -6230, -4884, -20904, -1797}, 1889 +{ 16891, -13770, -465, 19343, -10741, -12959}, 1890 +{ 25193, -14799, -5681, -521, -321, -1211}, 1891 +{ 6917, -3093, 20183, -26903, -12026, 1295}, 1892 +{ 305, 1992, 19457, -985, 25, -521}, 1893 +{ 6707, -3698, 8365, -8687, 21921, -27166}, 1894 +{ 4668, 5997, 7117, 11696, 24401, -10794}, 1895 +{ 744, -9416, 19893, 1963, 7922, -9824}, 1896 +{ 3430, 21282, -1736, 10844, 8821, 27015}, 1897 +{ -8813, 1521, -24038, 1651, 7838, -1208}, 1898 +{ 3911, -11221, 3273, -12541, 7168, 18402}, 1899 +{ 21642, 9117, -11536, -5256, 7077, 2382}, 1900 +{ 100, 3817, -6713, 1244, 1518, -321}, 1901 +{ 7946, -18670, 10667, -4866, 727, 776}, 1902 +{ -15883, -8150, -2087, 22739, 1567, -3482}, 1903 +{ 4380, -2735, 8469, -7025, -11424, 1317}, 1904 +{ 26970, 4393, 7665, 17561, -714, 650}, 1905 +{ -16191, -835, 8365, 1795, -14314, 16297}, 1906 +{ 4504, -10048, 7662, -26690, -17428, 2580}, 1907 +{ 48, -3984, 564, -5871, 2658, -18658}, 1908 +{ 12579, -26016, -15642, 2672, -1347, -887}, 1909 +{ -4950, 4208, -6811, 2569, -20621, -8658}, 1910 +{ -1836, -14818, -5571, -23322, -14800, 25867}, 1911 +{ 5434, -28139, -2357, -2883, -570, 2431}, 1912 +{ 13096, -2771, 24994, -12496, -24723, -1025}, 1913 +{ -5676, -4339, 1908, 18628, -21323, 17366}, 1914 +{ 27660, -27897, -15409, 1436, -7112, -2241}, 1915 +{ 8019, 3847, 24568, -469, 9674, 10683}, 1916 +{ -903, -10149, 1801, -21260, 4795, -8751}, 1917 +{ 1122, -9582, 2625, 22791, 956, 882}, 1918 +{ 7876, 19075, -9900, -24266, 7496, 9277}, 1919 +{ 980, -26764, -5386, 5396, 1086, 1648}, 1920 +{ 28838, -1270, -447, 5, -429, -20}, 1921 +{ -15283, 6132, 22812, 1252, -9963, 511}, 1922 +{ 851, 7925, -457, -12210, 4261, 7579}, 1923 +{ -4530, 8452, -1246, 14501, -24951, -5760}, 1924 +{ -17814, -10727, 9887, -23929, -13432, 1878}, 1925 +{ -15049, 10165, 16491, -14603, -11712, -21156}, 1926 +{ -3317, 840, -5683, 22413, 1994, 586}, 1927 +{ 23158, -5788, -15043, -10372, -9271, -13523}, 1928 +{ -773, -9509, -3993, -24264, 8463, 5804}, 1929 +{ -8545, -703, -12440, -3985, -25122, -28147}, 1930 +{ -16659, 16001, 2746, 1611, 5097, -1043}, 1931 +{ 41, -7181, 19903, 31555, -32237, 13927}, 1932 +{ -5658, 845, -12774, 5705, 16695, -86}, 1933 +{ 5282, 14875, 27026, 21124, 15776, -10477}, 1934 +{ 14712, 19648, -11487, -13361, -20196, -15229}, 1935 +{ 8597, -9138, -626, 10891, -6015, 6346}, 1936 +{ -1488, -1272, -1479, -1303, -3704, -5485}, 1937 +{ -3370, 17871, -6604, 24930, 25886, -3127}, 1938 +{ 8416, 27783, -1385, 5350, -4260, 19993}, 1939 +{ 5688, 362, 17246, 3809, -3246, 1088}, 1940 +{ -105, -29607, 2747, 15223, -167, 3722}, 1941 +{ 3502, -3195, 8602, 7772, -1566, -915}, 1942 +{ -491, 3257, -2423, 5522, 20606, -100}, 1943 +{ -13948, -11368, -15375, -21866, -8520, 12221}, 1944 +{ -616, 2424, -2023, 4398, -3805, 8108}, 1945 +{ -7204, 21043, 21211, -9395, -19391, 896}, 1946 +{ -5737, -15160, -21298, 17066, -1006, -366}, 1947 +{ 6261, 3240, -11937, -16213, -15820, 6581}, 1948 +{ -3155, 24796, 2733, -1257, -875, -1597}, 1949 +{ -20469, 11094, 24071, -8987, 14136, 2220}, 1950 +{ -14106, 11959, -22495, 4135, -1055, -5420}, 1951 +{ 801, -2655, 60, -5324, -790, 5937}, 1952 +{ -7372, -1764, -22433, -26060, 21707, 4178}, 1953 +{ -5715, -6648, -14908, 1325, -24044, 1493}, 1954 +{ -6024, -12488, 23930, 2950, 1601, 1173}, 1955 +{ 19067, 17630, 17929, -10654, 10928, -4958}, 1956 +{ 3231, -3284, 27336, 4174, -1683, 497}, 1957 +}; 1958 + 1959 +const int16_t (*ff_vq_hebap[8])[6] = { 1960 + NULL, 1961 + ff_vq_hebap1, 1962 + ff_vq_hebap2, 1963 + ff_vq_hebap3, 1964 + ff_vq_hebap4, 1965 + ff_vq_hebap5, 1966 + ff_vq_hebap6, 1967 + ff_vq_hebap7, 1968 +}; 1969 + 1970 +/** 1971 + * Table E2.14 Frame Exponent Strategy Combinations 1972 + */ 1973 +const uint8_t ff_eac3_frm_expstr[32][6] = { 1974 +{ EXP_D15, EXP_REUSE, EXP_REUSE, EXP_REUSE, EXP_REUSE, EXP_REUSE}, 1975 +{ EXP_D15, EXP_REUSE, EXP_REUSE, EXP_REUSE, EXP_REUSE, EXP_D45}, 1976 +{ EXP_D15, EXP_REUSE, EXP_REUSE, EXP_REUSE, EXP_D25, EXP_REUSE}, 1977 +{ EXP_D15, EXP_REUSE, EXP_REUSE, EXP_REUSE, EXP_D45, EXP_D45}, 1978 +{ EXP_D25, EXP_REUSE, EXP_REUSE, EXP_D25, EXP_REUSE, EXP_REUSE}, 1979 +{ EXP_D25, EXP_REUSE, EXP_REUSE, EXP_D25, EXP_REUSE, EXP_D45}, 1980 +{ EXP_D25, EXP_REUSE, EXP_REUSE, EXP_D45, EXP_D25, EXP_REUSE}, 1981 +{ EXP_D25, EXP_REUSE, EXP_REUSE, EXP_D45, EXP_D45, EXP_D45}, 1982 +{ EXP_D25, EXP_REUSE, EXP_D15, EXP_REUSE, EXP_REUSE, EXP_REUSE}, 1983 +{ EXP_D25, EXP_REUSE, EXP_D25, EXP_REUSE, EXP_REUSE, EXP_D45}, 1984 +{ EXP_D25, EXP_REUSE, EXP_D25, EXP_REUSE, EXP_D25, EXP_REUSE}, 1985 +{ EXP_D25, EXP_REUSE, EXP_D25, EXP_REUSE, EXP_D45, EXP_D45}, 1986 +{ EXP_D25, EXP_REUSE, EXP_D45, EXP_D25, EXP_REUSE, EXP_REUSE}, 1987 +{ EXP_D25, EXP_REUSE, EXP_D45, EXP_D25, EXP_REUSE, EXP_D45}, 1988 +{ EXP_D25, EXP_REUSE, EXP_D45, EXP_D45, EXP_D25, EXP_REUSE}, 1989 +{ EXP_D25, EXP_REUSE, EXP_D45, EXP_D45, EXP_D45, EXP_D45}, 1990 +{ EXP_D45, EXP_D15, EXP_REUSE, EXP_REUSE, EXP_REUSE, EXP_REUSE}, 1991 +{ EXP_D45, EXP_D15, EXP_REUSE, EXP_REUSE, EXP_REUSE, EXP_D45}, 1992 +{ EXP_D45, EXP_D25, EXP_REUSE, EXP_REUSE, EXP_D25, EXP_REUSE}, 1993 +{ EXP_D45, EXP_D25, EXP_REUSE, EXP_REUSE, EXP_D45, EXP_D45}, 1994 +{ EXP_D45, EXP_D25, EXP_REUSE, EXP_D25, EXP_REUSE, EXP_REUSE}, 1995 +{ EXP_D45, EXP_D25, EXP_REUSE, EXP_D25, EXP_REUSE, EXP_D45}, 1996 +{ EXP_D45, EXP_D25, EXP_REUSE, EXP_D45, EXP_D25, EXP_REUSE}, 1997 +{ EXP_D45, EXP_D25, EXP_REUSE, EXP_D45, EXP_D45, EXP_D45}, 1998 +{ EXP_D45, EXP_D45, EXP_D15, EXP_REUSE, EXP_REUSE, EXP_REUSE}, 1999 +{ EXP_D45, EXP_D45, EXP_D25, EXP_REUSE, EXP_REUSE, EXP_D45}, 2000 +{ EXP_D45, EXP_D45, EXP_D25, EXP_REUSE, EXP_D25, EXP_REUSE}, 2001 +{ EXP_D45, EXP_D45, EXP_D25, EXP_REUSE, EXP_D45, EXP_D45}, 2002 +{ EXP_D45, EXP_D45, EXP_D45, EXP_D25, EXP_REUSE, EXP_REUSE}, 2003 +{ EXP_D45, EXP_D45, EXP_D45, EXP_D25, EXP_REUSE, EXP_D45}, 2004 +{ EXP_D45, EXP_D45, EXP_D45, EXP_D45, EXP_D25, EXP_REUSE}, 2005 +{ EXP_D45, EXP_D45, EXP_D45, EXP_D45, EXP_D45, EXP_D45}, 2006 +}; 2007 + 2008 +/** 2009 + * Table E2.16 Default Coupling Banding Structure 2010 + */ 2011 +const uint8_t ff_eac3_defcplbndstrc[18] = 2012 +{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1 }; 2013 + 2014 +/** 2015 + * Table E2.15 Default Spectral Extension Banding Structure 2016 + */ 2017 +const uint8_t ff_eac3_defspxbndstrc[17] = 2018 +{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}; 2019 + 2020 +/** 2021 + * Table E2.17 Default Enhanced Coupling Banding Structure 2022 + */ 2023 + 2024 +const uint8_t ff_eac3_defecplbndstrc[22] = 2025 +{0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1}; 2026 + 2027 + 2028 +/** 2029 + * Table E3.14 Spectral Extension Attenuation Table 2030 + */ 2031 +const float ff_eac3_spxattentab[32][3] = { 2032 + {0.954841604, 0.911722489, 0.870550563}, 2033 + {0.911722489, 0.831237896, 0.757858283}, 2034 + {0.870550563, 0.757858283, 0.659753955}, 2035 + {0.831237896, 0.690956440, 0.574349177}, 2036 + {0.793700526, 0.629960525, 0.500000000}, 2037 + {0.757858283, 0.574349177, 0.435275282}, 2038 + {0.723634619, 0.523647061, 0.378929142}, 2039 + {0.690956440, 0.477420802, 0.329876978}, 2040 + {0.659753955, 0.435275282, 0.287174589}, 2041 + {0.629960525, 0.396850263, 0.250000000}, 2042 + {0.601512518, 0.361817309, 0.217637641}, 2043 + {0.574349177, 0.329876978, 0.189464571}, 2044 + {0.548412490, 0.300756259, 0.164938489}, 2045 + {0.523647061, 0.274206245, 0.143587294}, 2046 + {0.500000000, 0.250000000, 0.125000000}, 2047 + {0.477420802, 0.227930622, 0.108818820}, 2048 + {0.455861244, 0.207809474, 0.094732285}, 2049 + {0.435275282, 0.189464571, 0.082469244}, 2050 + {0.415618948, 0.172739110, 0.071793647}, 2051 + {0.396850263, 0.157490131, 0.062500000}, 2052 + {0.378929142, 0.143587294, 0.054409410}, 2053 + {0.361817309, 0.130911765, 0.047366143}, 2054 + {0.345478220, 0.119355200, 0.041234622}, 2055 + {0.329876978, 0.108818820, 0.035896824}, 2056 + {0.314980262, 0.099212566, 0.031250000}, 2057 + {0.300756259, 0.090454327, 0.027204705}, 2058 + {0.287174589, 0.082469244, 0.023683071}, 2059 + {0.274206245, 0.075189065, 0.020617311}, 2060 + {0.261823531, 0.068551561, 0.017948412}, 2061 + {0.250000000, 0.062500000, 0.015625000}, 2062 + {0.238710401, 0.056982656, 0.013602353}, 2063 + {0.227930622, 0.051952369, 0.011841536} 2064 +}; 2065 + 2066 +/** 2067 + * Table of bin locations for rematrixing bands 2068 + * reference: Section 7.5.2 Rematrixing : Frequency Band Definitions 2069 + */ 2070 +const uint8_t ff_ac3_rematrix_band_tbl[5] = { 13, 25, 37, 61, 253 }; 2071 + 2072 2073 --- mplayer-1.0.rc2svn20071207/libavcodec/ac3tab.h 2007-09-14 00:02:17.000000000 +0200 2074 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/ac3tab.h 2007-09-14 00:03:58.000000000 +0200 2075 @@ -31,6 +31,7 @@ 2076 extern const int16_t ff_ac3_window[256]; 2077 extern const uint8_t ff_ac3_latab[260]; 2078 extern const uint16_t ff_ac3_hth[50][3]; 2079 +extern const uint8_t ff_ac3_hebaptab[64]; 2080 extern const uint8_t ff_ac3_baptab[64]; 2081 extern const uint8_t ff_sdecaytab[4]; 2082 extern const uint8_t ff_fdecaytab[4]; 2083 @@ -39,5 +40,27 @@ 2084 extern const int16_t ff_floortab[8]; 2085 extern const uint16_t ff_fgaintab[8]; 2086 extern const uint8_t ff_ac3_bndsz[50]; 2087 +extern const uint8_t ff_qntztab[16]; 2088 +extern const uint8_t ff_nfchans_tbl[8]; 2089 +extern const uint8_t ff_eac3_blocks[4]; 2090 +extern const uint8_t ff_bits_vs_hebap[20]; 2091 +extern const int16_t ff_eac3_gaq_remap[12][2][3][2]; 2092 +extern const uint8_t ff_gaq_gk[4][3]; 2093 + 2094 +extern const int16_t ff_vq_hebap1[4][6]; 2095 +extern const int16_t ff_vq_hebap2[8][6]; 2096 +extern const int16_t ff_vq_hebap3[16][6]; 2097 +extern const int16_t ff_vq_hebap4[32][6]; 2098 +extern const int16_t ff_vq_hebap5[128][6]; 2099 +extern const int16_t ff_vq_hebap6[256][6]; 2100 +extern const int16_t ff_vq_hebap7[512][6]; 2101 +extern const int16_t (*ff_vq_hebap[8])[6]; 2102 +extern const uint8_t ff_eac3_frm_expstr[32][6]; 2103 +extern const uint8_t ff_eac3_defcplbndstrc[18]; 2104 +extern const uint8_t ff_eac3_defspxbndstrc[17]; 2105 +extern const uint8_t ff_eac3_defecplbndstrc[22]; 2106 +extern const float ff_eac3_spxattentab[32][3]; 2107 + 2108 +extern const uint8_t ff_ac3_rematrix_band_tbl[5]; 2109 2110 #endif /* AC3TAB_H */ 2111 2112 2113 --- mplayer-1.0.rc2svn20071207/libavcodec/eac3dec.c 2007-09-26 18:31:15.000000000 +0200 2114 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/eac3dec.c 2007-09-26 18:23:27.000000000 +0200 2115 @@ -0,0 +1,1463 @@ 2116 +/* 2117 + * EAC3 decoder 2118 + * Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com> 2119 + * 2120 + * This file is part of FFmpeg. 2121 + * 2122 + * FFmpeg is free software; you can redistribute it and/or 2123 + * modify it under the terms of the GNU Lesser General Public 2124 + * License as published by the Free Software Foundation; either 2125 + * version 2.1 of the License, or (at your option) any later version. 2126 + * 2127 + * FFmpeg is distributed in the hope that it will be useful, 2128 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 2129 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 2130 + * Lesser General Public License for more details. 2131 + * 2132 + * You should have received a copy of the GNU Lesser General Public 2133 + * License along with FFmpeg; if not, write to the Free Software 2134 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 2135 + */ 2136 + 2137 +#include "avcodec.h" 2138 +#include "eac3.h" 2139 +#include "ac3dec.h" 2140 +#include "ac3.h" 2141 + 2142 +/** 2143 + * Table for default stereo downmixing coefficients 2144 + * reference: Section 7.8.2 Downmixing Into Two Channels 2145 + */ 2146 +static const uint8_t eac3_default_coeffs[8][5][2] = { 2147 + { { 2, 7 }, { 7, 2 }, }, 2148 + { { 4, 4 }, }, 2149 + { { 2, 7 }, { 7, 2 }, }, 2150 + { { 2, 7 }, { 5, 5 }, { 7, 2 }, }, 2151 + { { 2, 7 }, { 7, 2 }, { 6, 6 }, }, 2152 + { { 2, 7 }, { 5, 5 }, { 7, 2 }, { 8, 8 }, }, 2153 + { { 2, 7 }, { 7, 2 }, { 6, 7 }, { 7, 6 }, }, 2154 + { { 2, 7 }, { 5, 5 }, { 7, 2 }, { 6, 7 }, { 7, 6 }, }, 2155 +}; 2156 + 2157 +static const float mixlevels[9] = { 2158 + LEVEL_PLUS_3DB, 2159 + LEVEL_PLUS_1POINT5DB, 2160 + LEVEL_ONE, 2161 + LEVEL_MINUS_1POINT5DB, 2162 + LEVEL_MINUS_3DB, 2163 + LEVEL_MINUS_4POINT5DB, 2164 + LEVEL_MINUS_6DB, 2165 + LEVEL_ZERO, 2166 + LEVEL_MINUS_9DB 2167 +}; 2168 + 2169 +static void log_missing_feature(AVCodecContext *avctx, const char *log){ 2170 + av_log(avctx, AV_LOG_ERROR, "%s is not implemented. If you want to help, " 2171 + "update your FFmpeg version to the newest one from SVN. If the " 2172 + "problem still occurs, it means that your file has extension " 2173 + "which has not been tested due to a lack of samples exhibiting " 2174 + "this feature. Upload a sample of the audio from this file to " 2175 + "ftp://upload.mplayerhq.hu/incoming and contact the ffmpeg-devel " 2176 + "mailing list.\n", log); 2177 +} 2178 + 2179 +static void uncouple_channels(EAC3Context *s){ 2180 + int i, j, ch, bnd, subbnd; 2181 + 2182 + subbnd = s->cplbegf+1; 2183 + i = s->strtmant[CPL_CH]; 2184 + for (bnd = 0; bnd < s->ncplbnd; bnd++) { 2185 + do { 2186 + for (j = 0; j < 12; j++) { 2187 + for (ch = 1; ch <= s->nfchans; ch++) { 2188 + if (s->chincpl[ch]) { 2189 + s->transform_coeffs[ch][i] = 2190 + s->transform_coeffs[CPL_CH][i] * 2191 + s->cplco[ch][bnd] * 8.0f; 2192 + } 2193 + } 2194 + i++; 2195 + } 2196 + } while(s->cplbndstrc[subbnd++] && subbnd<=s->cplendf); 2197 + } 2198 +} 2199 + 2200 +static void spectral_extension(EAC3Context *s){ 2201 + //Now turned off, because there are no samples for testing it. 2202 +#if 0 2203 + int copystartmant, copyendmant, copyindex, insertindex; 2204 + int wrapflag[18]; 2205 + int bandsize, bnd, bin, spxmant, filtbin, ch; 2206 + float nratio, accum, nscale, sscale, spxcotemp; 2207 + float noffset[AC3_MAX_CHANNELS], nblendfact[AC3_MAX_CHANNELS][18], sblendfact[AC3_MAX_CHANNELS][18]; 2208 + float rmsenergy[AC3_MAX_CHANNELS][18]; 2209 + 2210 + //XXX spxbandtable[bnd] = 25 + 12 * bnd ? 2211 + 2212 + copystartmant = spxbandtable[s->spxstrtf]; 2213 + copyendmant = spxbandtable[s->spxbegf]; 2214 + 2215 + for (ch = 1; ch <= s->nfchans; ch++) { 2216 + if (!s->chinspx[ch]) 2217 + continue; 2218 + 2219 + copyindex = copystartmant; 2220 + insertindex = copyendmant; 2221 + 2222 + for (bnd = 0; bnd < s->nspxbnds; bnd++){ 2223 + bandsize = s->spxbndsztab[bnd]; 2224 + if ((copyindex + bandsize) > copyendmant) { 2225 + copyindex = copystartmant; 2226 + wrapflag[bnd] = 1; 2227 + } else 2228 + wrapflag[bnd] = 0; 2229 + for (bin = 0; bin < bandsize; bin++){ 2230 + if (copyindex == copyendmant) 2231 + copyindex = copystartmant; 2232 + s->transform_coeffs[ch][insertindex++] = s->transform_coeffs[ch][copyindex++]; 2233 + } 2234 + } 2235 + 2236 + noffset[ch] = s->spxblnd[ch] / 32.0; 2237 + spxmant = spxbandtable[s->spxbegf]; 2238 + if (s->spxcoe[ch]) { 2239 + for (bnd = 0; bnd < s->nspxbnds; bnd++){ 2240 + bandsize = s->spxbndsztab[bnd]; 2241 + nratio = ((spxmant + 0.5*bandsize) / spxbandtable[s->spxendf]) - noffset[ch]; 2242 + if (nratio < 0.0) 2243 + nratio = 0.0; 2244 + else 2245 + if (nratio > 1.0) 2246 + nratio = 1.0; 2247 + nblendfact[ch][bnd] = sqrt(nratio); 2248 + sblendfact[ch][bnd] = sqrt(1 - nratio); 2249 + spxmant += bandsize; 2250 + } 2251 + } 2252 + 2253 + spxmant = spxbandtable[s->spxbegf]; 2254 + for (bnd = 0; bnd < s->nspxbnds; bnd++){ 2255 + bandsize = s->spxbndsztab[bnd]; 2256 + accum = 0; 2257 + for (bin = 0; bin < bandsize; bin++){ 2258 + accum += (s->transform_coeffs[ch][spxmant] * s->transform_coeffs[ch][spxmant]); 2259 + spxmant++; 2260 + } 2261 + rmsenergy[ch][bnd] = sqrt(accum / bandsize); 2262 + } 2263 + 2264 + if (s->chinspxatten[ch]) { 2265 + /* apply notch filter at baseband / extension region border */ 2266 + filtbin = spxbandtable[s->spxbegf] - 2; 2267 + for (bin = 0; bin < 3; bin++){ 2268 + s->transform_coeffs[ch][filtbin] *= ff_eac3_spxattentab[s->spxattencod[ch]][bin]; 2269 + filtbin++; 2270 + } 2271 + for (bin = 1; bin >= 0; bin--){ 2272 + s->transform_coeffs[ch][filtbin] *= ff_eac3_spxattentab[s->spxattencod[ch]][bin]; 2273 + filtbin++; 2274 + } 2275 + filtbin += s->spxbndsztab[0]; 2276 + /* apply notch at all other wrap points */ 2277 + for (bnd = 1; bnd < s->nspxbnds; bnd++){ 2278 + if (wrapflag[bnd]) { 2279 + filtbin = filtbin - 5; 2280 + for (bin = 0; bin < 3; bin++){ 2281 + s->transform_coeffs[ch][filtbin] *= ff_eac3_spxattentab[s->spxattencod[ch]][bin]; 2282 + filtbin++; 2283 + } 2284 + for (bin = 1; bin >= 0; bin--){ 2285 + s->transform_coeffs[ch][filtbin] *= ff_eac3_spxattentab[s->spxattencod[ch]][bin]; 2286 + filtbin++; 2287 + } 2288 + } 2289 + filtbin += s->spxbndsztab[bnd]; 2290 + } 2291 + } 2292 + 2293 + spxmant = spxbandtable[s->spxbegf]; 2294 + for (bnd = 0; bnd < s->nspxbnds; bnd++){ 2295 + nscale = rmsenergy[ch][bnd] * nblendfact[ch][bnd]; 2296 + sscale = sblendfact[ch][bnd]; 2297 + for (bin = 0; bin < s->spxbndsztab[bnd]; bin++){ 2298 + //TODO generate noise() 2299 + s->transform_coeffs[ch][spxmant] = 2300 + s->transform_coeffs[ch][spxmant] * sscale + noise() * nscale; 2301 + spxmant++; 2302 + } 2303 + } 2304 + 2305 + spxmant = spxbandtable[s->spxbegf]; 2306 + for (bnd = 0; bnd < s->nspxbnds; bnd++){ 2307 + spxcotemp = s->spxco[ch][bnd]; 2308 + for (bin = 0; bin < s->spxbndsztab[bnd]; bin++){ 2309 + s->transform_coeffs[ch][spxmant] *= spxcotemp * 32; 2310 + spxmant++; 2311 + } 2312 + } 2313 + } 2314 +#endif 2315 +} 2316 + 2317 +static void get_transform_coeffs_aht_ch(GetBitContext *gbc, EAC3Context *s, int ch){ 2318 + int endbap, bin, n, m; 2319 + int bg, g, bits, pre_chmant, remap, chgaqsections, chgaqmod; 2320 + float mant; 2321 + 2322 + chgaqmod = get_bits(gbc, 2); 2323 + 2324 + endbap = chgaqmod<2?12:17; 2325 + 2326 + chgaqsections = 0; 2327 + for (bin = 0; bin < s->endmant[ch]; bin++) { 2328 + if (s->hebap[ch][bin] > 7 && s->hebap[ch][bin] < endbap) 2329 + chgaqsections++; 2330 + } 2331 + 2332 + if (chgaqmod == EAC3_GAQ_12 || chgaqmod == EAC3_GAQ_14) { 2333 + for (n = 0; n < chgaqsections; n++) { 2334 + s->chgaqgain[n] = get_bits1(gbc); 2335 + } 2336 + } else { 2337 + if (chgaqmod == EAC3_GAQ_124) { 2338 + int grpgain; 2339 + chgaqsections = (chgaqsections+2)/3; 2340 + for (n = 0; n < chgaqsections; n++) { 2341 + grpgain = get_bits(gbc, 5); 2342 + s->chgaqgain[3*n] = grpgain/9; 2343 + s->chgaqgain[3*n+1] = (grpgain%9)/3; 2344 + s->chgaqgain[3*n+2] = grpgain%3; 2345 + } 2346 + } 2347 + } 2348 + 2349 + m=0; 2350 + for (bin = s->strtmant[ch]; bin < s->endmant[ch]; bin++) { 2351 + if (s->hebap[ch][bin] > 7) { 2352 + // GAQ (E3.3.4.2) 2353 + // XXX what about gaqmod = 0 ? 2354 + // difference between Gk=1 and gaqmod=0 ? 2355 + if (s->hebap[ch][bin] < endbap) { 2356 + // hebap in active range 2357 + // Gk = 1<<bg 2358 + bg = ff_gaq_gk[chgaqmod][s->chgaqgain[m++]]; 2359 + } else { 2360 + bg = 0; 2361 + } 2362 + bits = ff_bits_vs_hebap[s->hebap[ch][bin]]; 2363 + 2364 + for (n = 0; n < 6; n++) { 2365 + // pre_chmant[n][ch][bin] 2366 + pre_chmant = get_sbits(gbc, bits-bg); 2367 + if (bg && pre_chmant == -(1 << (bits - bg - 1))) { 2368 + // large mantissa 2369 + pre_chmant = get_sbits(gbc, bits - ((bg==1)?1:0)); 2370 + if (bg == 1) 2371 + //Gk = 2 2372 + mant = (float)pre_chmant/((1<<(bits-1))-1); 2373 + else 2374 + //Gk = 4 2375 + mant = (float)pre_chmant*3.0f/((1<<(bits+1))-2); 2376 + 2377 + g = 0; 2378 + remap = 1; 2379 + } else { 2380 + // small mantissa 2381 + if (bg) 2382 + //Gk = 2 or 4 2383 + mant = (float)pre_chmant/((1<<(bits-1))-1); 2384 + else 2385 + //Gk = 1 2386 + mant = (float)pre_chmant*2.0f/((1<<bits)-1); ///XXX 2387 + 2388 + g = bg; 2389 + remap = (!bg) && (s->hebap[ch][bin] < endbap); 2390 + } 2391 + 2392 + //TODO when remap needed ? 2393 + if (remap) { 2394 + mant = (float) 2395 + (ff_eac3_gaq_remap[s->hebap[ch][bin]-8][0][g][0]/32768.0f + 1.0f) 2396 + * mant / (1<<g) + 2397 + (ff_eac3_gaq_remap[s->hebap[ch][bin]-8][mant<0][g][1]) / 32768.0f; 2398 + } 2399 + s->pre_chmant[n][ch][bin] = mant; 2400 + } 2401 + } else { 2402 + // hebap = 0 or VQ 2403 + if (s->hebap[ch][bin]) { 2404 + pre_chmant = get_bits(gbc, ff_bits_vs_hebap[s->hebap[ch][bin]]); 2405 + for (n = 0; n < 6; n++) { 2406 + s->pre_chmant[n][ch][bin] = 2407 + ff_vq_hebap[s->hebap[ch][bin]][pre_chmant][n] / 32768.0f; 2408 + } 2409 + } else { 2410 + for (n = 0; n < 6; n++) { 2411 + s->pre_chmant[n][ch][bin] = 0; 2412 + } 2413 + } 2414 + } 2415 + } 2416 +} 2417 + 2418 +static void idct_transform_coeffs_ch(EAC3Context *s, int ch, int blk){ 2419 + // TODO fast IDCT 2420 + int bin, i; 2421 + float tmp; 2422 + for (bin = s->strtmant[ch]; bin < s->endmant[ch]; bin++) { 2423 + tmp = 0; 2424 + for (i = 0; i < 6; i++) { 2425 + tmp += (i?sqrt(2):1) * s->pre_chmant[i][ch][bin] * cos(M_PI*i*(2*blk + 1)/12); 2426 + } 2427 + s->transform_coeffs[ch][bin] = tmp * ff_ac3_scale_factors[s->dexps[ch][bin]]; 2428 + } 2429 +} 2430 + 2431 +static void get_eac3_transform_coeffs_ch(GetBitContext *gbc, EAC3Context *s, int blk, 2432 + int ch, mant_groups *m){ 2433 + if (s->chahtinu[ch] == 0) { 2434 + ff_ac3_get_transform_coeffs_ch(m, gbc, s->dexps[ch], s->bap[ch], 2435 + s->transform_coeffs[ch], s->strtmant[ch], s->endmant[ch], 2436 + &s->dith_state); 2437 + } else { 2438 + if (s->chahtinu[ch] == 1) { 2439 + get_transform_coeffs_aht_ch(gbc, s, ch); 2440 + s->chahtinu[ch] = -1; /* AHT info for this frame has been read - do not read again */ 2441 + } 2442 + } 2443 + if (s->chahtinu[ch] != 0) { 2444 + idct_transform_coeffs_ch(s, ch, blk); 2445 + } 2446 +} 2447 + 2448 +static int parse_bsi(GetBitContext *gbc, EAC3Context *s){ 2449 + int i, blk; 2450 + 2451 + s->strmtyp = get_bits(gbc, 2); 2452 + if (s->strmtyp) { 2453 + log_missing_feature(s->avctx, "Dependent substream"); 2454 + return -1; 2455 + } 2456 + s->substreamid = get_bits(gbc, 3); 2457 + s->frmsiz = get_bits(gbc, 11); 2458 + s->fscod = get_bits(gbc, 2); 2459 + if (s->fscod == 3) { 2460 + log_missing_feature(s->avctx, "Reduced Sampling Rates"); 2461 + return -1; 2462 +#if 0 2463 + s->fscod2 = get_bits(gbc, 2); 2464 + s->numblkscod = 3; /* six blocks per frame */ 2465 +#endif 2466 + } else { 2467 + s->numblkscod = get_bits(gbc, 2); 2468 + } 2469 + s->acmod = get_bits(gbc, 3); 2470 + s->lfeon = get_bits1(gbc); 2471 + 2472 + // calculate number of channels 2473 + s->nfchans = ff_ac3_channels[s->acmod]; 2474 + s->num_channels = s->nfchans; 2475 + s->lfe_channel = s->num_channels+1; 2476 + if (s->lfeon) { 2477 + s->strtmant[s->lfe_channel] = 0; 2478 + s->endmant [s->lfe_channel] = 7; 2479 + s->nchgrps [s->lfe_channel] = 2; 2480 + s->chincpl [s->lfe_channel] = 0; 2481 + s->num_channels++; 2482 + } 2483 + 2484 + s->bsid = get_bits(gbc, 5); 2485 + if (s->bsid < 11 || s->bsid > 16) { 2486 + av_log(s->avctx, AV_LOG_ERROR, "bsid should be between 11 and 16\n"); 2487 + return -1; 2488 + } 2489 + 2490 + for (i = 0; i < (s->acmod ? 1 : 2); i++) { 2491 + s->dialnorm[i] = ff_ac3_dialnorm_tbl[get_bits(gbc, 5)]; 2492 + if (get_bits1(gbc)) { 2493 + skip_bits(gbc, 8); //skip Compression gain word 2494 + } 2495 + } 2496 + if (s->strmtyp == 1) { 2497 + /* if dependent stream */ 2498 + if (get_bits1(gbc)) { 2499 + s->chanmap = get_bits(gbc, 16); 2500 + } else { 2501 + //TODO default channel map based on acmod and lfeon 2502 + } 2503 + } 2504 + 2505 + /* set stereo downmixing coefficients 2506 + reference: Section 7.8.2 Downmixing Into Two Channels */ 2507 + for (i = 0; i < s->nfchans; i++) { 2508 + s->downmix_coeffs[i][0] = mixlevels[eac3_default_coeffs[s->acmod][i][0]]; 2509 + s->downmix_coeffs[i][1] = mixlevels[eac3_default_coeffs[s->acmod][i][1]]; 2510 + } 2511 + 2512 + s->mixmdate = get_bits1(gbc); 2513 + if (s->mixmdate) { 2514 + /* Mixing metadata */ 2515 + if (s->acmod > 2) { 2516 + /* if more than 2 channels */ 2517 + s->dmixmod = get_bits(gbc, 2); 2518 + } 2519 + if ((s->acmod & 1) && (s->acmod > 2)) { 2520 + /* if three front channels exist */ 2521 + skip_bits(gbc, 3); //skip Lt/Rt center mix level 2522 + s->downmix_coeffs[1][0] = s->downmix_coeffs[1][1] = mixlevels[get_bits(gbc, 3)]; 2523 + } 2524 + if (s->acmod & 4) { 2525 + /* if a surround channel exists */ 2526 + float surmixlev; 2527 + skip_bits(gbc, 3); //skip Lt/Rt surround mix level 2528 + surmixlev = mixlevels[get_bits(gbc, 3)]; 2529 + if (s->acmod & 2) { 2530 + //two surround channels 2531 + s->downmix_coeffs[s->acmod-4][0] = s->downmix_coeffs[s->acmod-3][1] = 2532 + surmixlev; 2533 + } else { 2534 + s->downmix_coeffs[s->acmod-2][0] = s->downmix_coeffs[s->acmod-2][1] = 2535 + surmixlev * LEVEL_MINUS_3DB; 2536 + } 2537 + } 2538 + if (s->lfeon) { 2539 + /* if the LFE channel exists */ 2540 + s->lfemixlevcode = get_bits1(gbc); 2541 + if (s->lfemixlevcode) { 2542 + s->lfemixlevcod = get_bits(gbc, 5); 2543 + } 2544 + } 2545 + if (!s->strmtyp) { 2546 + /* if independent stream */ 2547 + for (i = 0; i < (s->acmod ? 1 : 2); i++) { 2548 + if (get_bits1(gbc)) { 2549 + s->pgmscl[i] = get_bits(gbc, 6); 2550 + } else { 2551 + //TODO program scale factor = 0dB 2552 + } 2553 + } 2554 + if (get_bits1(gbc)) { 2555 + s->extpgmscl = get_bits(gbc, 6); 2556 + } 2557 + s->mixdef = get_bits(gbc, 2); 2558 + if (s->mixdef == 1) { 2559 + /* mixing option 2 */ 2560 + skip_bits(gbc, 5); 2561 + } else { 2562 + if (s->mixdef == 2) { 2563 + /* mixing option 3 */ 2564 + skip_bits(gbc, 12); 2565 + } else { 2566 + if (s->mixdef == 3) { 2567 + /* mixing option 4 */ 2568 + s->mixdeflen = get_bits(gbc, 5); 2569 + skip_bits(gbc, 8*(s->mixdeflen+2)); 2570 + } 2571 + } 2572 + if (s->acmod < 2) { 2573 + /* if mono or dual mono source */ 2574 + for (i = 0; i < (s->acmod ? 1 : 2); i++) { 2575 + if (get_bits1(gbc)) { 2576 + s->paninfo[i] = get_bits(gbc, 14); 2577 + } else { 2578 + //TODO default = center 2579 + } 2580 + } 2581 + } 2582 + s->frmmixcfginfoe = get_bits1(gbc); 2583 + if (s->frmmixcfginfoe) { 2584 + /* mixing configuration information */ 2585 + if (!s->numblkscod) { 2586 + s->blkmixcfginfo[0] = get_bits(gbc, 5); 2587 + } else { 2588 + for (blk = 0; blk < ff_eac3_blocks[s->numblkscod]; blk++) { 2589 + if (get_bits1(gbc)) { 2590 + s->blkmixcfginfo[blk] = get_bits(gbc, 5); 2591 + } 2592 + } 2593 + } 2594 + } 2595 + } 2596 + } 2597 + } 2598 + s->infomdate = get_bits1(gbc); 2599 + if (s->infomdate) { 2600 + /* Informational metadata */ 2601 + skip_bits(gbc, 3); //skip Bit stream mode 2602 + skip_bits(gbc, 2); //skip copyright bit and original bitstream bit 2603 + if (s->acmod == AC3_ACMOD_STEREO) { /* if in 2/0 mode */ 2604 + skip_bits(gbc, 4); //skip Dolby surround and headphone mode 2605 + } 2606 + if (s->acmod >= 6) { 2607 + /* if both surround channels exist */ 2608 + skip_bits(gbc, 2); //skip Dolby surround EX mode 2609 + } 2610 + for (i = 0; i < (s->acmod ? 1 : 2); i++) { 2611 + if (get_bits1(gbc)) { 2612 + skip_bits(gbc, 8); //skip Mix level, Room type and A/D converter type 2613 + } 2614 + } 2615 + if (s->fscod < 3) { 2616 + /* if not half sample rate */ 2617 + skip_bits1(gbc); //skip Source sample rate code 2618 + } 2619 + } 2620 + if ((!s->strmtyp) && (s->numblkscod != 3)) { 2621 + skip_bits1(gbc); //converter synchronization flag 2622 + } 2623 + if (s->strmtyp == 2) { 2624 + /* if bit stream converted from AC-3 */ 2625 + if (s->numblkscod == 3 || get_bits1(gbc)) { 2626 + /* 6 blocks per frame */ 2627 + skip_bits(gbc, 6); // skip Frame size code 2628 + } 2629 + } 2630 + if (get_bits1(gbc)) { 2631 + int addbsil = get_bits(gbc, 6); 2632 + for (i = 0; i < addbsil + 1; i++) { 2633 + skip_bits(gbc, 8); // Additional bit stream information 2634 + } 2635 + } 2636 + 2637 + return 0; 2638 +} /* end of bsi */ 2639 + 2640 +static int parse_audfrm(GetBitContext *gbc, EAC3Context *s){ 2641 + int blk, ch; 2642 + 2643 + /* Audio frame exist flags and strategy data */ 2644 + if (s->numblkscod == 3) { 2645 + /* six blocks per frame */ 2646 + /* LUT-based exponent strategy syntax */ 2647 + s->expstre = get_bits1(gbc); 2648 + s->ahte = get_bits1(gbc); 2649 + } else { 2650 + /* AC-3 style exponent strategy syntax */ 2651 + s->expstre = 1; 2652 + s->ahte = 0; 2653 + } 2654 + s->snroffststr = get_bits(gbc, 2); 2655 + s->transproce = get_bits1(gbc); 2656 + s->blkswe = get_bits1(gbc); 2657 + if (!s->blkswe) { 2658 + for (ch = 1; ch <= s->nfchans; ch++) 2659 + s->blksw[ch] = 0; 2660 + } 2661 + s->dithflage = get_bits1(gbc); 2662 + if (!s->dithflage) { 2663 + for (ch = 1; ch <= s->nfchans; ch++) 2664 + s->dithflag[ch] = 1; /* dither on */ 2665 + } 2666 + s->dithflag[CPL_CH] = s->dithflag[s->lfe_channel] = 0; 2667 + 2668 + /* frame-based syntax flags */ 2669 + s->bamode = get_bits1(gbc); 2670 + s->frmfgaincode = get_bits1(gbc); 2671 + s->dbaflde = get_bits1(gbc); 2672 + s->skipflde = get_bits1(gbc); 2673 + s->spxattene = get_bits1(gbc); 2674 + /* Coupling data */ 2675 + if (s->acmod > 1) { 2676 + s->cplstre[0] = 1; 2677 + s->cplinu[0] = get_bits1(gbc); 2678 + s->ncplblks = s->cplinu[0]; 2679 + for (blk = 1; blk < ff_eac3_blocks[s->numblkscod]; blk++) { 2680 + s->cplstre[blk] = get_bits1(gbc); 2681 + 2682 + if (s->cplstre[blk]) { 2683 + s->cplinu[blk] = get_bits1(gbc); 2684 + } else { 2685 + s->cplinu[blk] = s->cplinu[blk-1]; 2686 + } 2687 + s->ncplblks += s->cplinu[blk]; 2688 + } 2689 + } else { 2690 + memset(s->cplinu, 0, sizeof(int) * ff_eac3_blocks[s->numblkscod]); 2691 + s->ncplblks = 0; 2692 + } 2693 + 2694 + /* Exponent strategy data */ 2695 + if (s->expstre) { 2696 + /* AC-3 style exponent strategy syntax */ 2697 + for (blk = 0; blk < ff_eac3_blocks[s->numblkscod]; blk++) { 2698 + for (ch = !s->cplinu[blk]; ch <= s->nfchans; ch++) { 2699 + s->chexpstr[blk][ch] = get_bits(gbc, 2); 2700 + } 2701 + } 2702 + } else { 2703 + /* LUT-based exponent strategy syntax */ 2704 + int frmchexpstr; 2705 + /* cplexpstr[blk] and chexpstr[blk][ch] derived from table lookups. see Table E2.14 */ 2706 + for (ch = !((s->acmod > 1) && (s->ncplblks)); ch <= s->nfchans; ch++) { 2707 + frmchexpstr = get_bits(gbc, 5); 2708 + for (blk = 0; blk < 6; blk++) { 2709 + s->chexpstr[blk][ch] = ff_eac3_frm_expstr[frmchexpstr][blk]; 2710 + } 2711 + } 2712 + } 2713 + /* LFE exponent strategy */ 2714 + if (s->lfeon) { 2715 + for (blk = 0; blk < ff_eac3_blocks[s->numblkscod]; blk++) { 2716 + s->chexpstr[blk][s->lfe_channel] = get_bits1(gbc); 2717 + } 2718 + } 2719 + /* Converter exponent strategy data */ 2720 + if (!s->strmtyp) { 2721 + if (s->numblkscod == 3 || get_bits1(gbc)) { 2722 + for (ch = 1; ch <= s->nfchans; ch++) { 2723 + skip_bits(gbc, 5); //skip Converter channel exponent strategy 2724 + } 2725 + } 2726 + } 2727 + /* AHT data */ 2728 + if (s->ahte) { 2729 + /* AHT is only available in 6 block mode (numblkscod ==3) */ 2730 + /* coupling can use AHT only when coupling in use for all blocks */ 2731 + /* ncplregs derived from cplstre and cplexpstr - see Section E3.3.2 */ 2732 + int nchregs; 2733 + s->chahtinu[CPL_CH]=0; 2734 + for (ch = (s->ncplblks != 6); ch <= s->num_channels; ch++) { 2735 + nchregs = 0; 2736 + for (blk = 0; blk < 6; blk++) 2737 + nchregs += (s->chexpstr[blk][ch] != EXP_REUSE); 2738 + s->chahtinu[ch] = (nchregs == 1) && get_bits1(gbc); 2739 + } 2740 + } else { 2741 + for (ch = 0; ch <= s->num_channels; ch++) 2742 + s->chahtinu[ch] = 0; 2743 + } 2744 + /* Audio frame SNR offset data */ 2745 + if (!s->snroffststr) { 2746 + int csnroffst = (get_bits(gbc, 6) - 15) << 4; 2747 + int snroffst = (csnroffst + get_bits(gbc, 4)) << 2; 2748 + for (ch = 0; ch <= s->num_channels; ch++) 2749 + s->snroffst[ch] = snroffst; 2750 + } 2751 + /* Audio frame transient pre-noise processing data */ 2752 + if (s->transproce) { 2753 + av_log(s->avctx, AV_LOG_ERROR, "transient pre-noise processing NOT IMPLEMENTED\n"); 2754 +// return -1; 2755 +//#if 0 2756 + for (ch = 1; ch <= s->nfchans; ch++) { 2757 + s->chintransproc[ch] = get_bits1(gbc); 2758 + if (s->chintransproc[ch]) { 2759 + s->transprocloc[ch] = get_bits(gbc, 10); 2760 + s->transproclen[ch] = get_bits(gbc, 8); 2761 + } 2762 + } 2763 +//#endif 2764 + } 2765 + /* Spectral extension attenuation data */ 2766 + if (s->spxattene) { 2767 + for (ch = 1; ch <= s->nfchans; ch++) { 2768 + s->chinspxatten[ch] = get_bits1(gbc); 2769 + if (s->chinspxatten[ch]) { 2770 + s->spxattencod[ch] = get_bits(gbc, 5); 2771 + } 2772 + } 2773 + } else { 2774 + for (ch = 1; ch <= s->nfchans; ch++) 2775 + s->chinspxatten[ch]=0; 2776 + } 2777 + /* Block start information */ 2778 + if (s->numblkscod && get_bits1(gbc)) { 2779 + /* nblkstrtbits determined from frmsiz (see Section E2.3.2.27) */ 2780 + // nblkstrtbits = (numblks - 1) * (4 + ceiling (log2 (words_per_frame))) 2781 + // where numblks is derived from the numblkscod in Table E2.9 2782 + // words_per_frame = frmsiz + 1 2783 + int nblkstrtbits = (ff_eac3_blocks[s->numblkscod]-1) * (4 + (av_log2(s->frmsiz-1)+1) ); 2784 + av_log(s->avctx, AV_LOG_INFO, "nblkstrtbits = %i\n", nblkstrtbits); 2785 + s->blkstrtinfo = get_bits(gbc, nblkstrtbits); 2786 + } 2787 + /* Syntax state initialization */ 2788 + for (ch = 1; ch <= s->nfchans; ch++) { 2789 + s->firstspxcos[ch] = 1; 2790 + s->firstcplcos[ch] = 1; 2791 + } 2792 + s->firstcplleak = 1; 2793 + 2794 + return 0; 2795 +} /* end of audfrm */ 2796 + 2797 +static int parse_audblk(GetBitContext *gbc, EAC3Context *s, const int blk){ 2798 + //int grp, sbnd, n, bin; 2799 + int seg, bnd, ch, i, chbwcod, grpsize; 2800 + int got_cplchan; 2801 + mant_groups m; 2802 + 2803 + m.b1ptr = m.b2ptr = m.b4ptr = 3; 2804 + 2805 + /* Block switch and dither flags */ 2806 + if (s->blkswe) { 2807 + for (ch = 1; ch <= s->nfchans; ch++) { 2808 + s->blksw[ch] = get_bits1(gbc); 2809 + } 2810 + } 2811 + if (s->dithflage) { 2812 + for (ch = 1; ch <= s->nfchans; ch++) { 2813 + s->dithflag[ch] = get_bits1(gbc); 2814 + } 2815 + } 2816 + 2817 + /* Dynamic range control */ 2818 + for (i = 0; i < (s->acmod ? 1 : 2); i++) { 2819 + if (get_bits1(gbc)) { 2820 + s->dynrng[i] = ff_ac3_dynrng_tbl[get_bits(gbc, 8)]; 2821 + } else { 2822 + if (!blk) { 2823 + s->dynrng[i] = 1.0f; 2824 + } 2825 + } 2826 + } 2827 + /* Spectral extension strategy information */ 2828 + if ((!blk) || get_bits1(gbc)) { 2829 + s->spxinu = get_bits1(gbc); 2830 + if (s->spxinu) { 2831 + log_missing_feature(s->avctx, "Spectral extension"); 2832 + return -1; 2833 +#if 0 2834 + if (s->acmod == AC3_ACMOD_MONO) { 2835 + s->chinspx[1] = 1; 2836 + } else { 2837 + for (ch = 1; ch <= s->nfchans; ch++) { 2838 + s->chinspx[ch] = get_bits1(gbc); 2839 + } 2840 + } 2841 +#if 0 2842 + { 2843 + int nspx=0; 2844 + for (ch = 1; ch <= s->nfchans; ch++) { 2845 + nspx+=s->chinspx[ch]; 2846 + } 2847 + if (!nspx) 2848 + av_log(s->avctx, AV_LOG_INFO, "No channels in spectral extension\n"); 2849 + } 2850 +#endif 2851 + s->spxstrtf = get_bits(gbc, 2); 2852 + s->spxbegf = get_bits(gbc, 3); 2853 + s->spxendf = get_bits(gbc, 3); 2854 + if (s->spxbegf < 6) { 2855 + s->spxbegf += 2; 2856 + } else { 2857 + s->spxbegf = s->spxbegf * 2 - 3; 2858 + } 2859 + if (s->spxendf < 3) { 2860 + s->spxendf += 5; 2861 + } else { 2862 + s->spxendf = s->spxendf * 2 + 3; 2863 + } 2864 + for (ch = 1; ch <= s->nfchans; ch++) { 2865 + if (s->chinspx[ch]) 2866 + s->endmant[ch] = 25 + 12 * s->spxbegf; 2867 + } 2868 + if (get_bits1(gbc)) { 2869 + for (bnd = s->spxbegf + 1; bnd < s->spxendf; bnd++) { 2870 + s->spxbndstrc[bnd] = get_bits1(gbc); 2871 + } 2872 + } else { 2873 + if (!blk) { 2874 + for (bnd = 0; bnd < 17; bnd++) 2875 + s->spxbndstrc[bnd] = ff_eac3_defspxbndstrc[bnd]; 2876 + } 2877 + } 2878 + // calculate number of spectral extension bands 2879 + s->nspxbnds = 1; 2880 + s->spxbndsztab[0] = 12; 2881 + for (bnd = s->spxbegf+1; bnd < s->spxendf; bnd ++){ 2882 + if (!s->spxbndstrc[bnd]) { 2883 + s->spxbndsztab[s->nspxbnds] = 12; 2884 + s->nspxbnds++; 2885 + } else { 2886 + s->spxbndsztab[s->nspxbnds - 1] += 12; 2887 + } 2888 + } 2889 +#endif 2890 + } else { 2891 + /* !spxinu */ 2892 + for (ch = 1; ch <= s->nfchans; ch++) { 2893 + s->chinspx[ch] = 0; 2894 + s->firstspxcos[ch] = 1; 2895 + } 2896 + } 2897 + } 2898 + 2899 + /* Spectral extension coordinates */ 2900 + if (s->spxinu) { 2901 + for (ch = 1; ch <= s->nfchans; ch++) { 2902 + if (s->chinspx[ch]) { 2903 + if (s->firstspxcos[ch]) { 2904 + s->spxcoe[ch] = 1; 2905 + s->firstspxcos[ch] = 0; 2906 + } else { 2907 + /* !firstspxcos[ch] */ 2908 + s->spxcoe[ch] = get_bits1(gbc); 2909 + } 2910 + if (!blk && !s->spxcoe[ch]) { 2911 + av_log(s->avctx, AV_LOG_ERROR, "no spectral extension coordinates in first block\n"); 2912 + return -1; 2913 + } 2914 + 2915 + if (s->spxcoe[ch]) { 2916 + int spxcoexp, spxcomant, mstrspxco; 2917 + s->spxblnd[ch] = get_bits(gbc, 5); 2918 + mstrspxco = get_bits(gbc, 2); 2919 + mstrspxco*=3; 2920 + /* nspxbnds determined from spxbegf, spxendf, and spxbndstrc[ ] */ 2921 + for (bnd = 0; bnd < s->nspxbnds; bnd++) { 2922 + spxcoexp = get_bits(gbc, 4); 2923 + spxcomant = get_bits(gbc, 2); 2924 + if (spxcoexp == 15) 2925 + s->spxco[ch][bnd] = spxcomant / 4.0f; 2926 + else 2927 + s->spxco[ch][bnd] = (spxcomant+4) / 8.0f; 2928 + s->spxco[ch][bnd] *= ff_ac3_scale_factors[spxcoexp + mstrspxco]; 2929 + } 2930 + } 2931 + } else { 2932 + /* !chinspx[ch] */ 2933 + s->firstspxcos[ch] = 1; 2934 + } 2935 + } 2936 + } 2937 + /* Coupling strategy and enhanced coupling strategy information */ 2938 + if (s->cplstre[blk]) { 2939 + if (s->cplinu[blk]) { 2940 + s->ecplinu = get_bits1(gbc); 2941 + if (s->acmod == AC3_ACMOD_STEREO) { 2942 + s->chincpl[1] = 1; 2943 + s->chincpl[2] = 1; 2944 + } else { 2945 + for (ch = 1; ch <= s->nfchans; ch++) { 2946 + s->chincpl[ch] = get_bits1(gbc); 2947 + } 2948 + } 2949 + if (!s->ecplinu) { 2950 + /* standard coupling in use */ 2951 + if (s->acmod == AC3_ACMOD_STEREO) { /* if in 2/0 mode */ 2952 + s->phsflginu = get_bits1(gbc); 2953 + } 2954 + s->cplbegf = get_bits(gbc, 4); 2955 + if (!s->spxinu) { 2956 + /* if SPX not in use */ 2957 + s->cplendf = get_bits(gbc, 4); 2958 + s->cplendf += 3; 2959 + } else { 2960 + /* SPX in use */ 2961 + s->cplendf = s->spxbegf - 1; 2962 + } 2963 + 2964 + s->strtmant[CPL_CH] = 37 + (12 * s->cplbegf); 2965 + s->endmant[CPL_CH] = 37 + (12 * s->cplendf); 2966 + if (s->strtmant[CPL_CH] > s->endmant[CPL_CH]) { 2967 + av_log(s->avctx, AV_LOG_ERROR, "cplstrtmant > cplendmant [blk=%i]\n", blk); 2968 + return -1; 2969 + } 2970 + for (ch = 1; ch <= s->nfchans; ch++) { 2971 + if (s->chincpl[ch]) 2972 + s->endmant[ch] = s->strtmant[CPL_CH]; 2973 + } 2974 + if (get_bits1(gbc)) { 2975 + for (bnd = s->cplbegf + 1; bnd < s->cplendf; bnd++) { 2976 + s->cplbndstrc[bnd] = get_bits1(gbc); 2977 + } 2978 + } else { 2979 + if (!blk) { 2980 + for (bnd = 0; bnd < 18; bnd++) 2981 + s->cplbndstrc[bnd] = ff_eac3_defcplbndstrc[bnd]; 2982 + } 2983 + } 2984 + s->ncplsubnd = s->cplendf - s->cplbegf; 2985 + s->ncplbnd = s->ncplsubnd; 2986 + for (bnd = s->cplbegf + 1; bnd < s->cplendf; bnd++) { 2987 + s->ncplbnd -= s->cplbndstrc[bnd]; 2988 + } 2989 + } else { 2990 + /* enhanced coupling in use */ 2991 + log_missing_feature(s->avctx, "Enhanced coupling"); 2992 + return -1; 2993 +#if 0 2994 + s->ecplbegf = get_bits(gbc, 4); 2995 + if (s->ecplbegf < 3) { 2996 + s->ecpl_start_subbnd = s->ecplbegf * 2; 2997 + } else { 2998 + if (s->ecplbegf < 13) { 2999 + s->ecpl_start_subbnd = s->ecplbegf + 2; 3000 + } else { 3001 + s->ecpl_start_subbnd = s->ecplbegf * 2 - 10; 3002 + } 3003 + } 3004 + if (!s->spxinu) { 3005 + /* if SPX not in use */ 3006 + s->ecplendf = get_bits(gbc, 4); 3007 + s->ecpl_end_subbnd = s->ecplendf + 7; 3008 + } else { 3009 + /* SPX in use */ 3010 + if (s->spxbegf < 6) { 3011 + s->ecpl_end_subbnd = s->spxbegf + 5; 3012 + } else { 3013 + s->ecpl_end_subbnd = s->spxbegf * 2; 3014 + } 3015 + } 3016 + if (get_bits1(gbc)) { 3017 + for (sbnd = FFMAX(9, s->ecpl_start_subbnd + 1); 3018 + sbnd < s->ecpl_end_subbnd; sbnd++){ 3019 + s->ecplbndstrc[sbnd] = get_bits1(gbc); 3020 + } 3021 + } else { 3022 + if (!blk) { 3023 + for (sbnd = 0; sbnd < 22; sbnd++) 3024 + s->ecplbndstrc[sbnd] = ff_eac3_defecplbndstrc[sbnd]; 3025 + } 3026 + } 3027 + //necplbnd = ecpl_end_subbnd - ecpl_start_subbnd; 3028 + //necplbnd -= ecplbndstrc[ecpl_start_subbnd] + ... + ecplbndstrc[ecpl_end_subbnd -1] 3029 + s->necplbnd = s->ecpl_end_subbnd - s->ecpl_start_subbnd; 3030 + for (bnd = s->ecpl_start_subbnd; bnd < s->ecpl_end_subbnd; bnd++) { 3031 + s->necplbnd -= s->ecplbndstrc[bnd]; 3032 + } 3033 +#endif 3034 + } /* ecplinu[blk] */ 3035 + } else { 3036 + /* !cplinu[blk] */ 3037 + for (ch = 1; ch <= s->nfchans; ch++) { 3038 + s->chincpl[ch] = 0; 3039 + s->firstcplcos[ch] = 1; 3040 + } 3041 + s->firstcplleak = 1; 3042 + s->phsflginu = 0; 3043 + s->ecplinu = 0; 3044 + } 3045 + } /* cplstre[blk] */ 3046 + /* Coupling coordinates */ 3047 + if (s->cplinu[blk]) { 3048 + if (!s->ecplinu) { 3049 + /* standard coupling in use */ 3050 + for (ch = 1; ch <= s->nfchans; ch++) { 3051 + if (s->chincpl[ch]) { 3052 + if (s->firstcplcos[ch]) { 3053 + s->cplcoe[ch] = 1; 3054 + s->firstcplcos[ch] = 0; 3055 + } else { 3056 + /* !firstcplcos[ch] */ 3057 + s->cplcoe[ch] = get_bits1(gbc); 3058 + } 3059 + if (s->cplcoe[ch]) { 3060 + int cplcoexp, cplcomant, mstrcplco; 3061 + mstrcplco = get_bits(gbc, 2); 3062 + mstrcplco = 3 * mstrcplco; 3063 + /* ncplbnd derived from cplbegf, cplendf, and cplbndstrc */ 3064 + for (bnd = 0; bnd < s->ncplbnd; bnd++) { 3065 + cplcoexp = get_bits(gbc, 4); 3066 + cplcomant = get_bits(gbc, 4); 3067 + if (cplcoexp == 15) 3068 + s->cplco[ch][bnd] = cplcomant / 16.0f; 3069 + else 3070 + s->cplco[ch][bnd] = (cplcomant + 16.0f) / 32.0f; 3071 + s->cplco[ch][bnd] *= ff_ac3_scale_factors[cplcoexp + mstrcplco]; 3072 + } 3073 + } /* cplcoe[ch] */ 3074 + else { 3075 + if (!blk) { 3076 + av_log(s->avctx, AV_LOG_ERROR, "no coupling coordinates in first block\n"); 3077 + return -1; 3078 + } 3079 + } 3080 + } else { 3081 + /* ! chincpl[ch] */ 3082 + s->firstcplcos[ch] = 1; 3083 + } 3084 + } /* ch */ 3085 + if ((s->acmod == AC3_ACMOD_STEREO) && s->phsflginu 3086 + && (s->cplcoe[1] || s->cplcoe[2])) { 3087 + for (bnd = 0; bnd < s->ncplbnd; bnd++) { 3088 + s->phsflg[bnd] = get_bits1(gbc); 3089 + } 3090 + } 3091 + s->nchgrps[CPL_CH] = (s->endmant[CPL_CH] - s->strtmant[CPL_CH]) / 3092 + (3 << (s->chexpstr[blk][CPL_CH] - 1)); 3093 + } else { 3094 + /* enhanced coupling in use */ 3095 + //TODO calc nchgrps[CPL_CH] 3096 +#if 0 3097 + s->firstchincpl = -1; 3098 + s->ecplangleintrp = get_bits1(gbc); 3099 + for (ch = 1; ch <= s->nfchans; ch++) { 3100 + if (s->chincpl[ch]) { 3101 + if (s->firstchincpl == -1) { 3102 + s->firstchincpl = ch; 3103 + } 3104 + if (s->firstcplcos[ch]) { 3105 + s->ecplparam1e[ch] = 1; 3106 + if (ch > s->firstchincpl) { 3107 + s->ecplparam2e[ch] = 1; 3108 + } else { 3109 + s->ecplparam2e[ch] = 0; 3110 + } 3111 + s->firstcplcos[ch] = 0; 3112 + } else { 3113 + /* !firstcplcos[ch] */ 3114 + s->ecplparam1e[ch] = get_bits1(gbc); 3115 + if (ch > s->firstchincpl) { 3116 + s->ecplparam2e[ch] = get_bits1(gbc); 3117 + } else { 3118 + s->ecplparam2e[ch] = 0; 3119 + } 3120 + } 3121 + if (s->ecplparam1e[ch]) { 3122 + /* necplbnd derived from ecpl_start_subbnd, ecpl_end_subbnd, and ecplbndstrc */ 3123 + for (bnd = 0; bnd < s->necplbnd; bnd++) { 3124 + s->ecplamp[ch][bnd] = get_bits(gbc, 5); 3125 + } 3126 + } 3127 + if (s->ecplparam2e[ch]) { 3128 + /* necplbnd derived from ecpl_start_subbnd, ecpl_end_subbnd, and ecplbndstrc */ 3129 + for (bnd = 0; bnd < s->necplbnd; bnd++) { 3130 + s->ecplangle[ch][bnd] = get_bits(gbc, 6); 3131 + s->ecplchaos[ch][bnd] = get_bits(gbc, 3); 3132 + } 3133 + } 3134 + if (ch > s->firstchincpl) { 3135 + s->ecpltrans[ch] = get_bits1(gbc); 3136 + } 3137 + } else { 3138 + /* !chincpl[ch] */ 3139 + s->firstcplcos[ch] = 1; 3140 + } 3141 + } /* ch */ 3142 +#endif 3143 + } /* ecplinu[blk] */ 3144 + } /* cplinu[blk] */ 3145 + /* Rematrixing operation in the 2/0 mode */ 3146 + if (s->acmod == AC3_ACMOD_STEREO) { /* if in 2/0 mode */ 3147 + if (!blk || get_bits1(gbc)) { 3148 + /* nrematbnds determined from cplinu, ecplinu, spxinu, cplbegf, ecplbegf and spxbegf */ 3149 + // TODO spx in one channel 3150 + int end = (s->cplinu[blk] || s->spxinu) ? 3151 + FFMIN(s->endmant[1], s->endmant[2]) : (ff_ac3_rematrix_band_tbl[4]-1); 3152 + for (bnd = 0; ff_ac3_rematrix_band_tbl[bnd] <= end; bnd++) { 3153 + s->rematflg[bnd] = get_bits1(gbc); 3154 + } 3155 + s->nrematbnds = bnd; 3156 + } 3157 + } 3158 + /* Channel bandwidth code */ 3159 + for (ch = 1; ch <= s->nfchans; ch++) { 3160 + if (!blk && s->chexpstr[blk][ch] == EXP_REUSE) { 3161 + av_log(s->avctx, AV_LOG_ERROR, "no channel exponent strategy in first block\n"); 3162 + return -1; 3163 + } 3164 + if (s->chexpstr[blk][ch] != EXP_REUSE) { 3165 + grpsize = 3 << (s->chexpstr[blk][ch] - 1); 3166 + s->strtmant[ch] = 0; 3167 + if ((!s->chincpl[ch]) && (!s->chinspx[ch])) { 3168 + chbwcod = get_bits(gbc, 6); 3169 + if (chbwcod > 60) { 3170 + av_log(s->avctx, AV_LOG_ERROR, "chbwcod > 60\n"); 3171 + return -1; 3172 + } 3173 + s->endmant[ch] = ((chbwcod + 12) * 3) + 37; /* (ch is not coupled) */ 3174 + } 3175 + grpsize = 3 << (s->chexpstr[blk][ch] - 1); 3176 + s->nchgrps[ch] = (s->endmant[ch] + grpsize - 4) / grpsize; 3177 + } 3178 + } 3179 + /* Exponents */ 3180 + for (ch = !s->cplinu[blk]; ch <= s->num_channels; ch++) { 3181 + if (s->chexpstr[blk][ch] != EXP_REUSE) { 3182 + s->dexps[ch][0] = get_bits(gbc, 4) << !ch; 3183 + ff_ac3_decode_exponents(gbc, s->chexpstr[blk][ch], s->nchgrps[ch], 3184 + s->dexps[ch][0], s->dexps[ch]+s->strtmant[ch]+!!ch); 3185 + if (ch != CPL_CH && ch != s->lfe_channel) 3186 + skip_bits(gbc, 2); /* skip gainrng */ 3187 + } 3188 + } 3189 + 3190 + /* Bit-allocation parametric information */ 3191 + if (s->bamode) { 3192 + if (get_bits1(gbc)) { 3193 + s->bit_alloc_params.sdecay = ff_sdecaytab[get_bits(gbc, 2)]; /* Table 7.6 */ 3194 + s->bit_alloc_params.fdecay = ff_fdecaytab[get_bits(gbc, 2)]; /* Table 7.7 */ 3195 + s->bit_alloc_params.sgain = ff_sgaintab [get_bits(gbc, 2)]; /* Table 7.8 */ 3196 + s->bit_alloc_params.dbknee = ff_dbkneetab[get_bits(gbc, 2)]; /* Table 7.9 */ 3197 + s->bit_alloc_params.floor = ff_floortab [get_bits(gbc, 3)]; /* Table 7.10 */ 3198 + } else { 3199 + if (!blk) { 3200 + av_log(s->avctx, AV_LOG_ERROR, "no bit allocation information in first block\n"); 3201 + return -1; 3202 + } 3203 + } 3204 + } else { 3205 + s->bit_alloc_params.sdecay = ff_sdecaytab[2]; /* Table 7.6 */ 3206 + s->bit_alloc_params.fdecay = ff_fdecaytab[1]; /* Table 7.7 */ 3207 + s->bit_alloc_params.sgain = ff_sgaintab[1]; /* Table 7.8 */ 3208 + s->bit_alloc_params.dbknee = ff_dbkneetab[2]; /* Table 7.9 */ 3209 + s->bit_alloc_params.floor = ff_floortab[7]; /* Table 7.10 */ 3210 + } 3211 + 3212 + if (s->snroffststr) { 3213 + av_log(s->avctx, AV_LOG_INFO, "NOT TESTED\n"); 3214 + if (!blk || get_bits1(gbc)) { 3215 + int csnroffst = (get_bits(gbc, 6) - 15) << 4; 3216 + if (s->snroffststr == 1) { 3217 + int snroffst = (csnroffst + get_bits(gbc, 4)) << 2; 3218 + for (ch = !s->cplinu[blk]; ch <= s->num_channels; ch++) 3219 + s->snroffst[ch] = snroffst; 3220 + } else { 3221 + if (s->snroffststr == 2) { 3222 + for (ch = !s->cplinu[blk]; ch <= s->num_channels; ch++) 3223 + s->snroffst[ch] = (csnroffst + get_bits(gbc, 4)) << 2; 3224 + } 3225 + } 3226 + } 3227 + } 3228 + 3229 + if (s->frmfgaincode && get_bits1(gbc)) { 3230 + for (ch = !s->cplinu[blk]; ch <= s->num_channels; ch++) 3231 + s->fgain[ch] = ff_fgaintab[get_bits(gbc, 3)]; 3232 + } else { 3233 + if (!blk) { 3234 + for (ch = !s->cplinu[blk]; ch <= s->num_channels; ch++) 3235 + s->fgain[ch] = ff_fgaintab[4]; 3236 + } 3237 + } 3238 + if (!s->strmtyp) { 3239 + if (get_bits1(gbc)) { 3240 + skip_bits(gbc, 10); //Converter SNR offset 3241 + } 3242 + } 3243 + if (s->cplinu[blk]) { 3244 + if (s->firstcplleak) { 3245 + s->cplleake = 1; 3246 + s->firstcplleak = 0; 3247 + } else { 3248 + /* !firstcplleak */ 3249 + s->cplleake = get_bits1(gbc); 3250 + } 3251 + if (s->cplleake) { 3252 + s->bit_alloc_params.cplfleak = get_bits(gbc, 3); 3253 + s->bit_alloc_params.cplsleak = get_bits(gbc, 3); 3254 + } 3255 + } 3256 + /* Delta bit allocation information */ 3257 + if (s->dbaflde && get_bits1(gbc)) { 3258 + for (ch = !s->cplinu[blk]; ch <= s->nfchans; ch++) { 3259 + s->deltbae[ch] = get_bits(gbc, 2); 3260 + } 3261 + for (ch = !s->cplinu[blk]; ch <= s->nfchans; ch++) { 3262 + if (s->deltbae[ch] == DBA_NEW) { 3263 + s->deltnseg[ch] = get_bits(gbc, 3); 3264 + for (seg = 0; seg <= s->deltnseg[ch]; seg++) { 3265 + s->deltoffst[ch][seg] = get_bits(gbc, 5); 3266 + s->deltlen[ch][seg] = get_bits(gbc, 4); 3267 + s->deltba[ch][seg] = get_bits(gbc, 3); 3268 + } 3269 + } 3270 + } 3271 + } else { 3272 + if (!blk) { 3273 + for (ch = 0; ch <= s->num_channels; ch++) { 3274 + s->deltbae[ch] = DBA_NONE; 3275 + } 3276 + } 3277 + } 3278 + 3279 + /* Inclusion of unused dummy data */ 3280 + if (s->skipflde) { 3281 + if (get_bits1(gbc)) { 3282 + int skipl = get_bits(gbc, 9); 3283 + while(skipl--) skip_bits(gbc, 8); 3284 + } 3285 + } 3286 + 3287 + /* run bit allocation */ 3288 + for (ch = !s->cplinu[blk]; ch <= s->num_channels; ch++) { 3289 + int start=0, end=0; 3290 + start = s->strtmant[ch]; 3291 + end = s->endmant[ch]; 3292 + 3293 + ff_ac3_bit_alloc_calc_psd((int8_t *)s->dexps[ch], start, end, 3294 + s->psd[ch], s->bndpsd[ch]); 3295 + 3296 + s->bit_alloc_params.fscod = s->fscod; 3297 + s->bit_alloc_params.halfratecod = 0; 3298 + 3299 + ff_ac3_bit_alloc_calc_mask(&s->bit_alloc_params, 3300 + s->bndpsd[ch], start, end, s->fgain[ch], 3301 + (ch == s->lfe_channel), 3302 + s->deltbae[ch], s->deltnseg[ch], 3303 + s->deltoffst[ch], s->deltlen[ch], 3304 + s->deltba[ch], s->mask[ch]); 3305 + 3306 + if (s->chahtinu[ch] == 0) 3307 + ff_ac3_bit_alloc_calc_bap(s->mask[ch], s->psd[ch], start, end, 3308 + s->snroffst[ch], s->bit_alloc_params.floor, ff_ac3_baptab, 3309 + s->bap[ch]); 3310 + else 3311 + if (s->chahtinu[ch] == 1) 3312 + ff_ac3_bit_alloc_calc_bap(s->mask[ch], s->psd[ch], start, end, 3313 + s->snroffst[ch], s->bit_alloc_params.floor, ff_ac3_hebaptab, 3314 + s->hebap[ch]); 3315 + } 3316 + 3317 + got_cplchan = 0; 3318 + 3319 + // TODO only for debug 3320 + for (ch = 0; ch <= s->num_channels; ch++) 3321 + memset(s->transform_coeffs[ch], 0, 256*sizeof(float)); 3322 + 3323 + /* Quantized mantissa values */ 3324 + for (ch = 1; ch <= s->num_channels; ch++) { 3325 + get_eac3_transform_coeffs_ch(gbc, s, blk, ch, &m); 3326 + if (s->cplinu[blk] && s->chincpl[ch] && !got_cplchan) { 3327 + get_eac3_transform_coeffs_ch(gbc, s, blk, CPL_CH, &m); 3328 + got_cplchan = 1; 3329 + } 3330 + } 3331 + 3332 + if (s->cplinu[blk]) 3333 + uncouple_channels(s); 3334 + 3335 + //apply spectral extension 3336 + if (s->spxinu) 3337 + spectral_extension(s); 3338 + 3339 + return 0; 3340 +} 3341 + 3342 +/** 3343 + * Performs Inverse MDCT transform 3344 + */ 3345 +static void do_imdct(EAC3Context *ctx) 3346 +{ 3347 + int ch; 3348 + 3349 + for (ch = 1; ch <= ctx->nfchans + ctx->lfeon; ch++) { 3350 + if (ctx->blksw[ch]) { 3351 + /* 256-point IMDCT */ 3352 + ff_ac3_do_imdct_256(ctx->tmp_output, ctx->transform_coeffs[ch], 3353 + &ctx->imdct_256, ctx->tmp_imdct); 3354 + } else { 3355 + /* 512-point IMDCT */ 3356 + ctx->imdct_512.fft.imdct_calc(&ctx->imdct_512, ctx->tmp_output, 3357 + ctx->transform_coeffs[ch], 3358 + ctx->tmp_imdct); 3359 + } 3360 + /* apply window function, overlap/add output, save delay */ 3361 + ctx->dsp.vector_fmul_add_add(ctx->output[ch-1], ctx->tmp_output, 3362 + ctx->window, ctx->delay[ch-1], 0, 3363 + AC3_BLOCK_SIZE, 1); 3364 + ctx->dsp.vector_fmul_reverse(ctx->delay[ch-1], ctx->tmp_output+256, 3365 + ctx->window, AC3_BLOCK_SIZE); 3366 + } 3367 +} 3368 + 3369 +static int eac3_decode_frame(AVCodecContext *avctx, void *data, int *data_size, 3370 + uint8_t *buf, int buf_size){ 3371 + int16_t *out_samples = (int16_t *)data; 3372 + EAC3Context *c = (EAC3Context *)avctx->priv_data; 3373 + int k, i, blk, ch; 3374 + GetBitContext gbc; 3375 + 3376 + *data_size = 0; 3377 + c->gbc = &gbc; 3378 + c->syncword = 0; 3379 + init_get_bits(&gbc, buf, buf_size*8); 3380 + c->syncword = get_bits(&gbc, 16); 3381 + 3382 + if (c->syncword != 0x0B77) 3383 + return -1; 3384 + 3385 + if (parse_bsi(&gbc, c) || parse_audfrm(&gbc, c)) 3386 + return -1; 3387 + 3388 + if (c->fscod == 3) { 3389 + avctx->sample_rate = ff_ac3_freqs[c->fscod2] / 2; 3390 + } else { 3391 + avctx->sample_rate = ff_ac3_freqs[c->fscod]; 3392 + } 3393 + 3394 + avctx->bit_rate = (c->frmsiz * (avctx->sample_rate) * 16 / ( ff_eac3_blocks[c->numblkscod] * 256)) / 1000; 3395 + 3396 + /* channel config */ 3397 + if (!avctx->request_channels) { 3398 + if (!avctx->channels) 3399 + avctx->channels = c->num_channels; 3400 + } else { 3401 + if (c->num_channels < avctx->request_channels) { 3402 + av_log(avctx, AV_LOG_ERROR, "Cannot upmix EAC3 from %d to %d channels.\n", 3403 + c->num_channels, avctx->request_channels); 3404 + return -1; 3405 + } else { 3406 + if (avctx->request_channels > 2 3407 + && avctx->request_channels != c->num_channels) { 3408 + av_log(avctx, AV_LOG_ERROR, "Cannot downmix EAC3 from %d to %d channels.\n", 3409 + c->num_channels, avctx->request_channels); 3410 + return -1; 3411 + } 3412 + avctx->channels = avctx->request_channels; 3413 + } 3414 + } 3415 + 3416 + for (blk = 0; blk < ff_eac3_blocks[c->numblkscod]; blk++) { 3417 + if (parse_audblk(&gbc, c, blk)) { 3418 + av_log(c->avctx, AV_LOG_ERROR, "Error in parse_audblk\n"); 3419 + return -1; 3420 + } 3421 + 3422 + /* recover coefficients if rematrixing is in use */ 3423 + if (c->acmod == AC3_ACMOD_STEREO) 3424 + ff_ac3_do_rematrixing(c->transform_coeffs, 3425 + FFMIN(c->endmant[1], c->endmant[2]), 3426 + c->nrematbnds, c->rematflg); 3427 + 3428 + /* apply scaling to coefficients (dialnorm, dynrng) */ 3429 + for (ch = 1; ch <= c->nfchans + c->lfeon; ch++) { 3430 + float gain=2.0f; 3431 + for (i = 0; i < c->endmant[ch]; i++) { 3432 + c->transform_coeffs[ch][i] *= gain; 3433 + } 3434 + } 3435 + 3436 + do_imdct(c); 3437 + 3438 + if (avctx->channels != c->num_channels) { 3439 + ff_ac3_downmix(c->output, c->nfchans, avctx->channels, c->downmix_coeffs); 3440 + } 3441 + 3442 + // convert float to 16-bit integer 3443 + for (ch = 0; ch < avctx->channels; ch++) { 3444 + for (i = 0; i < AC3_BLOCK_SIZE; i++) { 3445 + c->output[ch][i] = c->output[ch][i] * c->mul_bias + 3446 + c->add_bias; 3447 + } 3448 + c->dsp.float_to_int16(c->int_output[ch], c->output[ch], 3449 + AC3_BLOCK_SIZE); 3450 + } 3451 + for (k = 0; k < AC3_BLOCK_SIZE; k++) { 3452 + if (c->lfeon) { 3453 + switch(avctx->channels){ 3454 + case 6: 3455 + *(out_samples++) = c->int_output[0][k]; // FL 3456 + *(out_samples++) = c->int_output[2][k]; // FR 3457 + *(out_samples++) = c->int_output[1][k]; // FC 3458 + *(out_samples++) = c->int_output[5][k]; // LFE 3459 + *(out_samples++) = c->int_output[3][k]; // BL 3460 + *(out_samples++) = c->int_output[4][k]; // BC 3461 + break; 3462 + case 5: 3463 + if (c->acmod == 5) { 3464 + *(out_samples++) = c->int_output[0][k]; // FL 3465 + *(out_samples++) = c->int_output[2][k]; // FR 3466 + *(out_samples++) = c->int_output[1][k]; // FC 3467 + *(out_samples++) = c->int_output[4][k]; // LFE 3468 + *(out_samples++) = c->int_output[3][k]; // BC 3469 + } else { // acmod 6 3470 + *(out_samples++) = c->int_output[0][k]; // FL 3471 + *(out_samples++) = c->int_output[1][k]; // FR 3472 + *(out_samples++) = c->int_output[4][k]; // LFE 3473 + *(out_samples++) = c->int_output[2][k]; // BL 3474 + *(out_samples++) = c->int_output[3][k]; // BR 3475 + } 3476 + break; 3477 + case 4: 3478 + if (c->acmod == 3) { 3479 + *(out_samples++) = c->int_output[0][k]; // FL 3480 + *(out_samples++) = c->int_output[2][k]; // FR 3481 + *(out_samples++) = c->int_output[1][k]; // FC 3482 + *(out_samples++) = c->int_output[3][k]; // LFE 3483 + } else { // acmod 4 3484 + *(out_samples++) = c->int_output[0][k]; // FL 3485 + *(out_samples++) = c->int_output[1][k]; // FR 3486 + *(out_samples++) = c->int_output[3][k]; // LFE 3487 + *(out_samples++) = c->int_output[2][k]; // BC 3488 + } 3489 + break; 3490 + default: 3491 + for (i = 0; i < avctx->channels; i++) 3492 + *(out_samples++) = c->int_output[i][k]; 3493 + } 3494 + } else { 3495 + switch(avctx->channels){ 3496 + case 5: 3497 + *(out_samples++) = c->int_output[0][k]; // FL 3498 + *(out_samples++) = c->int_output[2][k]; // FR 3499 + *(out_samples++) = c->int_output[1][k]; // FC 3500 + *(out_samples++) = c->int_output[3][k]; // BL 3501 + *(out_samples++) = c->int_output[4][k]; // BC 3502 + break; 3503 + case 4: 3504 + if (c->acmod == 5) { 3505 + *(out_samples++) = c->int_output[0][k]; // FL 3506 + *(out_samples++) = c->int_output[2][k]; // FR 3507 + *(out_samples++) = c->int_output[1][k]; // FC 3508 + *(out_samples++) = c->int_output[3][k]; // BC 3509 + } else { // acmod 6 3510 + *(out_samples++) = c->int_output[0][k]; // FL 3511 + *(out_samples++) = c->int_output[1][k]; // FR 3512 + *(out_samples++) = c->int_output[2][k]; // BL 3513 + *(out_samples++) = c->int_output[3][k]; // BR 3514 + } 3515 + break; 3516 + case 3: 3517 + if (c->acmod == 3) { 3518 + *(out_samples++) = c->int_output[0][k]; // FL 3519 + *(out_samples++) = c->int_output[2][k]; // FR 3520 + *(out_samples++) = c->int_output[1][k]; // FC 3521 + } else { // acmod 4 3522 + *(out_samples++) = c->int_output[0][k]; // FL 3523 + *(out_samples++) = c->int_output[1][k]; // FR 3524 + *(out_samples++) = c->int_output[2][k]; // BC 3525 + } 3526 + break; 3527 + default: 3528 + for (i = 0; i < avctx->channels; i++) 3529 + *(out_samples++) = c->int_output[i][k]; 3530 + } 3531 + } 3532 + } 3533 + } 3534 + 3535 + *data_size = ff_eac3_blocks[c->numblkscod] * 256 * avctx->channels * sizeof (int16_t); // TODO is ok? 3536 + 3537 + return (c->frmsiz+1)*2; 3538 +} 3539 + 3540 +static int eac3_decode_init(AVCodecContext *avctx){ 3541 + EAC3Context *ctx = avctx->priv_data; 3542 + 3543 + ctx->avctx = avctx; 3544 + ac3_common_init(); 3545 + ff_ac3_tables_init(); 3546 + av_init_random(0, &ctx->dith_state); 3547 + ff_mdct_init(&ctx->imdct_256, 8, 1); 3548 + ff_mdct_init(&ctx->imdct_512, 9, 1); 3549 + dsputil_init(&ctx->dsp, avctx); 3550 + if (ctx->dsp.float_to_int16 == ff_float_to_int16_c) { 3551 + ctx->add_bias = 385.0f; 3552 + ctx->mul_bias = 1.0f; 3553 + } else { 3554 + ctx->add_bias = 0.0f; 3555 + ctx->mul_bias = 32767.0f; 3556 + } 3557 + ff_ac3_window_init(ctx->window); 3558 + return 0; 3559 +} 3560 + 3561 +static int eac3_decode_end(AVCodecContext *avctx){ 3562 + EAC3Context *ctx = avctx->priv_data; 3563 + ff_mdct_end(&ctx->imdct_512); 3564 + ff_mdct_end(&ctx->imdct_256); 3565 + 3566 + return 0; 3567 +} 3568 + 3569 +AVCodec eac3_decoder = { 3570 + .name = "E-AC3", 3571 + .type = CODEC_TYPE_AUDIO, 3572 + .id = CODEC_ID_EAC3, 3573 + .priv_data_size = sizeof (EAC3Context), 3574 + .init = eac3_decode_init, 3575 + .close = eac3_decode_end, 3576 + .decode = eac3_decode_frame, 3577 + 3578 +}; 3579 3580 --- mplayer-1.0.rc2svn20071207/libavcodec/eac3.h 2007-09-14 00:12:38.000000000 +0200 3581 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/eac3.h 2007-09-14 00:03:58.000000000 +0200 3582 @@ -0,0 +1,208 @@ 3583 +/* 3584 + * E-AC3 parser 3585 + * Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com> 3586 + * 3587 + * This file is part of FFmpeg. 3588 + * 3589 + * FFmpeg is free software; you can redistribute it and/or 3590 + * modify it under the terms of the GNU Lesser General Public 3591 + * License as published by the Free Software Foundation; either 3592 + * version 2.1 of the License, or (at your option) any later version. 3593 + * 3594 + * FFmpeg is distributed in the hope that it will be useful, 3595 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 3596 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 3597 + * Lesser General Public License for more details. 3598 + * 3599 + * You should have received a copy of the GNU Lesser General Public 3600 + * License along with FFmpeg; if not, write to the Free Software 3601 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 3602 + */ 3603 +#ifndef EAC3_H 3604 +#define EAC3_H 3605 + 3606 +#include "dsputil.h" 3607 +#include "avcodec.h" 3608 +#include "ac3.h" 3609 +#include "random.h" 3610 +#include "bitstream.h" 3611 + 3612 +/* override ac3.h to include coupling channel */ 3613 +#undef AC3_MAX_CHANNELS 3614 +#define AC3_MAX_CHANNELS 7 3615 + 3616 +#define AC3_MAX_COEFS 256 3617 + 3618 +#define AC3_BLOCK_SIZE 256 3619 +#define MAX_BLOCKS 6 3620 +#define MAX_SPX_CODES 18 3621 + 3622 +typedef struct EAC3Context{ 3623 + AVCodecContext *avctx; ///< Parent context 3624 + int syncword; 3625 +///@name Bit stream information 3626 +///@{ 3627 + int strmtyp; ///< Stream type 3628 + int substreamid; ///< Substream identification 3629 + int frmsiz; ///< Frame size 3630 + int fscod; ///< Sample rate code 3631 + int fscod2; ///< Sample rate code 2 3632 + int numblkscod; ///< Number of audio blocks 3633 + int acmod; ///< Audio coding mode 3634 + int lfeon; ///< Low frequency effect channel on 3635 + int bsid; ///< Bit stream identification 3636 + float dialnorm[2]; ///< Dialogue normalization 3637 + int chanmap; ///< Custom channel map 3638 + int mixmdate; ///< Mixing meta-data exists 3639 + int dmixmod; ///< Preferred stereo downmix mode 3640 + int lfemixlevcode; ///< lfe mix level code exists 3641 + int lfemixlevcod; ///< lfe mix level code 3642 + int pgmscl[2]; ///< Program scale factor 3643 + int extpgmscl; ///< External program scale factor 3644 + int mixdef; ///< Mix control type 3645 + int mixdeflen; ///< Length of mixing parameter data field 3646 + int paninfo[2]; ///< Pan information 3647 + int frmmixcfginfoe; ///< Frame mixing configuration information exists 3648 + int blkmixcfginfo[6]; ///< Block mixing configuration information 3649 + int infomdate; ///< Informational meta-data exists 3650 +///@} 3651 +///@name Audio Frame 3652 +///@{ 3653 + int expstre; ///< Exponent strategy syntax enabled 3654 + int ahte; ///< Adaptive hybrid transform enabled 3655 + int snroffststr; ///< SNR offset strategy 3656 + int snroffst[AC3_MAX_CHANNELS]; ///< SNR offset 3657 + int transproce; ///< Transient pre-noise processing enabled 3658 + int blkswe; ///< Block switch syntax enabled 3659 + int dithflage; ///< Dither flag syntax enabled 3660 + int bamode; ///< Bit allocation model syntax enabled 3661 + int frmfgaincode; ///< Fast gain codes enabled 3662 + int dbaflde; ///< Delta bit allocation syntax enabled 3663 + int skipflde; ///< Skip Filed syntax enabled 3664 + int spxattene; ///< Spectral extension attenuation enabled 3665 + int cplinu[MAX_BLOCKS]; ///< Coupling in use 3666 + int cplstre[MAX_BLOCKS]; ///< Coupling strategy exists 3667 + int chexpstr[MAX_BLOCKS][AC3_MAX_CHANNELS]; ///< Channel exponent strategy 3668 + int chahtinu[AC3_MAX_CHANNELS]; ///< Channel AHT in use 3669 + int chintransproc[AC3_MAX_CHANNELS]; ///< Channel in transient pre-noise processing 3670 + int transprocloc[AC3_MAX_CHANNELS]; ///< Transient location relative to start of frame 3671 + int transproclen[AC3_MAX_CHANNELS]; ///< Transient processing length 3672 + int chinspxatten[AC3_MAX_CHANNELS]; ///< Channel in spectral extension attenuation process 3673 + int spxattencod[AC3_MAX_CHANNELS]; ///< spectral extension attenuation code 3674 + uint32_t blkstrtinfo; ///< Block start information 3675 + int ncplblks; 3676 +///@} 3677 +///@name Audio block 3678 +///@{ 3679 + int blksw[AC3_MAX_CHANNELS]; ///< Block switch flag 3680 + int dithflag[AC3_MAX_CHANNELS]; ///< Dither flag 3681 + float dynrng[2]; ///< Dynamic range gain word 3682 + float downmix_coeffs[AC3_MAX_CHANNELS][2]; ///< stereo downmix coefficients 3683 + int spxinu; ///< spectral extension in use 3684 + int chinspx[AC3_MAX_CHANNELS]; ///< Channel in spectral extension 3685 + int spxstrtf; ///< Spectral extension start copy frequency code 3686 + int spxbegf; ///< Spectral extension begin frequency code 3687 + int spxendf; ///< Spectral extension end frequency code 3688 + int spxbndstrc[MAX_SPX_CODES]; ///< Spectral extension band structure 3689 + int spxcoe[AC3_MAX_CHANNELS]; ///< Spectral extension coordinates exists 3690 + int spxblnd[AC3_MAX_CHANNELS]; ///< Spectral extension blend 3691 + int ecplinu; ///< Enhanced coupling in use 3692 + int chincpl[AC3_MAX_CHANNELS]; ///< Channel in coupling 3693 + int phsflginu; ///< Phase flag in use 3694 + int cplbegf; ///< Coupling begin frequency code 3695 + int cplendf; ///< Coupling end frequency code 3696 + int cplbndstrc[19]; ///< Coupling band structure 3697 + int ecplbegf; ///< Enhanced coupling begin frequency code 3698 + int ecplendf; ///< Enhanced coupling end frequency code 3699 + int ecplbndstrc[23]; ///< Enhanced coupling band structure 3700 + int cplcoe[AC3_MAX_CHANNELS]; ///< Coupling coordinates exists 3701 + int phsflg[18]; ///< Phase flag 3702 + int ecplangleintrp; ///< Enhanced coupling angle interpolation flag 3703 + int ecplparam1e[AC3_MAX_CHANNELS]; ///< Enhanced coupling parameters 1 exists 3704 + int ecplparam2e[AC3_MAX_CHANNELS]; ///< Enhanced coupling parameters 2 exists 3705 + int ecplamp[AC3_MAX_CHANNELS][23]; ///< Enhanced coupling amplitude scaling 3706 + int ecplangle[AC3_MAX_CHANNELS][23]; ///< Enhanced coupling angle 3707 + int ecplchaos[AC3_MAX_CHANNELS][23]; ///< Enhanced coupling chaos 3708 + int ecpltrans[AC3_MAX_CHANNELS]; ///< Enhanced coupling transient present 3709 + int rematflg[4]; ///< Rematrixing flag 3710 + int cplabsexp; ///< Coupling absolute exponent 3711 + 3712 + int fgain[AC3_MAX_CHANNELS]; ///< Channel fast gain 3713 + int cplleake; ///< Coupling leak initialization exists 3714 + uint8_t deltbae[AC3_MAX_CHANNELS]; ///< Delta bit allocation exists 3715 + uint8_t deltnseg[AC3_MAX_CHANNELS]; ///< Channel delta bit allocation number of segments 3716 + uint8_t deltoffst[AC3_MAX_CHANNELS][9]; ///< Channel delta bit allocation offset 3717 + uint8_t deltlen[AC3_MAX_CHANNELS][9]; ///< Channel delta bit allocation length 3718 + uint8_t deltba[AC3_MAX_CHANNELS][9]; ///< Channel delta bit allocation 3719 + 3720 + int got_cplchan; 3721 + int chgaqgain[256]; ///< Channel gain adaptive quantization gain 3722 + float pre_chmant[6][AC3_MAX_CHANNELS][256]; ///< Pre channel mantissas 3723 + 3724 + int firstspxcos[AC3_MAX_CHANNELS]; ///< First spectral extension coordinates states 3725 + int firstcplcos[AC3_MAX_CHANNELS]; ///< First coupling coordinates states 3726 + int firstcplleak; ///< First coupling leak state 3727 +///@} 3728 + 3729 + int nrematbnds; ///< Number of rematrixing bands 3730 + int ncplsubnd; ///< Number of coupling sub-bands 3731 + int ncplbnd; ///< Number of structured coupled bands 3732 + 3733 + int nchgrps[AC3_MAX_CHANNELS]; ///< Number of fbw channel exponent groups 3734 + uint8_t dexps[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< Differential exponents 3735 + 3736 + int strtmant[AC3_MAX_CHANNELS]; ///< Start frequency bin 3737 + int endmant[AC3_MAX_CHANNELS]; ///< End frequency bin 3738 + int firstchincpl; 3739 + int ecpl_start_subbnd; ///< Enhanced coupling begin frequency 3740 + int ecpl_end_subbnd; ///< Enhanced coupling end frequency 3741 + 3742 + int necplbnd; ///< Number of structured enhanced coupling bands 3743 + int nspxbnds; ///< Number of structured spectral extension bands 3744 + int spxbndsztab[MAX_SPX_CODES]; ///< Sizes of spectral extension bands 3745 + int nfchans; ///< Number of fbw channels 3746 + 3747 + uint8_t bap[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< bit allocation pointers 3748 + uint8_t hebap[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< high-efficiency bit allocation pointers for AHT 3749 + int16_t psd[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< scaled exponents 3750 + int16_t bndpsd[AC3_MAX_CHANNELS][50]; ///< interpolated exponents 3751 + int16_t mask[AC3_MAX_CHANNELS][50]; ///< masking values 3752 + 3753 + float cplco[AC3_MAX_CHANNELS][18]; ///< coupling coordinates 3754 + float spxco[AC3_MAX_CHANNELS][18]; ///< Spectral extension coordinates 3755 + 3756 + AC3BitAllocParameters bit_alloc_params; ///< Bit allocation parameters 3757 + 3758 + AVRandomState dith_state; ///< for dither generation 3759 + 3760 + int num_channels; ///< Total of all channels 3761 + int lfe_channel; ///< Index of LFE channel 3762 + 3763 + GetBitContext *gbc; ///< Bitstream reader 3764 + 3765 + MDCTContext imdct_512; ///< for 512 sample imdct transform 3766 + MDCTContext imdct_256; ///< for 256 sample imdct transform 3767 + DSPContext dsp; ///< for optimization 3768 + 3769 + DECLARE_ALIGNED_16(float, transform_coeffs[AC3_MAX_CHANNELS][AC3_MAX_COEFS]); 3770 + DECLARE_ALIGNED_16(float, delay[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]); ///< delay - added to the next block 3771 + DECLARE_ALIGNED_16(float, window[AC3_BLOCK_SIZE]); ///< window coefficients 3772 + DECLARE_ALIGNED_16(float, tmp_output[AC3_BLOCK_SIZE * 24]); ///< temp storage for output before windowing 3773 + DECLARE_ALIGNED_16(float, tmp_imdct[AC3_BLOCK_SIZE * 24]); ///< temp storage for imdct transform 3774 + DECLARE_ALIGNED_16(float, output[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]); ///< output after imdct transform and windowing 3775 + DECLARE_ALIGNED_16(int16_t, int_output[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]);///< final 16-bit integer output 3776 + 3777 + 3778 + float add_bias; ///< offset for float_to_int16 conversion 3779 + float mul_bias; ///< scaling for float_to_int16 conversion 3780 +}EAC3Context; 3781 + 3782 +/** Channel gain adaptive quantization mode */ 3783 +typedef enum { 3784 + EAC3_GAQ_NO =0, 3785 + EAC3_GAQ_12, 3786 + EAC3_GAQ_14, 3787 + EAC3_GAQ_124 3788 +} EAC3GaqMode; 3789 + 3790 +#endif 3791 3792 --- mplayer-1.0.rc2svn20071207/libavcodec/aac_ac3_parser.c (revision 10235) 3793 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/aac_ac3_parser.c (working copy) 3794 @@ -48,7 +48,7 @@ 3795 s->inbuf_ptr += len; 3796 buf_size -= len; 3797 if ((s->inbuf_ptr - s->inbuf) == s->header_size) { 3798 - len = s->sync(s->inbuf, &channels, &sample_rate, &bit_rate, 3799 + len = s->sync(avctx, s->inbuf, &channels, &sample_rate, &bit_rate, 3800 &samples); 3801 if (len == 0) { 3802 /* no sync found : move by one byte (inefficient, but simple!) */ 3803 @@ -59,7 +59,7 @@ 3804 /* update codec info */ 3805 avctx->sample_rate = sample_rate; 3806 /* set channels,except if the user explicitly requests 1 or 2 channels, XXX/FIXME this is a bit ugly */ 3807 - if(avctx->codec_id == CODEC_ID_AC3){ 3808 + if(avctx->codec_id == CODEC_ID_AC3 || avctx->codec_id == CODEC_ID_EAC3){ 3809 if(avctx->channels!=1 && avctx->channels!=2){ 3810 avctx->channels = channels; 3811 3812 --- mplayer-1.0.rc2svn20071207/libavcodec/aac_ac3_parser.h (revision 10235) 3813 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/aac_ac3_parser.h (working copy) 3814 @@ -30,7 +30,7 @@ 3815 uint8_t *inbuf_ptr; 3816 int frame_size; 3817 int header_size; 3818 - int (*sync)(const uint8_t *buf, int *channels, int *sample_rate, 3819 + int (*sync)(AVCodecContext *avctx, const uint8_t *buf, int *channels, int *sample_rate, 3820 int *bit_rate, int *samples); 3821 uint8_t inbuf[8192]; /* input buffer */ 3822 } AACAC3ParseContext; 3823 3824 --- mplayer-1.0.rc2svn20071207/libavcodec/aac_parser.c (revision 10235) 3825 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/aac_parser.c (working copy) 3826 @@ -38,7 +38,7 @@ 3827 }; 3828 3829 3830 -static int aac_sync(const uint8_t *buf, int *channels, int *sample_rate, 3831 +static int aac_sync(AVCodecContext *avctx, const uint8_t *buf, int *channels, int *sample_rate, 3832 int *bit_rate, int *samples) 3833 { 3834 GetBitContext bits; 3835 3836 --- mplayer-1.0.rc2svn20071207/libavcodec/ac3_parser.c (revision 10235) 3837 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/ac3_parser.c (working copy) 3838 @@ -84,7 +84,7 @@ 3839 return 0; 3840 } 3841 3842 -static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate, 3843 +static int ac3_sync(AVCodecContext *avctx, const uint8_t *buf, int *channels, int *sample_rate, 3844 int *bit_rate, int *samples) 3845 { 3846 int err; 3847 @@ -100,12 +100,16 @@ 3848 3849 bsid = hdr.bsid; 3850 if(bsid <= 10) { /* Normal AC-3 */ 3851 + if(avctx->codec_id == CODEC_ID_EAC3) 3852 + avctx->codec_id = CODEC_ID_AC3; 3853 *sample_rate = hdr.sample_rate; 3854 *bit_rate = hdr.bit_rate; 3855 *channels = hdr.channels; 3856 *samples = AC3_FRAME_SIZE; 3857 return hdr.frame_size; 3858 } else if (bsid > 10 && bsid <= 16) { /* Enhanced AC-3 */ 3859 + if(avctx->codec_id == CODEC_ID_AC3) 3860 + avctx->codec_id = CODEC_ID_EAC3; 3861 init_get_bits(&bits, &buf[2], (AC3_HEADER_SIZE-2) * 8); 3862 strmtyp = get_bits(&bits, 2); 3863 substreamid = get_bits(&bits, 3); 3864 @@ -152,6 +156,13 @@ 3865 return 0; 3866 } 3867 3868 +AVCodecParser eac3_parser = { 3869 + { CODEC_ID_EAC3 }, 3870 + sizeof(AACAC3ParseContext), 3871 + ac3_parse_init, 3872 + ff_aac_ac3_parse, 3873 + NULL, 3874 +}; 3875 3876 AVCodecParser ac3_parser = { 3877 { CODEC_ID_AC3 }, 3878 3879 --- mplayer-1.0.rc2svn20071207/libavcodec/allcodecs.c (revision 10235) 3880 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/allcodecs.c (working copy) 3881 @@ -172,6 +172,7 @@ 3882 REGISTER_DECODER (COOK, cook); 3883 REGISTER_DECODER (DCA, dca); 3884 REGISTER_DECODER (DSICINAUDIO, dsicinaudio); 3885 + REGISTER_DECODER (EAC3, eac3); 3886 REGISTER_ENCDEC (FLAC, flac); 3887 REGISTER_DECODER (IMC, imc); 3888 REGISTER_ENCDEC (LIBAMR_NB, libamr_nb); 3889 @@ -266,6 +267,7 @@ 3890 REGISTER_PARSER (DCA, dca); 3891 REGISTER_PARSER (DVBSUB, dvbsub); 3892 REGISTER_PARSER (DVDSUB, dvdsub); 3893 + REGISTER_PARSER (EAC3, eac3); 3894 REGISTER_PARSER (H261, h261); 3895 REGISTER_PARSER (H263, h263); 3896 REGISTER_PARSER (H264, h264); 3897 3898 --- mplayer-1.0.rc2svn20071207/libavcodec/avcodec.h (revision 10235) 3899 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/avcodec.h (working copy) 3900 @@ -258,6 +258,7 @@ 3901 CODEC_ID_MUSEPACK7, 3902 CODEC_ID_MLP, 3903 CODEC_ID_GSM_MS, /* as found in WAV */ 3904 + CODEC_ID_EAC3, 3905 CODEC_ID_ATRAC3, 3906 CODEC_ID_VOXWARE, 3907 CODEC_ID_APE, 3908 3909 --- mplayer-1.0.rc2svn20071207/libavcodec/Makefile (revision 10235) 3910 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/Makefile (working copy) 3911 @@ -63,6 +63,7 @@ 3912 OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.o 3913 OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o 3914 OBJS-$(CONFIG_DXA_DECODER) += dxa.o 3915 +OBJS-$(CONFIG_EAC3_DECODER) += eac3dec.o ac3dec.o 3916 OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o 3917 OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o rangecoder.o golomb.o 3918 OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o rangecoder.o 3919 3920 --- mplayer-1.0.rc2svn20071207/libavcodec/ac3enc.c 2007-09-26 18:04:18.000000000 +0200 3921 +++ mplayer-1.0.rc2svn20071207.orig/libavcodec/ac3enc.c 2007-09-26 18:38:05.000000000 +0200 3922 @@ -67,6 +67,7 @@ 3923 static int16_t fft_rev[512]; 3924 static int16_t xcos1[128]; 3925 static int16_t xsin1[128]; 3926 +static int16_t ch_map[8] = { 0, 1, 2, 4, 5, 3, 6, 7}; // Remapping channels from uncompresed input 3927 3928 #define MDCT_NBITS 9 3929 #define N (1 << MDCT_NBITS) 3930 @@ -479,7 +480,8 @@ 3931 for(ch=0;ch<s->nb_all_channels;ch++) { 3932 ff_ac3_bit_alloc_calc_bap(mask[i][ch], psd[i][ch], 0, 3933 s->nb_coefs[ch], snroffset, 3934 - s->bit_alloc.floor, bap[i][ch]); 3935 + s->bit_alloc.floor, ff_ac3_baptab, 3936 + bap[i][ch]); 3937 frame_bits += compute_mantissa_size(s, bap[i][ch], 3938 s->nb_coefs[ch]); 3939 } 3940 @@ -644,6 +646,21 @@ 3941 avctx->frame_size = AC3_FRAME_SIZE; 3942 3943 ac3_common_init(); 3944 + 3945 + /* Channel mapping limited to acmod_defs */ 3946 + switch (channels) { 3947 + case 5: 3948 + ch_map[3] = 3; // BLwav_3 -> BLac3_3 3949 + ch_map[4] = 4; // BRwav_4 -> BRac3_4 3950 + case 3: 3951 + case 6: 3952 + ch_map[1] = 2; // FRwav_1 -> FRac3_2 3953 + ch_map[2] = 1; // FCwav_2 -> FCac3_1 3954 + break; 3955 + case 4: 3956 + ch_map[3] = 3; // BCwav_3 -> BCac3_3 3957 + break; 3958 + } 3959 3960 /* number of channels */ 3961 if (channels < 1 || channels > 6) 3962 @@ -1170,7 +1187,7 @@ 3963 /* compute input samples */ 3964 memcpy(input_samples, s->last_samples[ch], N/2 * sizeof(int16_t)); 3965 sinc = s->nb_all_channels; 3966 - sptr = samples + (sinc * (N/2) * i) + ch; 3967 + sptr = samples + (sinc * (N/2) * i) + ch_map[ch]; 3968 for(j=0;j<N/2;j++) { 3969 v = *sptr; 3970 input_samples[j + N/2] = v; 3971 3972 --- mplayer-1.0.rc2svn20071207/libavformat/wav.c 2007-09-14 00:02:18.000000000 +0200 3973 +++ mplayer-1.0.rc2svn20071207.orig/libavformat/wav.c 2007-09-25 23:32:14.000000000 +0200 3974 @@ -38,7 +38,7 @@ 3975 offset_t fmt, fact; 3976 3977 put_tag(pb, "RIFF"); 3978 - put_le32(pb, 0); /* file length */ 3979 + put_le32(pb, 36); // by the moment header length send 3980 put_tag(pb, "WAVE"); 3981 3982 /* format header */ 3983 3984 --- mplayer-1.0.rc2svn20071207.orig/etc/codecs.conf 3985 +++ mplayer-1.0.rc2svn20071207/etc/codecs.conf 3986 @@ -3240,3 +3240,10 @@ 3987 fourcc "MP3 " ; used in .nsv files 3988 fourcc "LAME" ; used in mythtv .nuv files 3989 driver hwmpa 3990 + 3991 +audiocodec ffeac3 3992 + info "FFmpeg EAC3" 3993 + status buggy 3994 + format 0x0 3995 + driver ffmpeg 3996 + dll "E-AC3" -
debian/patches/01_alpha-fix.dpatch
old new 1 #! /bin/sh /usr/share/dpatch/dpatch-run 2 ## 01_alpha-fix.dpatch by Christian Marillat <marillat@debian.org> 3 ## 4 ## All lines beginning with ## DP:' are a description of the patch. 5 ## DP: Replace xterm by x-terminal-emulator. 6 7 @DPATCH@ 8 9 --- mplayer-1.0-rc1svn20070917.orig/vidix/dha.c 2007-09-20 11:39:26.000000000 +0200 10 +++ mplayer-1.0-rc1svn20070917/vidix/dha.c 2007-09-20 11:39:44.000000000 +0200 11 @@ -185,7 +185,7 @@ 12 13 #endif /* Generic mmap (not win32, nor os2) */ 14 15 -#if !defined(__alpha__) && !defined(__powerpc__) 16 +#if !defined(__powerpc__) 17 unsigned char INPORT8(unsigned idx) 18 { 19 return inb(idx); 20 --- mplayer-1.0-rc1svn20070917.orig/vidix/pci.c 2007-09-20 11:40:40.000000000 +0200 21 +++ mplayer-1.0-rc1svn20070917/vidix/pci.c 2007-09-20 11:41:14.000000000 +0200 22 @@ -523,7 +523,7 @@ 23 unsigned int idx = 0; 24 struct pci_config_reg pcr; 25 int do_mode1_scan = 0; 26 -#if !defined(__alpha__) && !defined(__powerpc__) 27 +#if !defined(__powerpc__) 28 int do_mode2_scan = 0; 29 #endif 30 int func, hostbridges=0; -
mplayer-1.0.rc2svn20071207
old new 1 01_mplayer.conf.dpatch 2 02_configure.dpatch 3 03_eac3.dpatch -
debian/patches/05_ivtv.dpatch
old new 1 #! /bin/sh /usr/share/dpatch/dpatch-run 2 ## 06_ivtv.dpatch by Christian Marillat <marillat@debian.org> 3 ## 4 ## All lines beginning with ## DP:' are a description of the patch. 5 ## DP: Replace xterm by x-terminal-emulator. 6 7 @DPATCH@ 8 9 --- mplayer-1.0-rc1svn20071003.orig/libvo/vo_ivtv.c 2007-10-03 10:09:41.000000000 +0200 10 +++ mplayer-1.0-rc1svn20071003/libvo/vo_ivtv.c 2007-10-03 10:01:46.000000000 +0200 11 @@ -1,301 +1,226 @@ 12 -/* 13 - * Copyright (C) 2006 Benjamin Zores 14 - * Video output for WinTV PVR-150/250/350 (a.k.a IVTV) cards. 15 - * TV-Out through hardware MPEG decoder. 16 - * Based on some old code from ivtv driver authors. 17 - * See http://ivtvdriver.org/index.php/Main_Page for more details on the 18 - * cards supported by the ivtv driver. 19 +// Don't change for DVB card, it must be 2048 20 +#define PES_MAX_SIZE 2048 21 + 22 +/* 23 + * Based on: 24 + * 25 + * test_av.c - Test program for new API 26 * 27 - * This program is free software; you can redistribute it and/or modify 28 - * it under the terms of the GNU General Public License as published by 29 - * the Free Software Foundation; either version 2 of the License, or 30 - * (at your option) any later version. 31 + * Copyright (C) 2000 Ralph Metzler <ralph@xxxxxxxxxxxxxx> 32 + * & Marcus Metzler <marcus@xxxxxxxxxxxxxx> 33 + * for convergence integrated media GmbH 34 * 35 - * This program is distributed in the hope that it will be useful, 36 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 37 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 38 - * GNU General Public License for more details. 39 + * libav - MPEG-PS multiplexer, part of ffmpeg 40 + * Copyright Gerard Lantau (see http://ffmpeg.sf.net) 41 * 42 - * You should have received a copy of the GNU General Public License 43 - * along with this program; if not, write to the Free Software Foundation, 44 - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 45 */ 46 47 #include "config.h" 48 - 49 #include <stdio.h> 50 #include <stdlib.h> 51 #include <string.h> 52 #include <errno.h> 53 #include <sys/types.h> 54 #include <sys/stat.h> 55 -#include <sys/ioctl.h> 56 #include <fcntl.h> 57 #include <unistd.h> 58 -#include <stdlib.h> 59 -#include <inttypes.h> 60 -#include <linux/types.h> 61 -#include <linux/videodev2.h> 62 -#include <linux/ivtv.h> 63 -#include <linux/ioctl.h> 64 65 #include "mp_msg.h" 66 -#include "subopt-helper.h" 67 + 68 +#include "config.h" 69 #include "video_out.h" 70 #include "video_out_internal.h" 71 -#include "libmpdemux/mpeg_packetizer.h" 72 - 73 -#define DEFAULT_MPEG_DECODER "/dev/video16" 74 -#define IVTV_VO_HDR "VO: [ivtv]" 75 +#include "ivtv.h" 76 +#include <linux/ioctl.h> 77 78 -/* ivtv private */ 79 -int ivtv_fd = -1; 80 -static vo_mpegpes_t *pes; 81 - 82 -/* suboptions */ 83 -static int output = -1; 84 -static char *device = NULL; 85 - 86 -static opt_t subopts[] = { 87 - {"output", OPT_ARG_INT, &output, (opt_test_f)int_non_neg}, 88 - {"device", OPT_ARG_MSTRZ, &device, NULL}, 89 - {NULL} 90 -}; 91 +int vo_ivtv_fd=-1; 92 +//int vo_ivtv_fd2=-1; 93 94 static vo_info_t info = 95 { 96 - "IVTV MPEG Video Decoder TV-Out", 97 - "ivtv", 98 - "Benjamin Zores", 99 - "" 100 + "IVTV-Mpeg file", 101 + "ivtv", 102 + "A'rpi", 103 + "" 104 }; 105 -LIBVO_EXTERN (ivtv) 106 107 -/* ivtv internals */ 108 +char ivtvbuf[65536*4]; 109 +int ivtvlen = 0; 110 +char ivtvbuf2[65536*4]; 111 +int ivtvlen2 = 0; 112 + 113 +LIBVO_EXTERN (ivtv) 114 115 +static int int_pause; 116 static uint32_t 117 -ivtv_reset (int blank_screen) 118 +config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format) 119 { 120 - struct ivtv_cfg_stop_decode sd; 121 - struct ivtv_cfg_start_decode sd1; 122 - int flags = 0; 123 - 124 - if (blank_screen) 125 - flags |= IVTV_STOP_FL_HIDE_FRAME; 126 - sd.flags = flags; 127 - 128 - if (ioctl (ivtv_fd, IVTV_IOC_STOP_DECODE, &sd) < 0) 129 - { 130 - mp_msg (MSGT_VO, MSGL_ERR, 131 - "IVTV_IOC_STOP_DECODE: %s\n", strerror (errno)); 132 - return 1; 133 - } 134 - 135 - sd1.gop_offset = 0; 136 - sd1.muted_audio_frames = 0; 137 - 138 - if (ioctl (ivtv_fd, IVTV_IOC_START_DECODE, &sd1) < 0) 139 - { 140 - mp_msg (MSGT_VO, MSGL_ERR, 141 - "IVTV_IOC_START_DECODE: %s\n", strerror (errno)); 142 - return 1; 143 - } 144 - 145 - return 0; 146 +//printf("config\n"); 147 + return 0; 148 } 149 150 -int 151 -ivtv_write (unsigned char *data, int len) 152 -{ 153 - if (ivtv_fd < 0) 154 +static uint32_t preinit(const char *arg){ 155 +//printf("preinit\n"); 156 + vo_ivtv_fd=open(arg ? arg : "/dev/video16",O_RDWR); 157 + if(vo_ivtv_fd<0){ 158 + perror("vo_ivtv"); 159 + return -1; 160 + } 161 + //vo_ivtv_fd2=vo_ivtv_fd; 162 return 0; 163 - 164 - return write (ivtv_fd, data, len); 165 } 166 167 -/* video out functions */ 168 169 -static int 170 -config (uint32_t width, uint32_t height, 171 - uint32_t d_width, uint32_t d_height, 172 - uint32_t fullscreen, char *title, uint32_t format) 173 +static void draw_osd(void) 174 { 175 - return 0; 176 -} 177 - 178 -static int 179 -preinit (const char *arg) 180 -{ 181 - struct v4l2_output vout; 182 - int err; 183 - 184 - if (subopt_parse (arg, subopts) != 0) 185 - { 186 - mp_msg (MSGT_VO, MSGL_FATAL, 187 - "\n-vo ivtv command line help:\n" 188 - "Example: mplayer -vo ivtv:device=/dev/video16:output=2\n" 189 - "\nOptions:\n" 190 - " device=/dev/videoX\n" 191 - " Name of the MPEG decoder device file.\n" 192 - " output=<0-...>\n" 193 - " V4L2 id of the TV output.\n" 194 - "\n" ); 195 - return -1; 196 - } 197 - 198 - if (!device) 199 - device = strdup (DEFAULT_MPEG_DECODER); 200 - 201 - ivtv_fd = open (device, O_RDWR); 202 - if (ivtv_fd < 0) 203 - { 204 - free (device); 205 - mp_msg (MSGT_VO, MSGL_FATAL, "%s %s\n", IVTV_VO_HDR, strerror (errno)); 206 - return -1; 207 - } 208 - 209 - /* list available outputs */ 210 - vout.index = 0; 211 - err = 1; 212 - mp_msg (MSGT_VO, MSGL_INFO, "%s Available video outputs: ", IVTV_VO_HDR); 213 - while (ioctl (ivtv_fd, VIDIOC_ENUMOUTPUT, &vout) >= 0) 214 - { 215 - err = 0; 216 - mp_msg (MSGT_VO, MSGL_INFO, "'#%d, %s' ", vout.index, vout.name); 217 - vout.index++; 218 - } 219 - if (err) 220 - { 221 - mp_msg (MSGT_VO, MSGL_INFO, "none\n"); 222 - free (device); 223 - return -1; 224 - } 225 - else 226 - mp_msg (MSGT_VO, MSGL_INFO, "\n"); 227 - 228 - /* set user specified output */ 229 - if (output != -1) 230 - { 231 - if (ioctl (ivtv_fd, VIDIOC_S_OUTPUT, &output) < 0) 232 - { 233 - mp_msg (MSGT_VO, MSGL_ERR, 234 - "%s can't set output (%s)\n", IVTV_VO_HDR, strerror (errno)); 235 - free (device); 236 - return -1; 237 - } 238 - } 239 - 240 - /* display device name */ 241 - mp_msg (MSGT_VO, MSGL_INFO, "%s using %s\n", IVTV_VO_HDR, device); 242 - free (device); 243 - 244 - /* display current video output */ 245 - if (ioctl (ivtv_fd, VIDIOC_G_OUTPUT, &output) == 0) 246 - { 247 - vout.index = output; 248 - if (ioctl (ivtv_fd, VIDIOC_ENUMOUTPUT, &vout) < 0) 249 - { 250 - mp_msg (MSGT_VO, MSGL_ERR, 251 - "%s can't get output (%s).\n", IVTV_VO_HDR, strerror (errno)); 252 - return -1; 253 - } 254 - else 255 - mp_msg (MSGT_VO, MSGL_INFO, 256 - "%s video output: %s\n", IVTV_VO_HDR, vout.name); 257 - } 258 - else 259 - { 260 - mp_msg (MSGT_VO, MSGL_ERR, 261 - "%s can't get output (%s).\n", IVTV_VO_HDR, strerror (errno)); 262 - return -1; 263 - } 264 - 265 - /* clear output */ 266 - ivtv_reset (1); 267 - 268 - return 0; 269 +//printf("draw_osd\n"); 270 } 271 272 -static void 273 -draw_osd (void) 274 -{ 275 - /* do nothing */ 276 +static int ivtv_write(void){ 277 +//printf("ivtv_write\n"); 278 + int wrote,curlen; 279 + if (ivtvlen > 0) { 280 + char * ivtvbuf_ptr = &ivtvbuf[0]; 281 + curlen = ivtvlen; 282 + 283 + 284 + while (curlen > 0) { 285 + wrote=write(vo_ivtv_fd,ivtvbuf_ptr,curlen); 286 + ivtvbuf_ptr = ivtvbuf_ptr + wrote; 287 + curlen -= wrote; 288 + } 289 + } 290 + return 0; 291 +} 292 + 293 +static uint32_t draw_frame(uint8_t * src[]) 294 +{ 295 +//printf("draw_frame\n"); 296 + vo_mpegpes_t *p=(vo_mpegpes_t *)src[0]; 297 + memcpy(&ivtvbuf[0], p->data, p->size); 298 + ivtvlen = p->size; 299 + return 0; 300 } 301 302 -static int 303 -draw_frame (uint8_t * src[]) 304 +static void flip_page (void) 305 { 306 - pes = (vo_mpegpes_t *) src[0]; 307 - return 0; 308 +//printf("flip_page\n"); 309 + ivtv_write(); 310 } 311 312 -static void 313 -flip_page (void) 314 +static uint32_t reset_ivtv (int blank_scrn) 315 { 316 - if (ivtv_fd < 0) 317 - return; 318 - 319 - if (!pes) 320 - return; 321 - 322 - send_mpeg_pes_packet (pes->data, pes->size, pes->id, 323 - pes->timestamp ? pes->timestamp : vo_pts, 2, 324 - ivtv_write); 325 +//printf("reset_ivtv\n"); 326 + struct ivtv_cfg_stop_decode sd; 327 + sd.hide_last = blank_scrn; 328 + sd.pts_stop = 0; 329 + struct ivtv_cfg_start_decode sd1; 330 + sd1.gop_offset = 0; 331 + sd1.muted_audio_frames = 0; 332 + 333 + //if (!blank_scrn) 334 + // ivtvlen = 0; 335 + //if (blank_scrn) 336 + //ivtvlen2 = 0; 337 + 338 + while (ioctl(vo_ivtv_fd,IVTV_IOC_STOP_DECODE, &sd) < 0){ 339 + if (errno != EBUSY){ 340 + perror("IVTV_IOC_STOP_DECODE: "); 341 + return 1; 342 + } 343 + } 344 + while (ioctl(vo_ivtv_fd,IVTV_IOC_DEC_FLUSH, 0) < 0){ 345 + if (errno != EBUSY){ 346 + perror("IVTV_IOC_DEC_FLUSH: "); 347 + return 1; 348 + } 349 + } 350 + while (ioctl(vo_ivtv_fd,IVTV_IOC_START_DECODE, &sd1) < 0){ 351 + if (errno != EBUSY){ 352 + perror("IVTV_IOC_START_DECODE: "); 353 + return 1; 354 + } 355 + } 356 + //uninit(); 357 + //preinit((const char *) NULL); 358 + return 0; 359 360 - /* ensure flip_page() won't be called twice */ 361 - pes = NULL; 362 } 363 364 -static int 365 -draw_slice (uint8_t *image[], int stride[], int w, int h, int x, int y) 366 +static uint32_t draw_slice(uint8_t *srcimg[], int stride[], int w,int h,int x0,int y0) 367 { 368 - return 0; 369 +//printf("draw_slice\n"); 370 + return 0; 371 } 372 373 -static void 374 -uninit (void) 375 -{ 376 - if (ivtv_fd < 0) 377 - return; 378 379 - /* clear output */ 380 - ivtv_reset (1); 381 - 382 - /* close device */ 383 - close (ivtv_fd); 384 - ivtv_fd = -1; 385 +static uint32_t 386 +query_format(uint32_t format) 387 +{ 388 +//printf("query_format\n"); 389 + if(format==IMGFMT_MPEGPES) return 3|VFCAP_TIMER; 390 + return 0; 391 } 392 393 static void 394 -check_events (void) 395 +uninit(void) 396 { 397 - /* do nothing */ 398 +//printf("uninit\n"); 399 + //if(vo_ivtv_fd2>=0 && vo_ivtv_fd2!=vo_ivtv_fd) close(vo_ivtv_fd2); 400 + //vo_ivtv_fd2=-1; 401 + if(vo_ivtv_fd>=0){ close(vo_ivtv_fd);vo_ivtv_fd=-1;} 402 } 403 404 -static int 405 -query_format (uint32_t format) 406 + 407 +static void check_events(void) 408 { 409 - if (format != IMGFMT_MPEGPES) 410 - return 0; 411 - 412 - return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_TIMER; 413 +//printf("check_events\n"); 414 } 415 416 -static int 417 -control (uint32_t request, void *data, ...) 418 +static uint32_t control(uint32_t request, void *data, ...) 419 { 420 - switch (request) 421 - { 422 +//printf("control\n"); 423 +//printf("request = %d\n",request); 424 + switch (request) { 425 case VOCTRL_PAUSE: 426 + { 427 + //printf("pausing\n"); 428 + reset_ivtv(0); 429 + //while (ioctl(vo_ivtv_fd,IVTV_IOC_PAUSE, 0) < 0){ 430 + //if (ioctl(vo_ivtv_fd,IVTV_IOC_PAUSE, 0) < 0){ 431 + // if (errno != EBUSY){ 432 + // perror("IVTV_IOC_PAUSE: "); 433 + // break; 434 + //} 435 + //} 436 + return (int_pause=1); 437 + } 438 + 439 case VOCTRL_RESUME: 440 - return ivtv_reset (0); 441 + { 442 + //printf("resuming\n"); 443 + reset_ivtv(0); 444 + //while (ioctl(vo_ivtv_fd,IVTV_IOC_PLAY, 0) < 0){ 445 + //if (ioctl(vo_ivtv_fd,IVTV_IOC_PLAY, 0) < 0){ 446 + // if (errno != EBUSY){ 447 + // perror("IVTV_IOC_PLAY: "); 448 + // break; 449 + // } 450 + //} 451 + return (int_pause=0); 452 + } 453 454 case VOCTRL_RESET: 455 - return ivtv_reset (1); 456 + return reset_ivtv(1); 457 + 458 + case VOCTRL_DUPLICATE_FRAME: 459 + { 460 + flip_page(); 461 + return VO_TRUE; 462 + } 463 464 case VOCTRL_QUERY_FORMAT: 465 - return query_format (*((uint32_t*) data)); 466 + return query_format(*((uint32_t*)data)); 467 } 468 - 469 return VO_NOTIMPL; 470 } 471 472 --- mplayer-1.0-rc1svn20071003.orig/mplayer.c 2007-10-03 10:27:50.000000000 +0200 473 +++ mplayer-1.0-rc1svn20071003/mplayer.c 2007-10-03 10:29:16.000000000 +0200 474 @@ -1881,7 +1881,7 @@ 475 //============================== SLEEP: =================================== 476 477 // flag 256 means: libvo driver does its timing (dvb card) 478 - if (*time_frame > 0.001 && !(vo_flags&256)) 479 + if (*time_frame > 0.001) 480 *time_frame = timing_sleep(*time_frame); 481 return frame_time_remaining; 482 } 483 484 --- mplayer-1.0-rc1svn20071003.orig/libvo/video_out.c 2007-10-03 10:31:44.000000000 +0200 485 +++ mplayer-1.0-rc1svn20071003/libvo/video_out.c 2007-10-03 10:33:45.000000000 +0200 486 @@ -101,6 +101,7 @@ 487 extern vo_functions_t video_out_dxr3; 488 #ifdef HAVE_IVTV 489 extern vo_functions_t video_out_ivtv; 490 +extern vo_functions_t video_out_ivtvosd; 491 #endif 492 #ifdef HAVE_V4L2_DECODER 493 extern vo_functions_t video_out_v4l2; 494 @@ -220,6 +221,7 @@ 495 #endif 496 #ifdef HAVE_IVTV 497 &video_out_ivtv, 498 + &video_out_ivtvosd, 499 #endif 500 #ifdef HAVE_V4L2_DECODER 501 &video_out_v4l2, -
debian/patches/01_mplayer.conf.dpatch
old new 1 #! /bin/sh /usr/share/dpatch/dpatch-run 2 ## 01_mplayer.conf.dpatch by Christian Marillat <marillat@debian.org> 3 ## 4 ## All lines beginning with ## DP:' are a description of the patch. 5 ## DP: Replace xterm by x-terminal-emulator. 6 7 @DPATCH@ 8 9 --- mplayer-1.0.orig/etc/example.conf 2006-02-21 13:49:09.000000000 +0100 10 +++ mplayer-1.0/etc/example.conf 2006-02-21 13:50:10.000000000 +0100 11 @@ -71,7 +71,7 @@ 12 ################## 13 14 # Specify default audio driver (see -ao help for a list). 15 -#ao=oss 16 +ao=alsa, 17 18 # Use SDL audio driver with the esd subdriver by default. 19 #ao = sdl:esd 20 @@ -118,6 +118,11 @@ 21 # DVD: Play English audio tracks if available. 22 #alang = en 23 24 +# get a default OSD font from fontconfig 25 + 26 +fontconfig = yes 27 +font = "Sans" 28 +subfont-text-scale = 3 29 30 # You can also include other configuration files. 31 #include = /path/to/the/file/you/want/to/include -
debian/patches/02_configure.dpatch
old new 1 #! /bin/sh /usr/share/dpatch/dpatch-run 2 ## 02_configure.dpatch by Christian Marillat <marillat@debian.org> 3 ## 4 ## All lines beginning with ## DP:' are a description of the patch. 5 ## DP: Replace xterm by x-terminal-emulator. 6 7 @DPATCH@ 8 9 --- mplayer-1.0.orig/configure 2006-10-29 08:37:51.000000000 +0100 10 +++ mplayer-1.0/configure 2006-10-29 08:42:23.000000000 +0100 11 @@ -1872,7 +1872,7 @@ 12 iproc='ia64' 13 proc='' 14 _march='' 15 - _mcpu='' 16 + _mcpu='-mtune=itanium1' 17 _optimizing='' 18 ;; 19 20 @@ -3784,7 +3784,7 @@ 21 22 23 echocheck "DirectFB" 24 -if test "$_directfb" = auto ; then 25 +if test "$_directfb" = yes ; then 26 _directfb=no 27 cat > $TMPC <<EOF 28 #include <directfb.h> 29 @@ -3794,6 +3794,7 @@ 30 -I/usr/include/directfb -I/usr/local/include; do 31 cc_check $_inc_tmp -ldirectfb && _directfb=yes && \ 32 _inc_extra="$_inc_extra $_inc_tmp" && break 33 + _directfb=yes 34 done 35 fi 36 37 @@ -4935,7 +4936,7 @@ 38 fi 39 if test "$_ivtv" = yes ; then 40 _def_ivtv='#define HAVE_IVTV 1' 41 - _vosrc="$_vosrc vo_ivtv.c" 42 + _vosrc="$_vosrc vo_ivtv.c vo_ivtvosd.c" 43 _vomodules="ivtv $_vomodules" 44 _aosrc="$_aosrc ao_ivtv.c" 45 _aomodules="ivtv $_aomodules" -
debian/patches/00list.alpha
old new 1 01_alpha-fix.dpatch -
debian/patches/00list.sparc
old new 1 01_mcpu-sparc.dpatch -
mplayer-1.0.rc2svn20071207
old new 1 Source: mplayer 2 Section: graphics 3 Priority: extra 4 Maintainer: Christian Marillat <marillat@debian.org> 5 Bugs: mailto:marillat@debian.org 6 Homepage: http://www.mplayerhq.hu/ 7 Standards-Version: 3.7.3 8 Build-Depends: debhelper (>> 5), libncurses5-dev, libxv-dev, ccache, libdts-dev, 9 libesd0-dev, liblircclient-dev, libgtk2.0-dev, libvorbis-dev, libsdl1.2-dev, 10 libmad0-dev, libasound2-dev (>= 1.0.1), liblzo2-dev, libfaad-dev, libxvmc-dev, 11 gawk, libjpeg62-dev, libaudiofile-dev, libsmbclient-dev, libfribidi-dev, dpatch, 12 libpng3-dev, libungif4-dev, libggi2-dev, libaa1-dev, liblame-dev, libopenal-dev, 13 libcdparanoia0-dev, libxvidcore4-dev, libdv-dev, libcaca-dev, 14 liblivemedia-dev (>= 2004.05.01), libfreetype6-dev, em8300-headers, ladspa-sdk, 15 libgl1-mesa-swx11-dev | libgl-dev, libdirectfb-dev (>= 1.0.1), libdvdread-dev, libfaac-dev, libtheora-dev, 16 libx264-dev (>= 0.svn20070309-4), libglu1-mesa-dev, libartsc0-dev, 17 libfontconfig-dev, libaudio-dev, libdvdnav-dev, libpulse-dev, libspeex-dev, 18 libxxf86dga-dev, libjack-dev, libvstream-dev, libmpcdec-dev, 19 libxinerama-dev, libtwolame-dev, libamrwb-dev, libamrnb-dev 20 21 Package: mplayer 22 Architecture: powerpc 23 Depends: ${shlibs:Depends}, mplayer-skin 24 Suggests: libdvdcss, mplayer-doc 25 Conflicts: mplayer-g4, mplayer-altivec, mplayer-custom, libconfhelper-perl 26 Replaces: mplayer-g4, mplayer-altivec, mplayer-custom, mplayer-powerpc 27 Description: The Ultimate Movie Player For Linux 28 It plays most mpeg, avi and asf files, supported by many native and win32 29 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 30 big feature of mplayer is the wide range of supported output drivers. It 31 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 32 this way all drivers of SDL) and some lowlevel card-specific drivers (for 33 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 34 so you can enjoy movies in fullscreen. 35 . 36 This version is for PowerPC CPUs. 37 38 Package: mplayer-powerpc 39 Architecture: powerpc 40 Depends: mplayer 41 Conflicts: mplayer-g4, mplayer-altivec, mplayer-custom, libconfhelper-perl 42 Replaces: mplayer-g4, mplayer-altivec, mplayer-custom 43 Description: Transitional package for mplayer 44 Transitional package to install mplayer. 45 46 Package: mplayer-g4 47 Architecture: powerpc 48 Depends: ${shlibs:Depends}, mplayer-skin 49 Suggests: libdvdcss, mplayer-doc 50 Conflicts: mplayer-powerpc, mplayer-altivec, mplayer-custom, libconfhelper-perl 51 Replaces: mplayer-powerpc, mplayer-altivec, mplayer-custom 52 Provides: mplayer 53 Description: The Ultimate Movie Player For Linux 54 It plays most mpeg, avi and asf files, supported by many native and win32 55 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 56 big feature of mplayer is the wide range of supported output drivers. It 57 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 58 this way all drivers of SDL) and some lowlevel card-specific drivers (for 59 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 60 so you can enjoy movies in fullscreen. 61 . 62 This version is for G4 CPUs with Altivec. 63 64 Package: mencoder 65 Architecture: powerpc 66 Depends: ${shlibs:Depends} 67 Suggests: libdvdcss, mplayer-doc 68 Conflicts: mencoder-g4, mencoder-altivec, mencoder-custom 69 Replaces: mencoder-g4, mencoder-altivec, mencoder-custom, mencoder-powerpc 70 Description: MPlayer's Movie Encoder 71 A simple movie encoder, designed to encode MPlayer-playable movies 72 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 73 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 74 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 75 video resizing abilities. 76 . 77 This version is for PowerPC CPUs. 78 79 Package: mencoder-powerpc 80 Architecture: powerpc 81 Depends: ${shlibs:Depends} 82 Description: Transitional package for mencoder 83 Transitional package to install mencoder. 84 85 Package: mencoder-g4 86 Architecture: powerpc 87 Depends: ${shlibs:Depends} 88 Suggests: libdvdcss, mplayer-doc 89 Conflicts: mencoder-powerpc, mencoder-altivec, mencoder-custom 90 Replaces: mencoder-powerpc, mencoder-altivec, mencoder-custom 91 Provides: mencoder 92 Description: MPlayer's Movie Encoder 93 A simple movie encoder, designed to encode MPlayer-playable movies 94 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 95 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 96 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 97 video resizing abilities. 98 . 99 This version is for G4 CPUs with Altivec. 100 101 Package: mplayer-doc 102 Architecture: all 103 Section: doc 104 Description: Documentation for mplayer 105 This package contains the documentation Chinese, English, French, German, 106 Hungarian, Italian and Polish. -
mplayer-1.0.rc2svn20071207
old new 1 Source: mplayer 2 Section: graphics 3 Priority: extra 4 Maintainer: Christian Marillat <marillat@debian.org> 5 Bugs: mailto:marillat@debian.org 6 Homepage: http://www.mplayerhq.hu/ 7 Standards-Version: 3.7.3 8 Build-Depends: debhelper (>> 5), libncurses5-dev, libxv-dev, libfaac-dev, dpatch, 9 libesd0-dev, liblircclient-dev, libgtk2.0-dev, libvorbis-dev, libsdl1.2-dev, 10 libmad0-dev, libasound2-dev (>= 1.0.1), liblzo2-dev, libfaad-dev, libxvmc-dev, 11 gawk, libjpeg62-dev, libaudiofile-dev, libsmbclient-dev, libfribidi-dev, libspeex-dev, 12 libpng3-dev, libungif4-dev, libggi2-dev, libaa1-dev, liblame-dev, libdv-dev, 13 libcdparanoia0-dev, libxvidcore4-dev, libcaca-dev, liblivemedia-dev (>= 2004.05.01), 14 libfreetype6-dev, em8300-headers, libgl1-mesa-swx11-dev | libgl-dev, libdirectfb-dev (>= 1.0.1), libdvdread-dev, 15 libtheora-dev, libglu1-mesa-dev, libartsc0-dev, libfontconfig-dev, libdts-dev, 16 libaudio-dev, ladspa-sdk, libx264-dev (>= 0.svn20070309-4), libdvdnav-dev, 17 libxxf86dga-dev, ccache, libjack-dev, libvstream-dev, libmpcdec-dev, 18 libxinerama-dev, libtwolame-dev, libpulse-dev, libopenal-dev, libamrwb-dev, libamrnb-dev 19 20 Package: mplayer 21 Architecture: hppa 22 Depends: ${shlibs:Depends}, mplayer-skin 23 Suggests: libdvdcss, mplayer-doc 24 Conflicts: mplayer-custom, mplayer-nogui, libconfhelper-perl 25 Replaces: mplayer-custom, mplayer-nogui 26 Description: The Ultimate Movie Player For Linux 27 It plays most mpeg, avi and asf files, supported by many native and win32 28 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 29 big feature of mplayer is the wide range of supported output drivers. It 30 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 31 this way all drivers of SDL) and some lowlevel card-specific drivers (for 32 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 33 so you can enjoy movies in fullscreen. 34 . 35 This version is for Hppa CPUs. 36 37 Package: mencoder 38 Architecture: hppa 39 Depends: ${shlibs:Depends} 40 Suggests: libdvdcss, mplayer-doc 41 Conflicts: mencoder-custom 42 Replaces: mencoder-custom 43 Description: MPlayer's Movie Encoder 44 A simple movie encoder, designed to encode MPlayer-playable movies 45 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 46 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 47 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 48 video resizing abilities. 49 . 50 This version is for Hppa CPUs. 51 52 Package: mplayer-nogui 53 Architecture: hppa 54 Depends: ${shlibs:Depends} 55 Suggests: w32codecs (>= 0.91-1), libdvdcss, mplayer-doc 56 Conflicts: mplayer, mplayer-custom, mplayer-skin, libconfhelper-perl 57 Replaces: mplayer, mplayer-custom 58 Provides: mplayer 59 Description: The Ultimate Movie Player For Linux 60 It plays most mpeg, avi and asf files, supported by many native and win32 61 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 62 big feature of mplayer is the wide range of supported output drivers. It 63 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 64 this way all drivers of SDL) and some lowlevel card-specific drivers (for 65 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 66 so you can enjoy movies in fullscreen. 67 . 68 This version if for Hppa but doesn't have the User Interface in GTK+. 69 70 Package: mplayer-doc 71 Architecture: all 72 Section: doc 73 Description: Documentation for mplayer 74 This package contains the documentation Chinese, English, French, German, 75 Hungarian, Italian and Polish. -
mplayer-1.0.rc2svn20071207
old new 1 Source: mplayer 2 Section: graphics 3 Priority: extra 4 Maintainer: Christian Marillat <marillat@debian.org> 5 Bugs: mailto:marillat@debian.org 6 Homepage: http://www.mplayerhq.hu/ 7 Standards-Version: 3.7.3 8 Build-Depends: debhelper (>> 5), libncurses5-dev, libesd0-dev, liblircclient-dev, 9 libgtk2.0-dev, libvorbis-dev, libsdl1.2-dev, libmad0-dev, ccache, libdts-dev, 10 libasound2-dev (>= 1.0.1), liblzo2-dev, libfaad-dev, gawk, libjpeg62-dev, 11 libaudiofile-dev, libfribidi-dev, libpng3-dev, libungif4-dev, dpatch, 12 libggi2-dev, liblame-dev, libcdparanoia0-dev, libxvidcore4-dev, libdv-dev, 13 libcaca-dev, liblivemedia-dev (>= 2004.05.01), libfreetype6-dev, em8300-headers, 14 libgl1-mesa-swx11-dev | libgl-dev, libxvmc-dev, libdvdread-dev, libtheora-dev, libx264-dev (>= 0.svn20070309-4), 15 libglu1-mesa-dev, libartsc0-dev, libfontconfig-dev, libpulse-dev, libxv-dev, 16 libaudio-dev, libxxf86dga-dev, libspeex-dev, libopenal-dev, 17 libjack-dev, libdvdnav-dev, libxinerama-dev, libtwolame-dev, libamrwb-dev, libamrnb-dev 18 19 Package: mplayer-custom 20 Architecture: any 21 Depends: ${shlibs:Depends}, mplayer-skin 22 Suggests: w32codecs (>= 1:20050412-0.1), libdvdcss, mplayer-doc 23 Conflicts: mplayer-386, mplayer-586, mplayer-686, mplayer-k6, mplayer-k7, mplayer-powerpc, mplayer-altivec, mplayer-g4, libconfhelper-perl 24 Replaces: mplayer-386, mplayer-586, mplayer-686, mplayer-k6, mplayer-k7, mplayer-powerpc, mplayer-altivec, mplayer-g4 25 Provides: mplayer 26 Description: The Ultimate Movie Player For Linux 27 It plays most mpeg, avi and asf files, supported by many native and win32 28 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 29 big feature of mplayer is the wide range of supported output drivers. It 30 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 31 this way all drivers of SDL) and some lowlevel card-specific drivers (for 32 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 33 so you can enjoy movies in fullscreen. 34 . 35 This version is for your own machine :-) 36 37 Package: mencoder-custom 38 Architecture: any 39 Depends: ${shlibs:Depends} 40 Suggests: w32codecs (>= 1:20050412-0.1), libdvdcss, mplayer-doc 41 Conflicts: mencoder-386, mencoder-586, mencoder-686, mencoder-k6, mencoder-k7, mencoder-powerpc, mencoder-altivec, mencoder-g4 42 Replaces: mencoder-386, mencoder-586, mencoder-686, mencoder-k6, mencoder-k7, mencoder-powerpc, mencoder-altivec, mencoder-g4 43 Provides: mencoder 44 Description: MPlayer's Movie Encoder 45 A simple movie encoder, designed to encode MPlayer-playable movies 46 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 47 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 48 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 49 video resizing abilities. 50 . 51 This version is for your own machine :-) 52 53 Package: mplayer-doc 54 Architecture: all 55 Section: doc 56 Description: Documentation for mplayer 57 This package contains the documentation Chinese, English, French, German, 58 Hungarian, Italian and Polish. -
mplayer-1.0.rc2svn20071207
old new 1 5 -
mplayer-1.0.rc2svn20071207
old new 1 application/x-ogg; /usr/bin/gmplayer %s; description="OggVorbis Audio" 2 application/ogg; /usr/bin/gmplayer %s; description="OggVorbis Audio" 3 audio/mpeg; /usr/bin/gmplayer %s; description="MPEG Audio Format" 4 audio/x-mpegurl; /usr/bin/gmplayer %s; description="Icecast Playlists" 5 audio/x-ms-wax; /usr/bin/gmplayer %s; description="Audio Format" 6 audio/x-ms-wma; /usr/bin/gmplayer %s; description="Audio Format" 7 audio/x-pls; /usr/bin/gmplayer %s; description="MP3 ShoutCast/IceCast Playlist" 8 audio/x-scpls; /usr/bin/gmplayer %s; description="Shoutcast Playlists" 9 audio/x-wav; /usr/bin/gmplayer %s; description="Waveform Microsoft Wave/RIFF" 10 video/mpeg; /usr/bin/gmplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY" 11 video/quicktime; /usr/bin/gmplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY" 12 video/x-mpeg2; /usr/bin/gmplayer %s; description="MPEG Video"; test=test -n "$DISPLAY" 13 video/x-mpeg; /usr/bin/gmplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" 14 video/x-ms-afs; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" 15 video/x-ms-asf; /usr/bin/gmplayer %s; description="MS ASF video"; test=test -n "$DISPLAY" 16 video/x-msvideo; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" 17 video/x-ms-wma; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" 18 video/x-ms-wmv; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" 19 video/x-ms-wmx; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" 20 video/x-ms-wvx; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -
mplayer-1.0.rc2svn20071207
old new 1 ?package(mplayer):needs="X11" section="Applications/Viewers" \ 2 title="MPlayer" \ 3 icon="/usr/share/pixmaps/mplayer.xpm" \ 4 command="/usr/bin/gmplayer" -
mplayer-1.0.rc2svn20071207
old new 1 application/x-ogg 2 short_list_application_ids_for_novice_user_level=xmms,freeamp,mplayer 3 short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mplayer 4 short_list_application_ids_for_advanced_user_level=xmms,freeamp,mplayer 5 6 application/ogg 7 short_list_application_ids_for_novice_user_level=xmms,freeamp,mplayer 8 short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mplayer 9 short_list_application_ids_for_advanced_user_level=xmms,freeamp,mplayer 10 11 audio/mpeg 12 short_list_application_ids_for_novice_user_level=xmms,freeamp,mplayer 13 short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mplayer 14 short_list_application_ids_for_advanced_user_level=xmms,freeamp,mplayer 15 16 audio/x-mpegurl 17 short_list_application_ids_for_novice_user_level=xmms-no-uris,freeamp-no-uris,mplayer 18 short_list_application_ids_for_intermediate_user_level=xmms-no-uris,freeamp-no-uris,mplayer 19 short_list_application_ids_for_advanced_user_level=xmms-no-uris,freeamp-no-uris,mplayer 20 21 audio/x-ms-wax 22 default_action_type=application 23 short_list_application_ids_for_novice_user_level=mplayer 24 short_list_application_ids_for_intermediate_user_level=mplayer 25 short_list_application_ids_for_advanced_user_level=mplayer 26 27 audio/x-ms-wma 28 default_action_type=application 29 short_list_application_ids_for_novice_user_level=mplayer 30 short_list_application_ids_for_intermediate_user_level=mplayer 31 short_list_application_ids_for_advanced_user_level=mplayer 32 33 audio/x-pls 34 default_action_type=application 35 short_list_application_ids_for_novice_user_level=mplayer 36 short_list_application_ids_for_intermediate_user_level=mplayer 37 short_list_application_ids_for_advanced_user_level=mplayer 38 39 audio/x-scpls 40 short_list_application_ids_for_novice_user_level=xmms,freeamp,mplayer 41 short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mplayer 42 short_list_application_ids_for_advanced_user_level=xmms,freeamp,mplayer 43 44 audio/x-wav 45 short_list_application_ids_for_novice_user_level=grecord,xmms,freeamp,mplayer 46 short_list_application_ids_for_intermediate_user_level=grecord,xmms,freeamp,mplayer 47 short_list_application_ids_for_advanced_user_level=grecord,xmms,freeamp,mplayer 48 49 video/mpeg 50 short_list_application_ids_for_novice_user_level=mplayer,vlc,xmps,plaympeg,omsomi,mpeg_play,gtv 51 short_list_application_ids_for_intermediate_user_level=mplayer,vlc,xmps,plaympeg,omsomi,mpeg_play,gtv 52 short_list_application_ids_for_advanced_user_level=mplayer,vlc,xmps,plaympeg,omsomi,mpeg_play,gtv 53 54 video/quicktime 55 short_list_application_ids_for_novice_user_level=mplayer,xanim 56 short_list_application_ids_for_intermediate_user_level=mplayer,xanim 57 short_list_application_ids_for_advanced_user_level=mplayer,xanim 58 59 video/x-mpeg2 60 default_action_type=application 61 short_list_application_ids_for_novice_user_level=mplayer 62 short_list_application_ids_for_intermediate_user_level=mplayer 63 short_list_application_ids_for_advanced_user_level=mplayer 64 65 video/x-mpeg 66 default_action_type=application 67 short_list_application_ids_for_novice_user_level=mplayer,xmms,freeamp 68 short_list_application_ids_for_intermediate_user_level=mplayer,xmms,freeamp 69 short_list_application_ids_for_advanced_user_level=mplayer,xmms,freeamp 70 71 video/x-ms-afs 72 default_action_type=application 73 short_list_application_ids_for_novice_user_level=mplayer 74 short_list_application_ids_for_intermediate_user_level=mplayer 75 short_list_application_ids_for_advanced_user_level=mplayer 76 77 video/x-ms-asf 78 default_action_type=application 79 short_list_application_ids_for_novice_user_level=mplayer,xmps 80 short_list_application_ids_for_intermediate_user_level=mplayer,xmps 81 short_list_application_ids_for_advanced_user_level=mplayer,xmps 82 83 video/x-msvideo 84 default_action_type=application 85 short_list_application_ids_for_novice_user_level=mplayer,xmps,omsomi,gtv,xanim 86 short_list_application_ids_for_intermediate_user_level=mplayer,xmps,omsomi,gtv,xanim 87 short_list_application_ids_for_advanced_user_level=mplayer,xmps,omsomi,gtv,xanim 88 89 video/x-ms-wma 90 default_action_type=application 91 short_list_application_ids_for_novice_user_level=mplayer 92 short_list_application_ids_for_intermediate_user_level=mplayer 93 short_list_application_ids_for_advanced_user_level=mplayer 94 95 video/x-ms-wmv 96 default_action_type=application 97 short_list_application_ids_for_novice_user_level=mplayer 98 short_list_application_ids_for_intermediate_user_level=mplayer 99 short_list_application_ids_for_advanced_user_level=mplayer 100 101 video/x-ms-wmx 102 default_action_type=application 103 short_list_application_ids_for_novice_user_level=mplayer 104 short_list_application_ids_for_intermediate_user_level=mplayer 105 short_list_application_ids_for_advanced_user_level=mplayer 106 107 video/x-ms-wvx 108 default_action_type=application 109 short_list_application_ids_for_novice_user_level=mplayer 110 short_list_application_ids_for_intermediate_user_level=mplayer 111 short_list_application_ids_for_advanced_user_level=mplayer -
mplayer-1.0.rc2svn20071207
old new 1 Source: mplayer 2 Section: graphics 3 Priority: extra 4 Maintainer: Christian Marillat <marillat@debian.org> 5 Bugs: mailto:marillat@debian.org 6 Homepage: http://www.mplayerhq.hu/ 7 Standards-Version: 3.7.3 8 Build-Depends: debhelper (>> 5), libncurses5-dev, libxv-dev, dpatch, libdts-dev, 9 libesd0-dev, libsdl1.2-dev, liblircclient-dev, libgtk2.0-dev, libvorbis-dev, 10 libmad0-dev, libasound2-dev, libfaad-dev, liblzo2-dev, gawk, libfribidi-dev, 11 libxvmc-dev, libjpeg62-dev, libaudiofile-dev, libsmbclient-dev, libpng3-dev, 12 libungif4-dev, libggi2-dev, ccache, libaa1-dev, liblame-dev, libcaca-dev, 13 libcdparanoia0-dev, libxvidcore4-dev, libdv-dev, liblivemedia-dev (>= 2004.05.01), 14 libfreetype6-dev, em8300-headers, libgl1-mesa-swx11-dev | libgl-dev, libx264-dev (>= 0.svn20070309-4), 15 libdirectfb-dev (>= 1.0.1), ladspa-sdk, libdvdread-dev | libdvdread2-dev, libtheora-dev, 16 libglu1-mesa-dev, libartsc0-dev, libvstream-dev, libxxf86dga-dev, libfaac-dev, 17 libjack-dev, libmpcdec-dev, libxinerama-dev, libaudio-dev, libdvdnav-dev, 18 libtwolame-dev, libpulse-dev, libspeex-dev, libopenal-dev, libamrwb-dev, 19 libamrnb-dev 20 21 Package: mplayer 22 Architecture: amd64 23 Depends: ${shlibs:Depends}, mplayer-skin 24 Suggests: libdvdcss, mplayer-doc 25 Conflicts: mplayer-custom, mplayer-nogui, libconfhelper-perl 26 Replaces: mplayer-custom, mplayer-amd64, mplayer-nogui 27 Description: The Ultimate Movie Player For Linux 28 It plays most mpeg, avi and asf files, supported by many native and win32 29 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 30 big feature of mplayer is the wide range of supported output drivers. It 31 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 32 this way all drivers of SDL) and some lowlevel card-specific drivers (for 33 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 34 so you can enjoy movies in fullscreen. 35 . 36 This version is for amd64 CPU. 37 38 Package: mencoder 39 Architecture: amd64 40 Depends: ${shlibs:Depends} 41 Suggests: libdvdcss, mplayer-doc 42 Conflicts: mencoder-custom, mplayer-amd64 (<= 1:1.0-pre6-0.0) 43 Replaces: mencoder-custom, mplayer-amd64 (<= 1:1.0-pre6-0.0), mencoder-amd64 44 Description: MPlayer's Movie Encoder 45 A simple movie encoder, designed to encode MPlayer-playable movies 46 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 47 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 48 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 49 video resizing abilities. 50 51 Package: mplayer-nogui 52 Architecture: amd64 53 Depends: ${shlibs:Depends} 54 Suggests: w32codecs (>= 0.91-1), libdvdcss, mplayer-doc 55 Conflicts: mplayer, mplayer-amd64, mplayer-custom, mplayer-skin, libconfhelper-perl 56 Replaces: mplayer, mplayer-amd64, mplayer-custom 57 Provides: mplayer 58 Description: The Ultimate Movie Player For Linux 59 It plays most mpeg, avi and asf files, supported by many native and win32 60 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 61 big feature of mplayer is the wide range of supported output drivers. It 62 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 63 this way all drivers of SDL) and some lowlevel card-specific drivers (for 64 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 65 so you can enjoy movies in fullscreen. 66 . 67 This version is for amd64 CPU but without the User Interface in GTK+. 68 69 Package: mplayer-doc 70 Architecture: all 71 Section: doc 72 Description: Documentation for mplayer 73 This package contains the documentation Chinese, English, French, German, 74 Hungarian, Italian and Polish. -
mplayer-1.0.rc2svn20071207
old new 1 application/x-ogg; /usr/bin/mplayer %s; description="OggVorbis Audio" 2 application/ogg; /usr/bin/mplayer %s; description="OggVorbis Audio" 3 audio/mpeg; /usr/bin/mplayer %s; description="MPEG Audio Format" 4 audio/x-mpegurl; /usr/bin/mplayer %s; description="Icecast Playlists" 5 audio/x-ms-wax; /usr/bin/mplayer %s; description="Audio Format" 6 audio/x-ms-wma; /usr/bin/mplayer %s; description="Audio Format" 7 audio/x-pls; /usr/bin/mplayer %s; description="MP3 ShoutCast/IceCast Playlist" 8 audio/x-scpls; /usr/bin/mplayer %s; description="Shoutcast Playlists" 9 audio/x-wav; /usr/bin/mplayer %s; description="Waveform Microsoft Wave/RIFF" 10 video/mpeg; /usr/bin/mplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY" 11 video/quicktime; /usr/bin/mplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY" 12 video/x-mpeg2; /usr/bin/mplayer %s; description="MPEG Video"; test=test -n "$DISPLAY" 13 video/x-mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" 14 video/x-ms-afs; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" 15 video/x-ms-asf; /usr/bin/mplayer %s; description="MS ASF video"; test=test -n "$DISPLAY" 16 video/x-msvideo; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" 17 video/x-ms-wma; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" 18 video/x-ms-wmv; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" 19 video/x-ms-wmx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" 20 video/x-ms-wvx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" -
debian/mplayer-powerpc.menu
old new 1 ?package(mplayer-powerpc):needs="X11" section="Applications/Viewers" \ 2 title="MPlayer" \ 3 icon="/usr/share/pixmaps/mplayer.xpm" \ 4 command="/usr/bin/gmplayer" -
mplayer-1.0.rc2svn20071207
old new 1 Source: mplayer 2 Section: graphics 3 Priority: extra 4 Maintainer: Christian Marillat <marillat@debian.org> 5 Bugs: mailto:marillat@debian.org 6 Homepage: http://www.mplayerhq.hu/ 7 Standards-Version: 3.7.3 8 Build-Depends: debhelper (>> 5), libncurses5-dev, libxv-dev, dpatch, libdts-dev, 9 libesd0-dev, libsdl1.2-dev, liblircclient-dev, libgtk2.0-dev, libvorbis-dev, 10 libmad0-dev, libasound2-dev, libfaad-dev, liblzo2-dev, gawk, libfribidi-dev, 11 libxvmc-dev, libjpeg62-dev, libaudiofile-dev, libsmbclient-dev, libpng3-dev, 12 libungif4-dev, libggi2-dev, ccache, libaa1-dev, liblame-dev, libdv-dev, 13 libcdparanoia0-dev, libxvidcore4-dev, libcaca-dev, liblivemedia-dev (>= 2004.05.01), 14 libfreetype6-dev, em8300-headers, libgl1-mesa-swx11-dev | libgl-dev, libx264-dev (>= 0.svn20070309-4), 15 libdirectfb-dev (>= 1.0.1), ladspa-sdk, libdvdread-dev | libdvdread2-dev, libtheora-dev, 16 libglu1-mesa-dev, libartsc0-dev, libvstream-dev, libxxf86dga-dev, libfaac-dev, 17 libjack-dev, libmpcdec-dev, libxinerama-dev, libaudio-dev, libdvdnav-dev, 18 libtwolame-dev, libpulse-dev, libspeex-dev, libopenal-dev, libamrwb-dev, 19 libamrnb-dev 20 21 Package: mplayer 22 Architecture: ppc64 23 Depends: ${shlibs:Depends}, mplayer-skin 24 Suggests: libdvdcss, mplayer-doc 25 Conflicts: mplayer-custom, mplayer-nogui, libconfhelper-perl 26 Replaces: mplayer-custom, mplayer-ppc64, mplayer-nogui 27 Description: The Ultimate Movie Player For Linux 28 It plays most mpeg, avi and asf files, supported by many native and win32 29 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 30 big feature of mplayer is the wide range of supported output drivers. It 31 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 32 this way all drivers of SDL) and some lowlevel card-specific drivers (for 33 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 34 so you can enjoy movies in fullscreen. 35 . 36 This version is for ppc64 CPU. 37 38 Package: mencoder 39 Architecture: ppc64 40 Depends: ${shlibs:Depends} 41 Suggests: libdvdcss, mplayer-doc 42 Conflicts: mencoder-custom, mplayer-ppc64 (<= 1:1.0-pre6-0.0) 43 Replaces: mencoder-custom, mplayer-ppc64 (<= 1:1.0-pre6-0.0), mencoder-ppc64 44 Description: MPlayer's Movie Encoder 45 A simple movie encoder, designed to encode MPlayer-playable movies 46 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 47 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 48 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 49 video resizing abilities. 50 51 Package: mplayer-nogui 52 Architecture: ppc64 53 Depends: ${shlibs:Depends} 54 Suggests: w32codecs (>= 0.91-1), libdvdcss, mplayer-doc 55 Conflicts: mplayer, mplayer-ppc64, mplayer-custom, mplayer-skin, libconfhelper-perl 56 Replaces: mplayer, mplayer-ppc64, mplayer-custom 57 Provides: mplayer 58 Description: The Ultimate Movie Player For Linux 59 It plays most mpeg, avi and asf files, supported by many native and win32 60 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 61 big feature of mplayer is the wide range of supported output drivers. It 62 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 63 this way all drivers of SDL) and some lowlevel card-specific drivers (for 64 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 65 so you can enjoy movies in fullscreen. 66 . 67 This version is for ppc64 CPU but without the User Interface in GTK+. 68 69 Package: mplayer-doc 70 Architecture: all 71 Section: doc 72 Description: Documentation for mplayer 73 This package contains the documentation Chinese, English, French, German, 74 Hungarian, Italian and Polish. -
debian/mplayer.applications
old new 1 mplayer 2 command=mplayer 3 name=MPlayer 4 can_open_multiple_files=true 5 expects_uris=no 6 requires_terminal=false 7 all_gnome_vfs_schemes_supported=yes 8 supported_uri_schemes=http,ftp,rtsp,mms,file 9 mime_types=application/x-ogg,application/ogg,audio/mpeg,audio/x-mpegurl,audio/x-ms-wax,audio/x-ms-wma,audio/x-pls,audio/x-scpls,audio/x-wav,video/mpeg,video/quicktime,video/x-mpeg2,video/x-mpeg,video/x-ms-afs,video/x-ms-asf,video/x-msvideo,video/x-ms-wma,video/x-ms-wmv,video/x-ms-wmx,video/x-ms-wvx 10 11 gmplayer 12 command=gmplayer 13 name=MPlayer with GUI 14 can_open_multiple_files=true 15 expects_uris=no 16 requires_terminal=false 17 all_gnome_vfs_schemes_supported=yes 18 supported_uri_schemes=http,ftp,rtsp,mms,file 19 mime_types=application/x-ogg,application/ogg,audio/mpeg,audio/x-mpegurl,audio/x-ms-wax,audio/x-ms-wma,audio/x-pls,audio/x-scpls,audio/x-wav,video/mpeg,video/quicktime,video/x-mpeg2,video/x-mpeg,video/x-ms-afs,video/x-ms-asf,video/x-msvideo,video/x-ms-wma,video/x-ms-wmv,video/x-ms-wmx,video/x-ms-wvx -
mplayer-1.0.rc2svn20071207
old new 1 application/x-ogg 2 short_list_application_ids_for_novice_user_level=xmms,freeamp,mplayer 3 short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mplayer 4 short_list_application_ids_for_advanced_user_level=xmms,freeamp,mplayer 5 6 application/ogg 7 short_list_application_ids_for_novice_user_level=xmms,freeamp,mplayer 8 short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mplayer 9 short_list_application_ids_for_advanced_user_level=xmms,freeamp,mplayer 10 11 audio/mpeg 12 short_list_application_ids_for_novice_user_level=xmms,freeamp,mplayer 13 short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mplayer 14 short_list_application_ids_for_advanced_user_level=xmms,freeamp,mplayer 15 16 audio/x-mpegurl 17 short_list_application_ids_for_novice_user_level=xmms-no-uris,freeamp-no-uris,mplayer 18 short_list_application_ids_for_intermediate_user_level=xmms-no-uris,freeamp-no-uris,mplayer 19 short_list_application_ids_for_advanced_user_level=xmms-no-uris,freeamp-no-uris,mplayer 20 21 audio/x-ms-wax 22 default_action_type=application 23 short_list_application_ids_for_novice_user_level=mplayer 24 short_list_application_ids_for_intermediate_user_level=mplayer 25 short_list_application_ids_for_advanced_user_level=mplayer 26 27 audio/x-ms-wma 28 default_action_type=application 29 short_list_application_ids_for_novice_user_level=mplayer 30 short_list_application_ids_for_intermediate_user_level=mplayer 31 short_list_application_ids_for_advanced_user_level=mplayer 32 33 audio/x-pls 34 default_action_type=application 35 short_list_application_ids_for_novice_user_level=mplayer 36 short_list_application_ids_for_intermediate_user_level=mplayer 37 short_list_application_ids_for_advanced_user_level=mplayer 38 39 audio/x-scpls 40 short_list_application_ids_for_novice_user_level=xmms,freeamp,mplayer 41 short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mplayer 42 short_list_application_ids_for_advanced_user_level=xmms,freeamp,mplayer 43 44 audio/x-wav 45 short_list_application_ids_for_novice_user_level=grecord,xmms,freeamp,mplayer 46 short_list_application_ids_for_intermediate_user_level=grecord,xmms,freeamp,mplayer 47 short_list_application_ids_for_advanced_user_level=grecord,xmms,freeamp,mplayer 48 49 video/mpeg 50 short_list_application_ids_for_novice_user_level=mplayer,vlc,xmps,plaympeg,omsomi,mpeg_play,gtv 51 short_list_application_ids_for_intermediate_user_level=mplayer,vlc,xmps,plaympeg,omsomi,mpeg_play,gtv 52 short_list_application_ids_for_advanced_user_level=mplayer,vlc,xmps,plaympeg,omsomi,mpeg_play,gtv 53 54 video/quicktime 55 short_list_application_ids_for_novice_user_level=mplayer,xanim 56 short_list_application_ids_for_intermediate_user_level=mplayer,xanim 57 short_list_application_ids_for_advanced_user_level=mplayer,xanim 58 59 video/x-mpeg2 60 default_action_type=application 61 short_list_application_ids_for_novice_user_level=mplayer 62 short_list_application_ids_for_intermediate_user_level=mplayer 63 short_list_application_ids_for_advanced_user_level=mplayer 64 65 video/x-mpeg 66 default_action_type=application 67 short_list_application_ids_for_novice_user_level=mplayer,xmms,freeamp 68 short_list_application_ids_for_intermediate_user_level=mplayer,xmms,freeamp 69 short_list_application_ids_for_advanced_user_level=mplayer,xmms,freeamp 70 71 video/x-ms-afs 72 default_action_type=application 73 short_list_application_ids_for_novice_user_level=mplayer 74 short_list_application_ids_for_intermediate_user_level=mplayer 75 short_list_application_ids_for_advanced_user_level=mplayer 76 77 video/x-ms-asf 78 default_action_type=application 79 short_list_application_ids_for_novice_user_level=mplayer,xmps 80 short_list_application_ids_for_intermediate_user_level=mplayer,xmps 81 short_list_application_ids_for_advanced_user_level=mplayer,xmps 82 83 video/x-msvideo 84 default_action_type=application 85 short_list_application_ids_for_novice_user_level=mplayer,xmps,omsomi,gtv,xanim 86 short_list_application_ids_for_intermediate_user_level=mplayer,xmps,omsomi,gtv,xanim 87 short_list_application_ids_for_advanced_user_level=mplayer,xmps,omsomi,gtv,xanim 88 89 video/x-ms-wma 90 default_action_type=application 91 short_list_application_ids_for_novice_user_level=mplayer 92 short_list_application_ids_for_intermediate_user_level=mplayer 93 short_list_application_ids_for_advanced_user_level=mplayer 94 95 video/x-ms-wmv 96 default_action_type=application 97 short_list_application_ids_for_novice_user_level=mplayer 98 short_list_application_ids_for_intermediate_user_level=mplayer 99 short_list_application_ids_for_advanced_user_level=mplayer 100 101 video/x-ms-wmx 102 default_action_type=application 103 short_list_application_ids_for_novice_user_level=mplayer 104 short_list_application_ids_for_intermediate_user_level=mplayer 105 short_list_application_ids_for_advanced_user_level=mplayer 106 107 video/x-ms-wvx 108 default_action_type=application 109 short_list_application_ids_for_novice_user_level=mplayer 110 short_list_application_ids_for_intermediate_user_level=mplayer 111 short_list_application_ids_for_advanced_user_level=mplayer -
debian/mplayer-nogui.applications
old new 1 mplayer 2 command=mplayer 3 name=MPlayer 4 can_open_multiple_files=true 5 expects_uris=no 6 requires_terminal=false 7 all_gnome_vfs_schemes_supported=yes 8 supported_uri_schemes=http,ftp,rtsp,mms,file 9 mime_types=application/x-ogg,application/ogg,audio/mpeg,audio/x-mpegurl,audio/x-ms-wax,audio/x-ms-wma,audio/x-pls,audio/x-scpls,audio/x-wav,video/mpeg,video/quicktime,video/x-mpeg2,video/x-mpeg,video/x-ms-afs,video/x-ms-asf,video/x-msvideo,video/x-ms-wma,video/x-ms-wmv,video/x-ms-wmx,video/x-ms-wvx -
mplayer-1.0.rc2svn20071207
old new 1 Source: mplayer 2 Section: graphics 3 Priority: extra 4 Maintainer: Christian Marillat <marillat@debian.org> 5 Bugs: mailto:marillat@debian.org 6 Homepage: http://www.mplayerhq.hu/ 7 Standards-Version: 3.7.3 8 Build-Depends: debhelper (>> 5), libncurses5-dev, libxv-dev, libfaac-dev, dpatch, 9 libesd0-dev, liblircclient-dev, libgtk2.0-dev, libvorbis-dev, libsdl1.2-dev, 10 libmad0-dev, libasound2-dev (>= 1.0.1), liblzo2-dev, libfaad-dev, libxvmc-dev, 11 gawk, libjpeg62-dev, libaudiofile-dev, libsmbclient-dev, libfribidi-dev, ccache, 12 libpng3-dev, libungif4-dev, libggi2-dev, libaa1-dev, liblame-dev, libdv-dev, 13 libcdparanoia0-dev, libxvidcore4-dev, libcaca-dev, liblivemedia-dev (>= 2004.05.01), 14 libfreetype6-dev, em8300-headers, libgl1-mesa-swx11-dev | libgl-dev, libdirectfb-dev (>= 1.0.1), libdvdread-dev, 15 libtheora-dev, libglu1-mesa-dev, libartsc0-dev, libfontconfig-dev, libdts-dev, 16 libaudio-dev, libspeex-dev, libx264-dev (>= 0.svn20070309-4), libdvdnav-dev, 17 libxxf86dga-dev, libjack-dev, ladspa-sdk, libvstream-dev, libmpcdec-dev, 18 libxinerama-dev, libtwolame-dev, libpulse-dev, libopenal-dev, libamrwb-dev, 19 libamrnb-dev 20 21 Package: mplayer 22 Architecture: ia64 23 Depends: ${shlibs:Depends}, mplayer-skin 24 Suggests: libdvdcss, mplayer-doc 25 Conflicts: mplayer-custom, libconfhelper-perl, mplayer-itanium2 26 Replaces: mplayer-custom, mplayer-nogui, mplayer-itanium2 27 Description: The Ultimate Movie Player For Linux 28 It plays most mpeg, avi and asf files, supported by many native and win32 29 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 30 big feature of mplayer is the wide range of supported output drivers. It 31 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 32 this way all drivers of SDL) and some lowlevel card-specific drivers (for 33 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 34 so you can enjoy movies in fullscreen. 35 . 36 This version is for generic Itanium 1 CPUs. 37 38 Package: mplayer-itanium2 39 Architecture: ia64 40 Depends: ${shlibs:Depends}, mplayer-skin 41 Suggests: libdvdcss, mplayer-doc 42 Conflicts: mplayer-custom, mplayer-nogui, libconfhelper-perl, mplayer 43 Provides: mplayer 44 Replaces: mplayer-custom, mplayer-nogui, mplayer 45 Description: The Ultimate Movie Player For Linux 46 It plays most mpeg, avi and asf files, supported by many native and win32 47 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 48 big feature of mplayer is the wide range of supported output drivers. It 49 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 50 this way all drivers of SDL) and some lowlevel card-specific drivers (for 51 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 52 so you can enjoy movies in fullscreen. 53 . 54 This version is for generic Itanium 2 CPUs. 55 56 Package: mencoder 57 Architecture: ia64 58 Depends: ${shlibs:Depends} 59 Suggests: libdvdcss, mplayer-doc 60 Conflicts: mencoder-custom, mencoder-itanium2 61 Replaces: mencoder-custom, mencoder-itanium2 62 Description: MPlayer's Movie Encoder 63 A simple movie encoder, designed to encode MPlayer-playable movies 64 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 65 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 66 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 67 video resizing abilities. 68 . 69 This version is for generic Itanium 1 CPUs. 70 71 Package: mencoder-itanium2 72 Architecture: ia64 73 Depends: ${shlibs:Depends} 74 Suggests: libdvdcss, mplayer-doc 75 Conflicts: mencoder-custom, mencoder 76 Replaces: mencoder-custom, mencoder 77 Provides: mencoder 78 Description: MPlayer's Movie Encoder 79 A simple movie encoder, designed to encode MPlayer-playable movies 80 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 81 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 82 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 83 video resizing abilities. 84 . 85 This version is for generic Itanium 2 CPUs. 86 87 Package: mplayer-nogui 88 Architecture: ia64 89 Depends: mplayer 90 Suggests: libdvdcss, mplayer-doc 91 Description: Transitional package for mplayer 92 Transitional package to install mplayer instead of mplayer-nogui. 93 94 Package: mplayer-doc 95 Architecture: all 96 Section: doc 97 Description: Documentation for mplayer 98 This package contains the documentation Chinese, English, French, German, 99 Hungarian, Italian and Polish. -
mplayer-1.0.rc2svn20071207
old new 1 Source: mplayer 2 Section: graphics 3 Priority: extra 4 Maintainer: Christian Marillat <marillat@debian.org> 5 Bugs: mailto:marillat@debian.org 6 Homepage: http://www.mplayerhq.hu/ 7 Standards-Version: 3.7.3 8 Build-Depends: debhelper (>> 5), libncurses5-dev, libsvga1-dev [i386] | svgalibg1-dev [i386], 9 libesd0-dev, liblircclient-dev, libgtk2.0-dev, libvorbis-dev, libsdl1.2-dev, 10 libmad0-dev, libasound2-dev (>= 1.0.1), liblzo2-dev, libfaad-dev, gawk, libdts-dev, 11 libxvmc-dev, libjpeg62-dev, libaudiofile-dev, libsmbclient-dev, libfribidi-dev, 12 libxv-dev, libpng3-dev, ccache, libungif4-dev, libggi2-dev, libaa1-dev, dpatch, 13 liblame-dev, libdvdnav-dev, libcdparanoia0-dev, libxvidcore4-dev, libdv-dev, 14 libcaca-dev, liblivemedia-dev (>= 2004.05.01), libfreetype6-dev, em8300-headers, 15 libgl1-mesa-swx11-dev | libgl-dev, libdirectfb-dev (>= 1.0.1), libdvdread-dev, libtheora-dev, 16 libx264-dev (>= 0.svn20070309-4), libglu1-mesa-dev, libartsc0-dev, libfontconfig-dev, 17 libaudio-dev, libmpcdec-dev, libpulse-dev, libxxf86dga-dev, libjack-dev, 18 ladspa-sdk, libvstream-dev, libfaac-dev, libxinerama-dev, libtwolame-dev, 19 libspeex-dev, libopenal-dev, libamrwb-dev, libamrnb-dev 20 21 Package: mplayer 22 Architecture: i386 23 Depends: ${shlibs:Depends}, mplayer-skin 24 Suggests: w32codecs (>= 1:20050412-0.1), libdvdcss, mplayer-doc 25 Conflicts: mplayer-386, mplayer-586, mplayer-k6, mplayer-custom, mplayer-nogui, libconfhelper-perl 26 Replaces: mplayer-386, mplayer-586, mplayer-k6, mplayer-custom, mplayer-nogui 27 Description: The Ultimate Movie Player For Linux 28 It plays most mpeg, avi and asf files, supported by many native and win32 29 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 30 big feature of mplayer is the wide range of supported output drivers. It 31 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 32 this way all drivers of SDL) and some lowlevel card-specific drivers (for 33 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 34 so you can enjoy movies in fullscreen. 35 36 Package: mplayer-nogui 37 Architecture: i386 38 Depends: ${shlibs:Depends} 39 Suggests: w32codecs (>= 1:20050412-0.1), libdvdcss, mplayer-doc 40 Conflicts: mplayer-386, mplayer-586, mplayer-k6, mplayer-custom, mplayer, mplayer-skin, libconfhelper-perl 41 Replaces: mplayer-386, mplayer-586, mplayer-k6, mplayer-custom, mplayer 42 Provides: mplayer 43 Description: The Ultimate Movie Player For Linux 44 It plays most mpeg, avi and asf files, supported by many native and win32 45 DLL codecs. You can watch VCD, DVD and even DivX movies too. The other 46 big feature of mplayer is the wide range of supported output drivers. It 47 works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and 48 this way all drivers of SDL) and some lowlevel card-specific drivers (for 49 Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, 50 so you can enjoy movies in fullscreen. 51 . 52 This version doesn't have the User Interface in GTK+. 53 54 Package: mencoder 55 Architecture: i386 56 Depends: ${shlibs:Depends} 57 Suggests: w32codecs (>= 1:20050412-0.1), libdvdcss, mplayer-doc 58 Conflicts: mencoder-k6, mencoder-386, mencoder-586, mencoder-custom 59 Replaces: mencoder-k6, mencoder-386, mencoder-586, mencoder-custom 60 Description: MPlayer's Movie Encoder 61 A simple movie encoder, designed to encode MPlayer-playable movies 62 (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other 63 MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 64 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and 65 video resizing abilities. 66 67 Package: mplayer-doc 68 Architecture: all 69 Section: doc 70 Description: Documentation for mplayer 71 This package contains the documentation Chinese, English, French, German, 72 Hungarian, Italian and Polish. -
mplayer-1.0.rc2svn20071207
old new 1 version=3 2 3 opts="dversionmangle=s/\.rc2svn20071207/rc2/" \ 4 http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-(.*)\.tar\.bz2 -
mplayer-1.0.rc2svn20071207
old new 1 #!/bin/sh -e 2 3 # Move configfile in /etc/mplayer 4 5 if [ ! -d /etc/mplayer ]; then 6 mkdir /etc/mplayer 7 if [ -e /etc/codecs.conf ]; then 8 mv /etc/codecs.conf /etc/mplayer/codecs.conf 9 fi 10 if [ -e /etc/input.conf ]; then 11 mv /etc/input.conf /etc/mplayer/input.conf 12 fi 13 if [ -e /etc/menu.conf ]; then 14 mv /etc/menu.conf /etc/mplayer/menu.conf 15 fi 16 if [ -e /etc/mplayer.conf ]; then 17 mv /etc/mplayer.conf /etc/mplayer/mplayer.conf 18 fi 19 else 20 if [ -e /etc/codecs.conf ]; then 21 mv /etc/codecs.conf /etc/mplayer/codecs.conf 22 fi 23 if [ -e /etc/input.conf ]; then 24 mv /etc/input.conf /etc/mplayer/input.conf 25 fi 26 if [ -e /etc/menu.conf ]; then 27 mv /etc/menu.conf /etc/mplayer/menu.conf 28 fi 29 if [ -e /etc/mplayer.conf ]; then 30 mv /etc/mplayer.conf /etc/mplayer/mplayer.conf 31 fi 32 fi 33 34 #DEBHELPER# 35 36 exit 0 -
mplayer-1.0.rc2svn20071207
old new 1 ?package(mplayer-g4):needs="X11" section="Applications/Viewers" \ 2 title="MPlayer" \ 3 icon="/usr/share/pixmaps/mplayer.xpm" \ 4 command="/usr/bin/gmplayer" -
mplayer-1.0.rc2svn20071207
old new 1 TOOLS/mencvcd
