From 0f0eb18f64c7b7fdc9a95808a8e14e9cb24b83f7 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 17 Apr 2007 23:11:47 +0100 Subject: Add a changelog entry for the fixes for the CDDA crash & DVD hang; mark release. --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7f4d61774..0120a216f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -xine-lib (1.1.6) [UNRELEASED] +xine-lib (1.1.6) * Split the DirectFB plugin into X11 and non-X versions. * Improve the Mac OS X video output plugin. Thanks to Matt Messier. * Fixed the XcbXv plugin - an empty plugin would be built if "old" Xv @@ -7,6 +7,8 @@ xine-lib (1.1.6) [UNRELEASED] with junk content, the plugin could potentially consume lots of memory (possibly causing a local DoS). Also, a few small memory leaks have been eliminated. + * Fixed a CDDA-related crash and a DVD-related hang, both caused by the + same change in 1.1.5. xine-lib (1.1.5) * Security fixes: -- cgit v1.2.3 From 485dffa9be256aae3c7904ce4f05a66d5c24f089 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 17 Apr 2007 23:45:27 +0100 Subject: xine-lib 1.1.6. --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 37af4fbf3..d8e9adc3d 100644 --- a/.hgtags +++ b/.hgtags @@ -59,3 +59,4 @@ f1a2861399059cba07e916afee432bbb31df4249 xine-1-beta4-release fd12068ebd3fab2438f77b06e312c4244e97950a DXR3_095 4a4f4e8bb768b6598c02a59929019866a40b4edc nopadding_no_abi_change 204b8e92463b592e5c220b56f186a6d4d1007cf9 xine-lib-1_1_5-release +7b60f85a95345c41fb074dc5e3f7355d9e72968e xine-lib-1_1_6-release -- cgit v1.2.3 From f26e3cfb631fb748f712bfcf064ce907d68aa7c3 Mon Sep 17 00:00:00 2001 From: Philipp Matthias Hahn Date: Wed, 18 Apr 2007 11:03:05 +0200 Subject: Updates for 1.1.6 --- po/de.po | 85 ++++++++++++++++++++++++++++------------------------------------ 1 file changed, 37 insertions(+), 48 deletions(-) diff --git a/po/de.po b/po/de.po index 3934b36bb..03310bf42 100644 --- a/po/de.po +++ b/po/de.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: xine-lib 1.1.5\n" +"Project-Id-Version: xine-lib 1.1.6\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2007-04-06 15:39+0200\n" -"PO-Revision-Date: 2007-02-13 09:28+0100\n" +"PO-Revision-Date: 2007-04-18 11:00+0200\n" "Last-Translator: Philipp Hahn \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -585,9 +585,8 @@ msgid "xine audio output plugin using IRIX libaudio" msgstr "xine Soundausgabe benutzt IRIX-kompatibles Gerät/Treiber" #: src/audio_out/audio_jack_out.c:406 -#, fuzzy msgid "xine output plugin for JACK Audio Connection Kit" -msgstr "xine Soundausgabe benutzt Coreaudio/Mac OS X" +msgstr "xine Soundausgabe für JACK Audio System" #: src/audio_out/audio_none_out.c:225 msgid "xine dummy audio output plugin" @@ -881,12 +880,11 @@ msgstr "Nicht erkanntes FILM-Paket\n" #: src/demuxers/demux_flv.c:172 #, c-format msgid "unsupported FLV version (%d).\n" -msgstr "" +msgstr "Nicht unterstützte FLV-Version (%d).\n" #: src/demuxers/demux_flv.c:179 -#, fuzzy msgid "neither video nor audio stream in this file.\n" -msgstr "metronom: Ende des Audio-Datenstroms ignoriert\n" +msgstr "Weder ein Video- noch ein Audio-Datenstrom in dieser Datei.\n" #: src/demuxers/demux_iff.c:235 #, c-format @@ -995,7 +993,7 @@ msgstr "demux_snd: Unbekannter Audiotyp: %d\n" #: src/demuxers/demux_tta.c:88 msgid "demux_tta: total frames count too high\n" -msgstr "" +msgstr "demux_tta: Gesamt-Bildanzahl zu hoch\n" #: src/demuxers/demux_voc.c:105 #, c-format @@ -2879,7 +2877,6 @@ msgid "path to RealPlayer codecs" msgstr "Pfad zum Real-Player-Codecs" #: src/libreal/real_common.c:108 -#, fuzzy msgid "" "If you have RealPlayer installed, specify the path to its codec directory " "here. You can easily find the codec directory by looking for a file named " @@ -2887,9 +2884,9 @@ msgid "" "to decode RealPlayer content for you. Consult the xine FAQ for more " "information on how to install the codecs." msgstr "" -"Geben Sie hier den Pfad zum codec-Verzeichnis von RealPlayer an, falls es " -"installiert ist. Sie können das codec-Verzeichnis einfach finden, in dem Sie " -"nach der Datei \"drv3.so.6.0\" in ihm suchen. Falls xine die RealPlayer-" +"Falls Sie den RealPlayer installiert haben, geben Sie hier den Pfad zum " +"codec-Verzeichnis an. Sie können das codec-Verzeichnis einfach finden, " +"indem Sie nach der Datei \"drvc.so\" in ihm suchen. xine die RealPlayer-" "Codecs findet, verwendet xine diese zum dekodieren von RealPlayer-Inhalten. " "Konsultieren Sie die xine FAQ für weitere Informationen, wie die Codecs zu " "installieren sind." @@ -3556,7 +3553,6 @@ msgstr "" "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n" #: src/post/planar/expand.c:251 -#, fuzzy msgid "" "The expand plugin is meant to take frames of arbitrary aspect ratio and " "converts them to a different aspect (4:3 by default) by adding black bars on " @@ -3577,9 +3573,10 @@ msgstr "" "überdecken.\n" "\n" "Parameter\n" -" Enable_automatic_shift: Automatisch Überlagerung verschieben\n" +" Enable_automatic_shift: Automatisch Überlagerungsverschiebung\n" " Overlay_y_offset: Manuelle vertikale Überlagerungsverschiebung\n" " aspect: das Zielseitenverhältnis (normalerweise 4:3)\n" +" Centre_cut_out_mode: Extrahiert 4:3 Bilder aus 16:9 Bildern\n" "\n" #: src/post/planar/noise.c:402 @@ -4318,32 +4315,31 @@ msgid "xine video output plugin using libvidix for linux frame buffer" msgstr "xine Videoausgabe benutzt libvidix für Linux Framebuffer" #: src/video_out/video_out_xcbshm.c:157 -#, fuzzy, c-format +#, c-format msgid "" "video_out_xcbshm: %s: allocating image\n" "video_out_xcbshm: => not using MIT Shared Memory extension.\n" msgstr "" -"video_out_xshm: %s: Belege Bild\n" -"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" +"video_out_xcbshm: %s: Belege Bild\n" +"video_out_xcbshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" #: src/video_out/video_out_xcbshm.c:166 -#, fuzzy msgid "" "video_out_xcbshm: shared memory error (address error) when allocating " "image \n" "video_out_xcbshm: => not using MIT Shared Memory extension.\n" msgstr "" -"video_out_xshm: Shared-Memory-Fehler (Adressfehler) beim Belegen des Bilds\n" -"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" +"video_out_xcbshm: Shared-Memory-Fehler (Adressfehler) beim Belegen des " +"Bilds\n" +"video_out_xcbshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" #: src/video_out/video_out_xcbshm.c:177 -#, fuzzy msgid "" "video_out_xcbshm: x11 error during shared memory XImage creation\n" "video_out_xcbshm: => not using MIT Shared Memory extension.\n" msgstr "" -"video_out_xshm: X11-Fehler bei Shared-Memory-XImage-Erstellung\n" -"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" +"video_out_xcbshm: X11-Fehler bei Shared-Memory-XImage-Erstellung\n" +"video_out_xcbshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" #: src/video_out/video_out_xcbshm.c:1100 src/video_out/video_out_xshm.c:1157 #, c-format @@ -4360,72 +4356,67 @@ msgstr "" "von 16 bpp empfohlen!\n" #: src/video_out/video_out_xcbshm.c:1113 -#, fuzzy msgid "video_out_xcbshm: MIT shared memory extension not present on display.\n" msgstr "" -"video_out_xshm: MIT-Shared-Memory-Erweiterung für Anzeige nicht vorhanden.\n" +"video_out_xcbshm: MIT-Shared-Memory-Erweiterung für Anzeige nicht " +"vorhanden.\n" #: src/video_out/video_out_xcbshm.c:1212 -#, fuzzy msgid "video_out_xcbshm: your video mode was not recognized, sorry :-(\n" msgstr "" -"video_out_xshm: Der Videomodus wurde nicht erkannt, Entschuldigung :-(\n" +"video_out_xcbshm: Der Videomodus wurde nicht erkannt, Entschuldigung :-(\n" #: src/video_out/video_out_xcbshm.c:1242 src/video_out/video_out_xshm.c:1303 msgid "xine video output plugin using the MIT X shared memory extension" msgstr "xine Videoausgabe benutzt 'MIX X Shared Memory' Erweiterung" #: src/video_out/video_out_xcbxv.c:272 -#, fuzzy msgid "" "video_out_xcbxv: XvShmCreateImage returned a zero size\n" "video_out_xcbxv: => not using MIT Shared Memory extension.\n" msgstr "" -"video_out_xv: XvShmCreateImage lieferte Größe 0 zurück\n" -"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" +"video_out_xcbv: XvShmCreateImage lieferte Größe 0 zurück\n" +"video_out_xcbv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" #: src/video_out/video_out_xcbxv.c:281 -#, fuzzy, c-format +#, c-format msgid "" "video_out_xcbxv: shared memory error in shmget: %s\n" "video_out_xcbxv: => not using MIT Shared Memory extension.\n" msgstr "" -"video_out_xv: Shared-Memory-Fehler bei shmget: %s\n" -"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" +"video_out_xcbxv: Shared-Memory-Fehler bei shmget: %s\n" +"video_out_xcbxv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" #: src/video_out/video_out_xcbxv.c:300 -#, fuzzy msgid "" "video_out_xcbxv: x11 error during shared memory XImage creation\n" "video_out_xcbxv: => not using MIT Shared Memory extension.\n" msgstr "" -"video_out_xv: X11-Fehler bei Shared-Memory-XImage-Erstellung\n" -"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" +"video_out_xcbxv: X11-Fehler bei Shared-Memory-XImage-Erstellung\n" +"video_out_xcbxv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n" #: src/video_out/video_out_xcbxv.c:1291 -#, fuzzy msgid "video_out_xcbxv: Xv extension not present.\n" -msgstr "video_out_xv: Xv-Erweiterung nicht vorhanden.\n" +msgstr "video_out_xcbxv: Xv-Erweiterung nicht vorhanden.\n" #: src/video_out/video_out_xcbxv.c:1333 -#, fuzzy msgid "" "video_out_xcbxv: Xv extension is present but I couldn't find a usable yuv12 " "port.\n" " Looks like your graphics hardware driver doesn't support " "Xv?!\n" msgstr "" -"video_out_xv: Xv-Erweiterung ist vorhanden, aber es wurde kein benutzparer " -"YUV12-Port gefunden.\n" +"video_out_xcbxv: Xv-Erweiterung ist vorhanden, aber es wurde kein " +"benutzbarer YUV12-Port gefunden.\n" " Unterstützt die Grafikhardware evtl. kein Xv?!\n" #: src/video_out/video_out_xcbxv.c:1341 -#, fuzzy, c-format +#, c-format msgid "" "video_out_xcbxv: using Xv port %d from adaptor %s for hardware colorspace " "conversion and scaling.\n" msgstr "" -"video_out_xv: Benutze Xv-Port %ld von Adapter %s for Hardware-" +"video_out_xcbxv: Benutze Xv-Port %d von Adapter %s for Hardware-" "Farbraumtransformation und Skalierung.\n" #: src/video_out/video_out_xcbxv.c:1448 src/video_out/video_out_xv.c:1462 @@ -4471,14 +4462,12 @@ msgstr "" "2 - aktiviert volles bilineares Filtern" #: src/video_out/video_out_xcbxv.c:1509 -#, fuzzy msgid "video_out_xcbxv: this adaptor supports the yv12 format.\n" -msgstr "video_out_xv: Adapter unterstützt YV12 Format.\n" +msgstr "video_out_xcbxv: Adapter unterstützt YV12 Format.\n" #: src/video_out/video_out_xcbxv.c:1514 -#, fuzzy msgid "video_out_xcbxv: this adaptor supports the yuy2 format.\n" -msgstr "video_out_xv: Adapter unterstützt YUY2 Format.\n" +msgstr "video_out_xcbxv: Adapter unterstützt YUY2 Format.\n" #: src/video_out/video_out_xcbxv.c:1522 src/video_out/video_out_xv.c:1547 #: src/video_out/video_out_xxmc.c:2537 @@ -5064,7 +5053,7 @@ msgstr "" #: src/xine-engine/buffer.c:67 #, c-format msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" -msgstr "" +msgstr "xine-lib: buffer.c: Fataler Defekt: ZU VIELE FREIGABEN\n" #: src/xine-engine/configfile.c:925 #, c-format -- cgit v1.2.3 From b502e15322d2fe9c41645a0905683e7783cf2a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 18 Apr 2007 16:58:51 +0200 Subject: Permit to build against libdca 0.0.5. To build against this, we need to make sure that the system dts.h header is used instead of the internal copy of it, as the internal copy will declare the functions with the old names, while libdca's system header will create macro aliases between the old names and the new ones. Better fix will be implemented in 1.2 series. --HG-- rename : src/libdts/dts.h => src/libdts/internal-dts.h --- ChangeLog | 3 ++ src/libdts/Makefile.am | 2 +- src/libdts/dts.h | 85 ------------------------------------------- src/libdts/internal-dts.h | 85 +++++++++++++++++++++++++++++++++++++++++++ src/libdts/xine_dts_decoder.c | 7 +++- 5 files changed, 95 insertions(+), 87 deletions(-) delete mode 100644 src/libdts/dts.h create mode 100644 src/libdts/internal-dts.h diff --git a/ChangeLog b/ChangeLog index 0120a216f..4759efe4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +xine-lib (1.1.7) (unreleased) + * Support libdca (new name for libdts) by shuffling around the dts.h file. + xine-lib (1.1.6) * Split the DirectFB plugin into X11 and non-X versions. * Improve the Mac OS X video output plugin. Thanks to Matt Messier. diff --git a/src/libdts/Makefile.am b/src/libdts/Makefile.am index 207755f1f..ea09aab2e 100644 --- a/src/libdts/Makefile.am +++ b/src/libdts/Makefile.am @@ -24,5 +24,5 @@ else xineplug_decode_dts_la_LIBADD = $(XINE_LIB) -lm endif -noinst_HEADERS = bitstream.h dts.h dts_internal.h tables.h tables_adpcm.h \ +noinst_HEADERS = bitstream.h internal-dts.h dts_internal.h tables.h tables_adpcm.h \ tables_fir.h tables_huffman.h tables_quantization.h tables_vq.h diff --git a/src/libdts/dts.h b/src/libdts/dts.h deleted file mode 100644 index 30f3a197b..000000000 --- a/src/libdts/dts.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * dts.h - * Copyright (C) 2004 Gildas Bazin - * - * This file is part of dtsdec, a free DTS Coherent Acoustics stream decoder. - * See http://www.videolan.org/dtsdec.html for updates. - * - * dtsdec is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * dtsdec is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef DTS_H -#define DTS_H - -/* x86 accelerations */ -#define MM_ACCEL_X86_MMX 0x80000000 -#define MM_ACCEL_X86_3DNOW 0x40000000 -#define MM_ACCEL_X86_MMXEXT 0x20000000 - -uint32_t mm_accel (void); - -#if defined(LIBDTS_FIXED) -typedef int32_t sample_t; -typedef int32_t level_t; -#elif defined(LIBDTS_DOUBLE) -typedef double sample_t; -typedef double level_t; -#else -typedef float sample_t; -typedef float level_t; -#endif - -typedef struct dts_state_s dts_state_t; - -#define DTS_MONO 0 -#define DTS_CHANNEL 1 -#define DTS_STEREO 2 -#define DTS_STEREO_SUMDIFF 3 -#define DTS_STEREO_TOTAL 4 -#define DTS_3F 5 -#define DTS_2F1R 6 -#define DTS_3F1R 7 -#define DTS_2F2R 8 -#define DTS_3F2R 9 -#define DTS_4F2R 10 - -#define DTS_DOLBY 101 /* FIXME */ - -#define DTS_CHANNEL_MAX DTS_3F2R /* We don't handle anything above that */ -#define DTS_CHANNEL_BITS 6 -#define DTS_CHANNEL_MASK 0x3F - -#define DTS_LFE 0x80 -#define DTS_ADJUST_LEVEL 0x100 - -dts_state_t * dts_init (uint32_t mm_accel); - -int dts_syncinfo (dts_state_t *state, uint8_t * buf, int * flags, - int * sample_rate, int * bit_rate, int *frame_length); - -int dts_frame (dts_state_t * state, uint8_t * buf, int * flags, - level_t * level, sample_t bias); - -void dts_dynrng (dts_state_t * state, - level_t (* call) (level_t, void *), void * data); - -int dts_blocks_num (dts_state_t * state); -int dts_block (dts_state_t * state); - -sample_t * dts_samples (dts_state_t * state); - -void dts_free (dts_state_t * state); - -#endif /* DTS_H */ diff --git a/src/libdts/internal-dts.h b/src/libdts/internal-dts.h new file mode 100644 index 000000000..30f3a197b --- /dev/null +++ b/src/libdts/internal-dts.h @@ -0,0 +1,85 @@ +/* + * dts.h + * Copyright (C) 2004 Gildas Bazin + * + * This file is part of dtsdec, a free DTS Coherent Acoustics stream decoder. + * See http://www.videolan.org/dtsdec.html for updates. + * + * dtsdec is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * dtsdec is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DTS_H +#define DTS_H + +/* x86 accelerations */ +#define MM_ACCEL_X86_MMX 0x80000000 +#define MM_ACCEL_X86_3DNOW 0x40000000 +#define MM_ACCEL_X86_MMXEXT 0x20000000 + +uint32_t mm_accel (void); + +#if defined(LIBDTS_FIXED) +typedef int32_t sample_t; +typedef int32_t level_t; +#elif defined(LIBDTS_DOUBLE) +typedef double sample_t; +typedef double level_t; +#else +typedef float sample_t; +typedef float level_t; +#endif + +typedef struct dts_state_s dts_state_t; + +#define DTS_MONO 0 +#define DTS_CHANNEL 1 +#define DTS_STEREO 2 +#define DTS_STEREO_SUMDIFF 3 +#define DTS_STEREO_TOTAL 4 +#define DTS_3F 5 +#define DTS_2F1R 6 +#define DTS_3F1R 7 +#define DTS_2F2R 8 +#define DTS_3F2R 9 +#define DTS_4F2R 10 + +#define DTS_DOLBY 101 /* FIXME */ + +#define DTS_CHANNEL_MAX DTS_3F2R /* We don't handle anything above that */ +#define DTS_CHANNEL_BITS 6 +#define DTS_CHANNEL_MASK 0x3F + +#define DTS_LFE 0x80 +#define DTS_ADJUST_LEVEL 0x100 + +dts_state_t * dts_init (uint32_t mm_accel); + +int dts_syncinfo (dts_state_t *state, uint8_t * buf, int * flags, + int * sample_rate, int * bit_rate, int *frame_length); + +int dts_frame (dts_state_t * state, uint8_t * buf, int * flags, + level_t * level, sample_t bias); + +void dts_dynrng (dts_state_t * state, + level_t (* call) (level_t, void *), void * data); + +int dts_blocks_num (dts_state_t * state); +int dts_block (dts_state_t * state); + +sample_t * dts_samples (dts_state_t * state); + +void dts_free (dts_state_t * state); + +#endif /* DTS_H */ diff --git a/src/libdts/xine_dts_decoder.c b/src/libdts/xine_dts_decoder.c index 902d8c5b6..0ef9afa17 100644 --- a/src/libdts/xine_dts_decoder.c +++ b/src/libdts/xine_dts_decoder.c @@ -49,7 +49,12 @@ #include "xineutils.h" #include "audio_out.h" #include "buffer.h" -#include "dts.h" + +#ifdef HAVE_DTS_H +# include +#else +# include "internal-dts.h" +#endif #define MAX_AC5_FRAME 4096 -- cgit v1.2.3