]> git.sesse.net Git - vlc/blobdiff - plugins/dvd/input_dvd.c
-Fixed a bug in audio selection
[vlc] / plugins / dvd / input_dvd.c
index 4bd1ba0c9631e695ae1655c0210de6fbf04f4868..0ab12deb1a6dcbcd9bf2ef4c315efa202a81601d 100644 (file)
@@ -10,7 +10,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.11 2001/02/14 15:58:29 henri Exp $
+ * $Id: input_dvd.c,v 1.29 2001/03/05 00:40:06 stef Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
  *****************************************************************************/
 #include "defs.h"
 
+#ifdef HAVE_CSS
+#define MODULE_NAME dvd-css
+#else /* HAVE_CSS */
+#define MODULE_NAME dvd-nocss
+#endif /* HAVE_CSS */
+#include "modules_inner.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -62,8 +69,8 @@
 #include "input_ext-dec.h"
 
 #include "input.h"
-#include "input_netlist.h"
 
+#include "dvd_netlist.h"
 #include "dvd_ifo.h"
 #include "dvd_css.h"
 #include "input_dvd.h"
 
 #include "modules.h"
 
+/*****************************************************************************
+ * Local tables
+ *****************************************************************************/
+static struct
+{
+    char    p_code[3];
+    char    p_lang_long[20];
+}
+
+lang_tbl[] =
+{
+    /* The ISO 639 language codes.
+     * Language names with * prefix are not spelled in their own language 
+     */
+    { "  ", "Not Specified" },
+    { "aa", "*Afar" },
+    { "ab", "*Abkhazian" },
+    { "af", "*Afrikaans" },
+    { "am", "*Amharic" },
+    { "ar", "*Arabic" },
+    { "as", "*Assamese" },
+    { "ay", "*Aymara" },
+    { "az", "*Azerbaijani" },
+    { "ba", "*Bashkir" },
+    { "be", "*Byelorussian" },
+    { "bg", "*Bulgarian" },
+    { "bh", "*Bihari" },
+    { "bi", "*Bislama" },
+    { "bn", "*Bengali; Bangla" },
+    { "bo", "*Tibetan" },
+    { "br", "*Breton" },
+    { "ca", "*Catalan" },
+    { "co", "*Corsican" },
+    { "cs", "*Czech(Ceske)" },
+    { "cy", "*Welsh" },
+    { "da", "Dansk" },
+    { "de", "Deutsch" },
+    { "dz", "*Bhutani" },
+    { "el", "*Greek" },
+    { "en", "English" },
+    { "eo", "*Esperanto" },
+    { "es", "Espanol" },
+    { "et", "*Estonian" },
+    { "eu", "*Basque" },
+    { "fa", "*Persian" },
+    { "fi", "Suomi" },
+    { "fj", "*Fiji" },
+    { "fo", "*Faroese" },
+    { "fr", "Francais" },
+    { "fy", "*Frisian" },
+    { "ga", "*Irish" },
+    { "gd", "*Scots Gaelic" },
+    { "gl", "*Galician" },
+    { "gn", "*Guarani" },
+    { "gu", "*Gujarati" },
+    { "ha", "*Hausa" },
+    { "he", "*Hebrew" },                                      /* formerly iw */
+    { "hi", "*Hindi" },
+    { "hr", "Hrvatski" },                                        /* Croatian */
+    { "hu", "Magyar" },
+    { "hy", "*Armenian" },
+    { "ia", "*Interlingua" },
+    { "id", "*Indonesian" },                                  /* formerly in */
+    { "ie", "*Interlingue" },
+    { "ik", "*Inupiak" },
+    { "in", "*Indonesian" },                               /* replaced by id */
+    { "is", "Islenska" },
+    { "it", "Italiano" },
+    { "iu", "*Inuktitut" },
+    { "iw", "*Hebrew" },                                   /* replaced by he */
+    { "ja", "*Japanese" },
+    { "ji", "*Yiddish" },                                  /* replaced by yi */
+    { "jw", "*Javanese" },
+    { "ka", "*Georgian" },
+    { "kk", "*Kazakh" },
+    { "kl", "*Greenlandic" },
+    { "km", "*Cambodian" },
+    { "kn", "*Kannada" },
+    { "ko", "*Korean" },
+    { "ks", "*Kashmiri" },
+    { "ku", "*Kurdish" },
+    { "ky", "*Kirghiz" },
+    { "la", "*Latin" },
+    { "ln", "*Lingala" },
+    { "lo", "*Laothian" },
+    { "lt", "*Lithuanian" },
+    { "lv", "*Latvian, Lettish" },
+    { "mg", "*Malagasy" },
+    { "mi", "*Maori" },
+    { "mk", "*Macedonian" },
+    { "ml", "*Malayalam" },
+    { "mn", "*Mongolian" },
+    { "mo", "*Moldavian" },
+    { "mr", "*Marathi" },
+    { "ms", "*Malay" },
+    { "mt", "*Maltese" },
+    { "my", "*Burmese" },
+    { "na", "*Nauru" },
+    { "ne", "*Nepali" },
+    { "nl", "Nederlands" },
+    { "no", "Norsk" },
+    { "oc", "*Occitan" },
+    { "om", "*(Afan) Oromo" },
+    { "or", "*Oriya" },
+    { "pa", "*Punjabi" },
+    { "pl", "*Polish" },
+    { "ps", "*Pashto, Pushto" },
+    { "pt", "Portugues" },
+    { "qu", "*Quechua" },
+    { "rm", "*Rhaeto-Romance" },
+    { "rn", "*Kirundi" },
+    { "ro", "*Romanian"  },
+    { "ru", "*Russian" },
+    { "rw", "*Kinyarwanda" },
+    { "sa", "*Sanskrit" },
+    { "sd", "*Sindhi" },
+    { "sg", "*Sangho" },
+    { "sh", "*Serbo-Croatian" },
+    { "si", "*Sinhalese" },
+    { "sk", "*Slovak" },
+    { "sl", "*Slovenian" },
+    { "sm", "*Samoan" },
+    { "sn", "*Shona"  },
+    { "so", "*Somali" },
+    { "sq", "*Albanian" },
+    { "sr", "*Serbian" },
+    { "ss", "*Siswati" },
+    { "st", "*Sesotho" },
+    { "su", "*Sundanese" },
+    { "sv", "Svenska" },
+    { "sw", "*Swahili" },
+    { "ta", "*Tamil" },
+    { "te", "*Telugu" },
+    { "tg", "*Tajik" },
+    { "th", "*Thai" },
+    { "ti", "*Tigrinya" },
+    { "tk", "*Turkmen" },
+    { "tl", "*Tagalog" },
+    { "tn", "*Setswana" },
+    { "to", "*Tonga" },
+    { "tr", "*Turkish" },
+    { "ts", "*Tsonga" },
+    { "tt", "*Tatar" },
+    { "tw", "*Twi" },
+    { "ug", "*Uighur" },
+    { "uk", "*Ukrainian" },
+    { "ur", "*Urdu" },
+    { "uz", "*Uzbek" },
+    { "vi", "*Vietnamese" },
+    { "vo", "*Volapuk" },
+    { "wo", "*Wolof" },
+    { "xh", "*Xhosa" },
+    { "yi", "*Yiddish" },                                     /* formerly ji */
+    { "yo", "*Yoruba" },
+    { "za", "*Zhuang" },
+    { "zh", "*Chinese" },
+    { "zu", "*Zulu" },
+    { "\0", "" }
+};
+
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -82,13 +249,14 @@ static int  DVDRead     ( struct input_thread_s *, data_packet_t ** );
 static void DVDInit     ( struct input_thread_s * );
 static void DVDEnd      ( struct input_thread_s * );
 static void DVDSeek     ( struct input_thread_s *, off_t );
+static int  DVDSetArea  ( struct input_thread_s *, int, int, int, int );
 static int  DVDRewind   ( struct input_thread_s * );
 
 /*****************************************************************************
  * Functions exported as capabilities. They are declared as static so that
  * we don't pollute the namespace too much.
  *****************************************************************************/
-void input_getfunctions( function_list_t * p_function_list )
+void _M( input_getfunctions )( function_list_t * p_function_list )
 {
 #define input p_function_list->functions.input
     p_function_list->pf_probe = DVDProbe;
@@ -97,16 +265,37 @@ void input_getfunctions( function_list_t * p_function_list )
     input.pf_close            = input_FileClose;
     input.pf_end              = DVDEnd;
     input.pf_read             = DVDRead;
+    input.pf_set_area         = DVDSetArea;
     input.pf_demux            = input_DemuxPS;
-    input.pf_new_packet       = input_NetlistNewPacket;
-    input.pf_new_pes          = input_NetlistNewPES;
-    input.pf_delete_packet    = input_NetlistDeletePacket;
-    input.pf_delete_pes       = input_NetlistDeletePES;
+    input.pf_new_packet       = DVDNewPacket;
+    input.pf_new_pes          = DVDNewPES;
+    input.pf_delete_packet    = DVDDeletePacket;
+    input.pf_delete_pes       = DVDDeletePES;
     input.pf_rewind           = DVDRewind;
     input.pf_seek             = DVDSeek;
 #undef input
 }
 
+/*
+ * Local tools to decode some data in ifo
+ */
+
+/*****************************************************************************
+ * Language: gives the long language name from the two-letters ISO-639 code
+ *****************************************************************************/
+static char * Language( u16 i_code )
+{
+    int     i = 0;
+
+    while( memcmp( lang_tbl[i].p_code, &i_code, 2 ) &&
+           lang_tbl[i].p_lang_long[0] )
+    {
+        i++;
+    }
+
+    return lang_tbl[i].p_lang_long;
+}
+
 /*
  * Data reading functions
  */
@@ -116,12 +305,40 @@ void input_getfunctions( function_list_t * p_function_list )
  *****************************************************************************/
 static int DVDProbe( probedata_t *p_data )
 {
+    input_thread_t * p_input = (input_thread_t *)p_data;
+
+    char * psz_name = p_input->p_source;
+    int i_handle;
+    int i_score = 5;
+
     if( TestMethod( INPUT_METHOD_VAR, "dvd" ) )
     {
+#ifdef HAVE_CSS
         return( 999 );
+#else /* HAVE_CSS */
+        return( 998 );
+#endif /* HAVE_CSS */
     }
 
-    return 5;
+    if( ( strlen(psz_name) > 4 ) && !strncasecmp( psz_name, "dvd:", 4 ) )
+    {
+        /* If the user specified "dvd:" then it's probably a DVD */
+#ifdef HAVE_CSS
+        i_score = 100;
+#else /* HAVE_CSS */
+        i_score = 90;
+#endif /* HAVE_CSS */
+        psz_name += 4;
+    }
+
+    i_handle = open( psz_name, 0 );
+    if( i_handle == -1 )
+    {
+        return( 0 );
+    }
+    close( i_handle );
+
+    return( i_score );
 }
 
 /*****************************************************************************
@@ -129,313 +346,527 @@ static int DVDProbe( probedata_t *p_data )
  *****************************************************************************/
 static int DVDCheckCSS( input_thread_t * p_input )
 {
-#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD )
     return CSSTest( p_input->i_handle );
-#else
-    /* DVD ioctls unavailable.
-     * FIXME: Check the stream to see whether it is encrypted or not 
-     * to give and accurate error message */
+}
+
+
+/*****************************************************************************
+ * DVDFindSector: find cell index in adress map from index in
+ * information table program map and give corresponding sectors.
+ *****************************************************************************/
+static int DVDFindSector( thread_dvd_data_t * p_dvd )
+{
+    pgc_t *              p_pgc;
+    int                  i_cell;
+    int                  i_index;
+
+    p_pgc = &p_dvd->ifo.vts.pgci_ti.p_srp[p_dvd->i_vts_title-1].pgc;
+
+    i_index = p_dvd->i_prg_cell - 1;
+
+    do {
+        if( i_index++ > p_dvd->i_prg_cell )
+        {
+            return -1;
+        }
+        
+        i_cell = p_dvd->i_cell + 1;
+
+        while( ( ( p_pgc->p_cell_pos_inf[i_index].i_vob_id !=
+                   p_dvd->ifo.vts.c_adt.p_cell_inf[i_cell].i_vob_id ) ||
+                 ( p_pgc->p_cell_pos_inf[i_index].i_cell_id !=
+                   p_dvd->ifo.vts.c_adt.p_cell_inf[i_cell].i_cell_id ) ) &&
+                 ( i_cell < ( p_dvd->ifo.vts.c_adt.i_cell_nb ) ) )
+        {
+            i_cell++;
+        }
+
+    } while( i_cell == ( p_dvd->ifo.vts.c_adt.i_cell_nb ) );
+
+    p_dvd->i_cell = i_cell;
+    p_dvd->i_prg_cell = i_index;
+
+    /* Find start and end sectors of new cell */
+    p_dvd->i_sector = MAX(
+            p_dvd->ifo.vts.c_adt.p_cell_inf[i_cell].i_ssector,
+            p_pgc->p_cell_play_inf[i_index].i_entry_sector );
+    p_dvd->i_end_sector = MIN(
+            p_dvd->ifo.vts.c_adt.p_cell_inf[i_cell].i_esector,
+            p_pgc->p_cell_play_inf[i_index].i_lsector );
+
+//intf_WarnMsg( 3, "cell: %d index: %d sector1: %x sector2: %x end1: %x end2: %x", i_cell, i_index, p_dvd->ifo.vts.c_adt.p_cell_inf[i_cell].i_ssector, p_pgc->p_cell_play_inf[i_index].i_entry_sector, p_dvd->ifo.vts.c_adt.p_cell_inf[i_cell].i_esector,p_pgc->p_cell_play_inf[i_index].i_lsector  );
+
     return 0;
-#endif
 }
 
 /*****************************************************************************
- * DVDInit: initializes DVD structures
+ * DVDChapterSelect: find the cell corresponding to requested chapter
+ * When called to find chapter 1, also sets title size and end.
  *****************************************************************************/
-static void DVDInit( input_thread_t * p_input )
+static int DVDChapterSelect( thread_dvd_data_t * p_dvd, int i_chapter )
 {
-    thread_dvd_data_t *  p_method;
-    off_t                i_start;
-    off_t                i_size;
-    int                  i_cell, i_cell_1, i_start_cell, i_end_cell;
+    pgc_t *              p_pgc;
 
-    if( (p_method = malloc( sizeof(thread_dvd_data_t) )) == NULL )
-    {
-        intf_ErrMsg( "Out of memory" );
-        p_input->b_error = 1;
-        return;
-    }
+    p_pgc = &p_dvd->ifo.vts.pgci_ti.p_srp[p_dvd->i_vts_title-1].pgc;
 
-    p_input->p_plugin_data = (void *)p_method;
-    p_input->p_method_data = NULL;
+    /* Find cell index in Program chain for current chapter */
+    p_dvd->i_prg_cell = p_pgc->prg_map.pi_entry_cell[i_chapter-1] - 1;
+    p_dvd->i_cell = -1;
 
-    p_method->i_fd = p_input->i_handle;
-    /* FIXME: read several packets once */
-    p_method->i_read_once = 1; 
-    p_method->i_title = 0;
-    p_method->b_encrypted = DVDCheckCSS( p_input );
+    /* Search for cell_index in cell adress_table */
+    DVDFindSector( p_dvd );
 
-    lseek( p_input->i_handle, 0, SEEK_SET );
+    /* initialize  navigation parameters */
+    p_dvd->i_sector = p_dvd->ifo.vts.c_adt.p_cell_inf[p_dvd->i_cell].i_ssector;
+    p_dvd->i_end_sector =
+                      p_dvd->ifo.vts.c_adt.p_cell_inf[p_dvd->i_cell].i_esector;
 
-    /* Reading structures initialisation */
-    input_NetlistInit( p_input, 4096, 4096, DVD_LB_SIZE,
-                       p_method->i_read_once ); 
+    /* start is : beginning of vts vobs + offset to vob x */
+    p_dvd->i_start = p_dvd->i_title_start +
+                     DVD_LB_SIZE * (off_t)( p_dvd->i_sector );
 
-    /* Ifo initialisation */
-    p_method->ifo = IfoInit( p_input->i_handle );
+    /* Position the fd pointer on the right address */
+    p_dvd->i_start = lseek( p_dvd->i_fd, p_dvd->i_start, SEEK_SET );
 
-    /* CSS initialisation */
-    if( p_method->b_encrypted )
-    {
+    p_dvd->i_chapter = i_chapter;
 
-#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD )
-        p_method->css = CSSInit( p_input->i_handle );
+    return 0;
+}
 
-        if( ( p_input->b_error = p_method->css.b_error ) )
-        {
-            intf_ErrMsg( "CSS fatal error" );
-            return;
-        }
-#else
-        intf_ErrMsg( "Unscrambling not supported" );
-        p_input->b_error = 1;
-        return;
-#endif
-    }
+/*****************************************************************************
+ * DVDSetArea: initialize input data for title x, chapter y.
+ * It should be called for each user navigation request, and to change
+ * audio or sub-picture streams.
+ * ---
+ * Take care that i_title starts from 0 (vmg) and i_chapter start from 1.
+ * i_audio, i_spu start from 1 ; 0 means off.
+ * A negative value for an argument means it does not change
+ *****************************************************************************/
+static int DVDSetArea( input_thread_t * p_input,
+                       int i_title, int i_chapter,
+                       int i_audio, int i_spu )
+{
+    thread_dvd_data_t *  p_dvd;
+    es_descriptor_t *    p_es;
+    int                  i_index;
+    int                  i_nb;
+    u16                  i_id;
+    u8                   i_ac3;
+    u8                   i_mpeg;
+    u8                   i_sub_pic;
+    u8                   i;
+    boolean_t            b_last;
+    
+    p_dvd = (thread_dvd_data_t*)p_input->p_plugin_data;
 
-    /* Ifo structures reading */
-    IfoRead( &(p_method->ifo) );
-    intf_WarnMsg( 3, "Ifo: Initialized" );
+    vlc_mutex_lock( &p_input->stream.stream_lock );
 
-    /* CSS title keys */
-    if( p_method->b_encrypted )
+    if( i_title >= 0 )
     {
 
-#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD )
-        int   i;
+        /*
+         *  We have to load all title information
+         */
+
+        /* Change the default area */
+        p_input->stream.p_selected_area = p_input->stream.pp_areas[i_title];
 
-        p_method->css.i_title_nb = p_method->ifo.vmg.mat.i_tts_nb;
+        /* title number: it is not vts nb! */
+        p_dvd->i_title = i_title;
 
-        if( (p_method->css.p_title_key =
-            malloc( p_method->css.i_title_nb *sizeof(title_key_t) ) ) == NULL )
+        /* title position inside the selected vts */
+        p_dvd->i_vts_title =
+                    p_dvd->ifo.vmg.ptt_srpt.p_tts[i_title-1].i_vts_ttn;
+
+        /* vts number */
+        p_dvd->ifo.i_title = i_title;
+
+        /* ifo vts */
+        IfoReadVTS( &(p_dvd->ifo) );
+        intf_WarnMsg( 2, "ifo info: vts initialized" );
+    
+        /* css title key for current vts */
+        if( p_dvd->b_encrypted )
         {
-            intf_ErrMsg( "Out of memory" );
-            p_input->b_error = 1;
-            return;
+            p_dvd->p_css->i_title =
+                    p_dvd->ifo.vmg.ptt_srpt.p_tts[i_title-1].i_tts_nb;
+            p_dvd->p_css->i_title_pos =
+                    p_dvd->ifo.vts.i_pos +
+                    p_dvd->ifo.vts.mat.i_tt_vobs_ssector * DVD_LB_SIZE;
+            CSSGetKey( p_dvd->p_css );
+            intf_WarnMsg( 2, "css info: vts key initialized" );
+        }
+    
+        /*
+         * Set selected title start and size
+         */
+        
+        /* title set offset */
+        p_dvd->i_title_start = p_dvd->ifo.vts.i_pos + DVD_LB_SIZE *
+                      (off_t)( p_dvd->ifo.vts.mat.i_tt_vobs_ssector );
+
+        /* last video cell */
+        p_dvd->i_cell = -1;
+        p_dvd->i_prg_cell = -1 +
+            p_dvd->ifo.vts.pgci_ti.p_srp[p_dvd->i_vts_title-1].pgc.i_cell_nb;
+        DVDFindSector( p_dvd );
+
+        /* temporary hack to fix size in some dvds */
+        if( p_dvd->i_cell >= p_dvd->ifo.vts.c_adt.i_cell_nb )
+        {
+            p_dvd->i_cell = p_dvd->ifo.vts.c_adt.i_cell_nb - 1;
         }
 
-        for( i=0 ; i<p_method->css.i_title_nb ; i++ )
+        p_dvd->i_size = DVD_LB_SIZE *
+          (off_t)( p_dvd->ifo.vts.c_adt.p_cell_inf[p_dvd->i_cell].i_esector );
+
+        DVDChapterSelect( p_dvd, 1 );
+
+        p_dvd->i_size -= (off_t)( p_dvd->i_sector + 1 ) *DVD_LB_SIZE;
+
+        lseek( p_input->i_handle, p_dvd->i_start, SEEK_SET );
+
+
+        intf_WarnMsg( 2, "dvd info: title: %d", i_title );
+        intf_WarnMsg( 2, "dvd info: vobstart at: %lld", p_dvd->i_start );
+        intf_WarnMsg( 2, "dvd info: stream size: %lld", p_dvd->i_size );
+        intf_WarnMsg( 2, "dvd info: number of chapters: %d",
+                        p_dvd->ifo.vmg.ptt_srpt.p_tts[i_title-1].i_ptt_nb );
+
+/*        intf_WarnMsg( 3, "last: %d index: %d", i_last_chapter, i_index );*/
+
+
+/*        intf_WarnMsg( 3, "DVD: Cell: %d vob id: %d cell id: %d", i_end_cell, p_dvd->ifo.vts.c_adt.p_cell_inf[i_end_cell].i_vob_id, p_dvd->ifo.vts.c_adt.p_cell_inf[i_end_cell].i_cell_id );*/
+
+        /* Area definition */
+        p_input->stream.p_selected_area->i_start = p_dvd->i_start;
+        p_input->stream.p_selected_area->i_size = p_dvd->i_size;
+
+        /*
+         * Destroy obsolete ES by reinitializing program 0
+         * and find all ES in title with ifo data
+         */
+        if( p_input->stream.pp_programs != NULL )
         {
-            p_method->css.p_title_key[i].i =
-                p_method->ifo.p_vts[i].i_pos +
-                p_method->ifo.p_vts[i].mat.i_tt_vobs_ssector * DVD_LB_SIZE;
+            input_DelProgram( p_input, p_input->stream.pp_programs[0] );
         }
 
-        CSSGetKeys( &(p_method->css) );
+        input_AddProgram( p_input, 0, sizeof( stream_ps_data_t ) );
 
-        intf_WarnMsg( 3, "CSS: initialized" );
-#else
-        intf_ErrMsg( "Unscrambling not supported" );
-        p_input->b_error = 1;
-        return;
+        p_es = NULL;
+
+        /* ES 0 -> video MPEG2 */
+        p_es = input_AddES( p_input, p_input->stream.pp_programs[0], 0xe0, 0 );
+        p_es->i_stream_id = 0xe0;
+        p_es->i_type = MPEG2_VIDEO_ES;
+        input_SelectES( p_input, p_es );
+        intf_WarnMsg( 1, "dvd info: video MPEG2 stream" );
+    
+        /* Audio ES, in the order they appear in .ifo */
+        i_nb = p_dvd->ifo.vts.mat.i_audio_nb;
+    
+        i_ac3 = 0x7f;
+        i_mpeg = 0xc0;
+
+        for( i = 1 ; i <= i_nb ; i++ )
+        {
+
+#if 0
+    fprintf( stderr, "Audio %d: %x %x %x %x %x %x %x %x %x %x %x %x\n", i,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_num_channels,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_coding_mode,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_multichannel_extension,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_type,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_appl_mode,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_foo,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_bar,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_appl_mode,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_quantization,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_sample_freq,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_lang_code,
+            p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_caption );
 #endif
-    }
 
-    /* FIXME: Kludge beginning and end of the stream in vts_01_1.vob */
+            switch( p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_coding_mode )
+            {
+            case 0x00:              /* AC3 */
+                i_id = ( ( i_ac3 + i ) << 8 ) | 0xbd;
+                p_es = input_AddES( p_input,
+                                    p_input->stream.pp_programs[0], i_id, 0 );
+                p_es->i_stream_id = 0xbd;
+                p_es->i_type = AC3_AUDIO_ES;
+                p_es->b_audio = 1;
+                strcpy( p_es->psz_desc, Language( hton16(
+                    p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_lang_code ) ) ); 
+
+                intf_WarnMsg( 1, "dvd info: audio stream %d %s\t(0x%x)",
+                              i, p_es->psz_desc, i_id );
 
-    /* Determines which vob contains the movie */
-    i_cell = 0;
-    i_cell_1 = 0;
-    i_start_cell = 0;
-    i_end_cell = 0;
+                break;
+            case 0x02:
+            case 0x03:              /* MPEG audio */
+                i_id = 0xbf + i;
+                p_es = input_AddES( p_input,
+                                    p_input->stream.pp_programs[0], i_id, 0 );
+                p_es->i_stream_id = i_id;
+                p_es->i_type = MPEG2_AUDIO_ES;
+                p_es->b_audio = 1;
+                strcpy( p_es->psz_desc, Language( hton16(
+                    p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_lang_code ) ) ); 
+
+                intf_WarnMsg( 1, "dvd info: audio stream %d %s\t(0x%x)",
+                              i, p_es->psz_desc, i_id );
+
+                break;
+            case 0x04:              /* LPCM */
+                i_id = 0;
+                intf_ErrMsg( "dvd warning: LPCM audio not handled yet" );
+                break;
+            case 0x06:              /* DTS */
+                i_id = 0;
+                i_ac3--;
+                intf_ErrMsg( "dvd warning: DTS audio not handled yet" );
+                break;
+            default:
+                i_id = 0;
+                intf_ErrMsg( "dvd warning: unknown audio type %.2x",
+                         p_dvd->ifo.vts.mat.p_audio_atrt[i-1].i_coding_mode );
+            }
+        
+        }
+    
+        /* Sub Picture ES */
+        i_nb = p_dvd->ifo.vts.mat.i_subpic_nb;
+    
+        b_last = 0;
+        i_sub_pic = 0x20;
+        for( i = 1 ; i <= i_nb ; i++ )
+        {
+            if( !b_last )
+            {
+                i_id = ( i_sub_pic++ << 8 ) | 0xbd;
+                p_es = input_AddES( p_input,
+                                    p_input->stream.pp_programs[0], i_id, 0 );
+                p_es->i_stream_id = 0xbd;
+                p_es->i_type = DVD_SPU_ES;
+                strcpy( p_es->psz_desc, Language( hton16(
+                    p_dvd->ifo.vts.mat.p_subpic_atrt[i-1].i_lang_code ) ) ); 
+                intf_WarnMsg( 1, "dvd info: spu stream %d %s\t(0x%x)",
+                              i, p_es->psz_desc, i_id );
+    
+                /* The before the last spu has a 0x0 prefix */
+                b_last =
+                    ( p_dvd->ifo.vts.mat.p_subpic_atrt[i].i_prefix == 0 ); 
+            }
+        }
+
+    } // i_title >= 0
 
-    /* Loop on the number of vobs */
-    while( p_method->ifo.p_vts[0].c_adt.p_cell_inf[i_cell].i_vob_id <=
-           p_method->ifo.p_vts[0].c_adt.i_vob_nb )
+    /*
+     * Select requested ES
+     */
+    if( ( i_audio >= 0 ) || ( i_title >= 0 ) )
     {
-        i_cell_1 = i_cell;
 
-        /* Loop to find the number of cells in the vob */
-        do
+        /* Audio: we check it is in the range and
+         * default it to the first if not */
+        if( i_audio > p_dvd->ifo.vts.mat.i_audio_nb )
         {
-            i_cell++;
-            if( i_cell >= p_method->ifo.p_vts[0].c_adt.i_cell_nb )
+            i_audio = 1;
+        }
+
+        p_es = p_input->stream.pp_programs[0]->pp_es[i_audio];
+
+        /* We can only have one audio channel */
+        /* Look for a preselected one */
+        i_index = -1;
+        for( i = 0 ; i < p_input->stream.i_selected_es_number ; i++ )
+        {
+            if( p_input->stream.pp_selected_es[i]->b_audio )
             {
+                i_index = i;
                 break;
             }
         }
-        while( p_method->ifo.p_vts[0].c_adt.p_cell_inf[i_cell-1].i_cell_id <
-               p_method->ifo.p_vts[0].c_adt.p_cell_inf[i_cell].i_cell_id );
 
+        if( i_index != -1 )
+        {
+            
+            if( p_input->stream.pp_selected_es[i_index] != p_es )
+            {
+                input_UnselectES( p_input,
+                                  p_input->stream.pp_selected_es[i_index] );
+                input_SelectES( p_input, p_es );
+                intf_WarnMsg( 1, "dvd info: audio %d selected -> %s (0x%x)",
+                              i_audio, p_es->psz_desc, p_es->i_id );
+            }
+        }
+        else
+        {
+            input_SelectES( p_input, p_es );
+            intf_WarnMsg( 1, "dvd info: audio %d selected -> %s (0x%x)",
+                          i_audio, p_es->psz_desc, p_es->i_id );
+        }
+    }
 
-        if( p_method->ifo.p_vts[0].c_adt.p_cell_inf[i_cell-1].i_cell_id >
-            p_method->ifo.p_vts[0].c_adt.p_cell_inf[i_end_cell].i_cell_id )
+    if( ( i_spu >= 0 ) || ( i_title >= 0 ) )
+    {
+        /* For spu: no one if none or a not existing one requested */
+        if( ( i_spu <= p_dvd->ifo.vts.mat.i_subpic_nb ) && ( i_spu > 0 ) )
         {
-            i_start_cell = i_cell_1;
-            i_end_cell = i_cell - 1;
+            input_SelectES( p_input, ( p_es = p_input->stream.pp_programs[0]->
+                pp_es[ i_spu + p_dvd->ifo.vts.mat.i_audio_nb ] ) );
+    
+            intf_WarnMsg( 1, "dvd info: spu   %d selected -> %s (0x%x)",
+                          i_spu, p_es->psz_desc, p_es->i_id );
         }
     }
 
-    /* The preceding does not work with all DVD, so we give the
-     * last cell of the title as end */
-    i_end_cell = p_method->ifo.p_vts[0].c_adt.i_cell_nb - 1;
+    /*
+     * Chapter selection
+     */
 
-    intf_WarnMsg( 2, "DVD: Start cell: %d End Cell: %d",
-                                            i_start_cell, i_end_cell );
+    if( ( i_chapter > 0 ) &&
+        ( i_chapter <= p_input->stream.p_selected_area->i_part_nb ) )
+    {
+        DVDChapterSelect( p_dvd, i_chapter );
 
-    p_method->i_start_cell = i_start_cell;
-    p_method->i_end_cell = i_end_cell;
+        p_input->stream.p_selected_area->i_tell = p_dvd->i_start -
+                                p_input->stream.p_selected_area->i_start;
+        p_input->stream.p_selected_area->i_part = p_dvd->i_chapter;
 
-    /* start is : beginning of vts + offset to vobs + offset to vob x */
-    i_start = p_method->ifo.p_vts[0].i_pos + DVD_LB_SIZE *
-            ( p_method->ifo.p_vts[0].mat.i_tt_vobs_ssector +
-              p_method->ifo.p_vts[0].c_adt.p_cell_inf[i_start_cell].i_ssector );
-    p_method->i_start_byte = i_start;
-                                                    
-    i_start = lseek( p_input->i_handle, i_start, SEEK_SET );
-    intf_WarnMsg( 3, "DVD: VOBstart at: %lld", i_start );
+        intf_WarnMsg( 2, "dvd info: chapter %d start at: %lld", i_chapter,
+                                    p_input->stream.p_selected_area->i_tell );
+    }
 
-    i_size = (off_t)
-        ( p_method->ifo.p_vts[0].c_adt.p_cell_inf[i_end_cell].i_esector -
-          p_method->ifo.p_vts[0].c_adt.p_cell_inf[i_start_cell].i_ssector + 1 )
-        *DVD_LB_SIZE;
-    intf_WarnMsg( 3, "DVD: stream size: %lld", i_size );
+    /* No PSM to read in DVD mode, we already have all information */
+    p_input->stream.pp_programs[0]->b_is_ok = 1;
 
+    vlc_mutex_unlock( &p_input->stream.stream_lock );
 
-    /* Initialize ES structures */
-    input_InitStream( p_input, sizeof( stream_ps_data_t ) );
-    input_AddProgram( p_input, 0, sizeof( stream_ps_data_t ) );
+    return 0;
+}
 
-    if( p_input->stream.b_seekable )
+/*****************************************************************************
+ * DVDInit: initializes DVD structures
+ *****************************************************************************/
+static void DVDInit( input_thread_t * p_input )
+{
+    thread_dvd_data_t *  p_dvd;
+    int                  i_title;
+    int                  i_chapter;
+    int                  i_audio;
+    int                  i_spu;
+    int                  i;
+
+    if( (p_dvd = malloc( sizeof(thread_dvd_data_t) )) == NULL )
     {
-        stream_ps_data_t * p_demux_data =
-             (stream_ps_data_t *)p_input->stream.pp_programs[0]->p_demux_data;
+        intf_ErrMsg( "Out of memory" );
+        p_input->b_error = 1;
+        return;
+    }
 
-        /* Pre-parse the stream to gather stream_descriptor_t. */
-        p_input->stream.pp_programs[0]->b_is_ok = 0;
-        p_demux_data->i_PSM_version = EMPTY_PSM_VERSION;
+    p_input->p_plugin_data = (void *)p_dvd;
+    p_input->p_method_data = NULL;
 
-        while( !p_input->b_die && !p_input->b_error
-                && !p_demux_data->b_has_PSM )
-        {
-            int                 i_result, i;
-            data_packet_t *     pp_packets[INPUT_READ_ONCE];
+    p_dvd->i_fd = p_input->i_handle;
 
-            i_result = DVDRead( p_input, pp_packets );
-            if( i_result == 1 )
-            {
-                /* EOF */
-                vlc_mutex_lock( &p_input->stream.stream_lock );
-                p_input->stream.pp_programs[0]->b_is_ok = 1;
-                vlc_mutex_unlock( &p_input->stream.stream_lock );
-                break;
-            }
-            if( i_result == -1 )
-            {
-                p_input->b_error = 1;
-                break;
-            }
+    p_dvd->i_block_once = 1;
+    p_input->i_read_once = 8;
 
-            for( i = 0; i < INPUT_READ_ONCE && pp_packets[i] != NULL; i++ )
-            {
-                /* FIXME: use i_p_config_t */
-                input_ParsePS( p_input, pp_packets[i] );
-                input_NetlistDeletePacket( p_input->p_method_data,
-                                           pp_packets[i] );
-            }
+    p_dvd->b_encrypted = DVDCheckCSS( p_input );
 
-            /* File too big. */
-            if( p_input->stream.i_tell > INPUT_PREPARSE_LENGTH )
-            {
-                break;
-            }
-        }
-        lseek( p_input->i_handle, i_start, SEEK_SET );
-        vlc_mutex_lock( &p_input->stream.stream_lock );
+    lseek( p_input->i_handle, 0, SEEK_SET );
 
-        /* i_tell is an indicator from the beginning of the stream,
-         * not of the DVD */
-        p_input->stream.i_tell = 0;
+    /* Reading structures initialisation */
+    p_input->p_method_data =
+    DVDNetlistInit( 4096, 8192, 4096, DVD_LB_SIZE, p_dvd->i_block_once ); 
+    intf_WarnMsg( 2, "dvd info: netlist initialized" );
 
-        if( p_demux_data->b_has_PSM )
-        {
-            /* (The PSM decoder will care about spawning the decoders) */
-            p_input->stream.pp_programs[0]->b_is_ok = 1;
-        }
-#ifdef AUTO_SPAWN
-        else
+    /* Ifo initialisation */
+    p_dvd->ifo = IfoInit( p_input->i_handle );
+    intf_WarnMsg( 2, "ifo info: vmg initialized" );
+
+    /* CSS initialisation */
+    if( p_dvd->b_encrypted )
+    {
+        p_dvd->p_css = CSSInit( p_input->i_handle );
+
+        if( p_dvd->p_css == NULL )
         {
-            /* (We have to do it ourselves) */
-            int                 i_es;
-
-            /* FIXME: we should do multiple passes in case an audio type
-             * is not present */
-            for( i_es = 0;
-                 i_es < p_input->stream.pp_programs[0]->i_es_number;
-                 i_es++ )
-            {
-#define p_es p_input->stream.pp_programs[0]->pp_es[i_es]
-                switch( p_es->i_type )
-                {
-                    case MPEG1_VIDEO_ES:
-                    case MPEG2_VIDEO_ES:
-                        input_SelectES( p_input, p_es );
-                        break;
-
-                    case MPEG1_AUDIO_ES:
-                    case MPEG2_AUDIO_ES:
-                        if( main_GetIntVariable( INPUT_CHANNEL_VAR, 0 )
-                                == (p_es->i_id & 0x1F) )
-                        switch( main_GetIntVariable( INPUT_AUDIO_VAR, 0 ) )
-                        {
-                        case 0:
-                            main_PutIntVariable( INPUT_AUDIO_VAR,
-                                                 REQUESTED_MPEG );
-                        case REQUESTED_MPEG:
-                            input_SelectES( p_input, p_es );
-                        }
-                        break;
-
-                    case AC3_AUDIO_ES:
-                        if( main_GetIntVariable( INPUT_CHANNEL_VAR, 0 )
-                                == ((p_es->i_id & 0xF00) >> 8) )
-                        switch( main_GetIntVariable( INPUT_AUDIO_VAR, 0 ) )
-                        {
-                        case 0:
-                            main_PutIntVariable( INPUT_AUDIO_VAR,
-                                                 REQUESTED_AC3 );
-                        case REQUESTED_AC3:
-                            input_SelectES( p_input, p_es );
-                        }
-                        break;
-
-                    case DVD_SPU_ES:
-                        if( main_GetIntVariable( INPUT_SUBTITLE_VAR, -1 )
-                                == ((p_es->i_id & 0x1F00) >> 8) )
-                        {
-                            input_SelectES( p_input, p_es );
-                        }
-                        break;
-
-                    case LPCM_AUDIO_ES:
-                        /* FIXME ! */
-                        break;
-                }
-            }
-                    
+            intf_ErrMsg( "css error: fatal failure" );
+            p_input->b_error = 1;
+            return;
         }
-#endif
-#ifdef STATS
-        input_DumpStream( p_input );
-#endif
 
-        /* FIXME : ugly kludge */
-        p_input->stream.i_size = i_size;
-
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
+        intf_WarnMsg( 2, "css info: initialized" );
     }
-    else
+
+    /* Initialize ES structures */
+    input_InitStream( p_input, sizeof( stream_ps_data_t ) );
+
+    /* Set stream and area data */
+    vlc_mutex_lock( &p_input->stream.stream_lock );
+
+#define srpt p_dvd->ifo.vmg.ptt_srpt
+    intf_WarnMsg( 2, "dvd info: number of titles: %d", srpt.i_ttu_nb );
+
+#define area p_input->stream.pp_areas
+    /* We start from 1 here since area 0 is reserved for video_ts.vob */
+    for( i = 1 ; i <= srpt.i_ttu_nb ; i++ )
     {
-        /* The programs will be added when we read them. */
-        vlc_mutex_lock( &p_input->stream.stream_lock );
-        p_input->stream.pp_programs[0]->b_is_ok = 0;
+        input_AddArea( p_input );
 
-        /* FIXME : ugly kludge */
-        p_input->stream.i_size = i_size;
+        /* Should not be so simple eventually :
+         * are title Program Chains, or still something else ? */
+        area[i]->i_id = i;
 
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
+        /* Absolute start offset and size 
+         * We can only set that with vts ifo, so we do it during the
+         * first call to DVDSetArea */
+        area[i]->i_start = 0;
+        area[i]->i_size = 0;
+
+        /* Number of chapter */
+        area[i]->i_part_nb = srpt.p_tts[i-1].i_ptt_nb;
+        area[i]->i_part = 1;
+
+        /* Offset to vts_i_0.ifo */
+        area[i]->i_plugin_data = p_dvd->ifo.i_off +
+                               ( srpt.p_tts[i-1].i_ssector * DVD_LB_SIZE );
+    }   
+#undef area
+
+    vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+    /* Get requested title - if none try to find one where is the movie */
+    i_title = main_GetIntVariable( INPUT_TITLE_VAR, 1 );
+    if( i_title <= 0 || i_title > srpt.i_ttu_nb )
+    {
+        i_title = 1;
     }
+#undef srpt
 
+    /* Get requested chapter - if none defaults to first one */
+    i_chapter = main_GetIntVariable( INPUT_CHAPTER_VAR, 1 );
+    if( i_chapter <= 0 )
+    {
+        i_chapter = 1;
+    }
+
+    /* For audio: first one if none or a not existing one specified */
+    i_audio = main_GetIntVariable( INPUT_CHANNEL_VAR, 1 );
+    if( i_audio <= 0 )
+    {
+        main_PutIntVariable( INPUT_CHANNEL_VAR, 1 );
+        i_audio = 1;
+    }
+
+    i_spu = main_GetIntVariable( INPUT_SUBTITLE_VAR, 0 );
+
+    DVDSetArea( p_input, i_title, i_chapter, i_audio, i_spu );
+
+    return;
 }
 
 /*****************************************************************************
@@ -443,12 +874,16 @@ static void DVDInit( input_thread_t * p_input )
  *****************************************************************************/
 static void DVDEnd( input_thread_t * p_input )
 {
-    /* FIXME: check order of calls */
-//    CSSEnd( p_input );
-//    IfoEnd( (ifo_t*)(&p_input->p_plugin_data->ifo ) );
-    free( p_input->stream.p_demux_data );
-    free( p_input->p_plugin_data );
-    input_NetlistEnd( p_input );
+    thread_dvd_data_t *     p_dvd;
+    dvd_netlist_t *         p_netlist;
+
+    p_dvd = (thread_dvd_data_t*)p_input->p_plugin_data;
+    p_netlist = (dvd_netlist_t *)p_input->p_method_data;
+
+    CSSEnd( p_dvd->p_css );
+//    IfoEnd( p_dvd->p_ifo ) );
+    free( p_dvd );
+    DVDNetlistEnd( p_netlist );
 }
 
 /*****************************************************************************
@@ -458,62 +893,107 @@ static void DVDEnd( input_thread_t * p_input )
  * EOF.
  *****************************************************************************/
 static int DVDRead( input_thread_t * p_input,
-                   data_packet_t ** pp_packets )
+                    data_packet_t ** pp_packets )
 {
-    thread_dvd_data_t *     p_method;
-    netlist_t *             p_netlist;
+    thread_dvd_data_t *     p_dvd;
+    dvd_netlist_t *         p_netlist;
+    pgc_t *                 p_pgc;
     struct iovec *          p_vec;
-    struct data_packet_s *  p_data;
+    struct data_packet_s *  pp_data[p_input->i_read_once];
     u8 *                    pi_cur;
     int                     i_packet_size;
+    int                     i_iovec;
     int                     i_packet;
     int                     i_pos;
-    int                     i;
-    boolean_t               b_first_packet;
+    int                     i_read_bytes;
+    int                     i_read_blocks;
+    int                     i_chapter;
+    off_t                   i_off;
+    boolean_t               b_eof;
 
-    p_method = ( thread_dvd_data_t * ) p_input->p_plugin_data;
-    p_netlist = ( netlist_t * ) p_input->p_method_data;
+    p_dvd = (thread_dvd_data_t *)p_input->p_plugin_data;
+    p_netlist = (dvd_netlist_t *)p_input->p_method_data;
+    p_pgc = &p_dvd->ifo.vts.pgci_ti.p_srp[p_dvd->i_vts_title-1].pgc;
 
     /* Get an iovec pointer */
-    if( ( p_vec = input_NetlistGetiovec( p_netlist ) ) == NULL )
+    if( ( p_vec = DVDGetiovec( p_netlist ) ) == NULL )
     {
         intf_ErrMsg( "DVD: read error" );
         return -1;
     }
 
-    /* Reads from DVD */
-    readv( p_input->i_handle, p_vec, p_method->i_read_once );
+    /* Get the position of the next cell if we're at cell end */
 
-#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD )
-    if( p_method->b_encrypted )
+    if( p_dvd->i_sector > p_dvd->i_end_sector )
     {
-        for( i=0 ; i<p_method->i_read_once ; i++ )
+        /* Find cell index in adress map */
+        if( DVDFindSector( p_dvd ) < 0 )
+        {
+            pp_packets[0] = NULL;
+            return 1;
+        }
+
+        /* Position the fd pointer on the right address */
+        i_off = lseek( p_dvd->i_fd,
+                       p_dvd->i_title_start +
+                       (off_t)( p_dvd->i_sector ) *DVD_LB_SIZE,
+               SEEK_SET );
+
+        i_chapter = 0;
+
+        /* update chapter */
+        while( p_pgc->prg_map.pi_entry_cell[i_chapter-1] - 1 <
+               p_dvd->i_prg_cell )
         {
-            CSSDescrambleSector(
-                        p_method->css.p_title_key[p_method->i_title].key, 
-                        p_vec[i].iov_base );
-            ((u8*)(p_vec[i].iov_base))[0x14] &= 0x8F;
+            i_chapter++;
         }
+
+        p_dvd->i_chapter = i_chapter;
+
+        vlc_mutex_lock( &p_input->stream.stream_lock );
+
+        p_input->stream.p_selected_area->i_tell = i_off -
+                                    p_input->stream.p_selected_area->i_start;
+        p_input->stream.p_selected_area->i_part = p_dvd->i_chapter;
+
+        vlc_mutex_unlock( &p_input->stream.stream_lock );
+
     }
-#endif
+
+    /* Reads from DVD */
+    i_read_bytes = readv( p_dvd->i_fd, p_vec, p_dvd->i_block_once );
+    i_read_blocks = ( i_read_bytes + 0x7ff ) >> 11;
 
     /* Update netlist indexes */
-    input_NetlistMviovec( p_netlist, p_method->i_read_once, &p_data );
+    DVDMviovec( p_netlist, i_read_blocks, pp_data );
+
+    /* Update global position */
+    p_dvd->i_sector += i_read_blocks;
 
     i_packet = 0;
+
     /* Read headers to compute payload length */
-    for( i = 0 ; i < p_method->i_read_once ; i++ )
+    for( i_iovec = 0 ; i_iovec < i_read_blocks ; i_iovec++ )
     {
+        if( p_dvd->b_encrypted )
+        {
+            CSSDescrambleSector( p_dvd->p_css->pi_title_key, 
+                                 p_vec[i_iovec].iov_base );
+            ((u8*)(p_vec[i_iovec].iov_base))[0x14] &= 0x8F;
+        }
+
         i_pos = 0;
-        b_first_packet = 1;
+
         while( i_pos < p_netlist->i_buffer_size )
         {
-            pi_cur = (u8*)(p_vec[i].iov_base + i_pos);
+            pi_cur = (u8*)(p_vec[i_iovec].iov_base + i_pos);
+
             /*default header */
             if( U32_AT( pi_cur ) != 0x1BA )
             {
                 /* That's the case for all packets, except pack header. */
                 i_packet_size = U16_AT( pi_cur + 4 );
+                pp_packets[i_packet] = DVDNewPtr( p_netlist );
             }
             else
             {
@@ -533,33 +1013,46 @@ static int DVDRead( input_thread_t * p_input,
                     intf_ErrMsg( "Unable to determine stream type" );
                     return( -1 );
                 }
+
+                pp_packets[i_packet] = pp_data[i_iovec];
+
             }
-            if( b_first_packet )
-            {
-                p_data->b_discard_payload = 0;
-                b_first_packet = 0;
-            }
-            else
-            { 
-                p_data = input_NetlistNewPacket( p_netlist ,
-                                                 i_packet_size + 6 );
-                memcpy( p_data->p_buffer,
-                        p_vec[i].iov_base + i_pos , i_packet_size + 6 );
-            }
 
-            p_data->p_payload_end = p_data->p_payload_start + i_packet_size + 6;
-            pp_packets[i_packet] = p_data;
+            (*pp_data[i_iovec]->pi_refcount)++;
+
+            pp_packets[i_packet]->pi_refcount = pp_data[i_iovec]->pi_refcount;
+
+            pp_packets[i_packet]->p_buffer = pp_data[i_iovec]->p_buffer;
+
+            pp_packets[i_packet]->p_payload_start =
+                    pp_packets[i_packet]->p_buffer + i_pos;
+
+            pp_packets[i_packet]->p_payload_end =
+                    pp_packets[i_packet]->p_payload_start + i_packet_size + 6;
+
             i_packet++;
             i_pos += i_packet_size + 6;
         }
     }
+
     pp_packets[i_packet] = NULL;
 
     vlc_mutex_lock( &p_input->stream.stream_lock );
-    p_input->stream.i_tell += p_method->i_read_once *DVD_LB_SIZE;
+
+    p_input->stream.p_selected_area->i_tell +=
+                                        p_dvd->i_block_once *DVD_LB_SIZE;
+    b_eof = p_input->stream.p_selected_area->i_tell < p_dvd->i_size ? 0 : 1;
+
     vlc_mutex_unlock( &p_input->stream.stream_lock );
 
-    return( 0 );
+    if( ( i_read_blocks == p_dvd->i_block_once ) && ( !b_eof ) )
+    {
+        return 0;
+    }
+    else
+    {
+        return 1;
+    }
 }
 
 
@@ -575,23 +1068,65 @@ static int DVDRewind( input_thread_t * p_input )
  * DVDSeek : Goes to a given position on the stream ; this one is used by the 
  * input and translate chronological position from input to logical postion
  * on the device
+ * ---
+ * The lock should be taken before calling this function.
  *****************************************************************************/
 static void DVDSeek( input_thread_t * p_input, off_t i_off )
 {
-    thread_dvd_data_t *     p_method;
+    thread_dvd_data_t *     p_dvd;
+    pgc_t *                 p_pgc;
     off_t                   i_pos;
+    int                     i_prg_cell;
+    int                     i_cell;
+    int                     i_chapter;
     
-    p_method = ( thread_dvd_data_t * )p_input->p_plugin_data;
+    p_dvd = ( thread_dvd_data_t * )p_input->p_plugin_data;
+    p_pgc = &p_dvd->ifo.vts.pgci_ti.p_srp[p_dvd->i_vts_title-1].pgc;
+
+    /* update navigation data */
+    p_dvd->i_sector = i_off >> 11;
+
+    i_prg_cell = 0;
+    i_cell = 0;
+    i_chapter = 1;
+
+    /* parse vobu address map to find program cell */
+    while( p_pgc->p_cell_play_inf[i_prg_cell].i_lsector < p_dvd->i_sector  )
+    {
+        i_prg_cell++;
+    }
+    /* parse cell address map to find cell */
+    while( p_dvd->ifo.vts.c_adt.p_cell_inf[i_cell].i_esector <=
+           p_dvd->i_sector + 1 )
+    {
+        i_cell++;
+    }
+
+    p_dvd->i_prg_cell = i_prg_cell;
+    p_dvd->i_cell = i_cell - 1;             /* DVDFindSector will add one */
+
+    /* check coherence of data */
+    DVDFindSector( p_dvd );
+
+    /* update chapter */
+    while( p_pgc->prg_map.pi_entry_cell[i_chapter-1] - 1 < p_dvd->i_prg_cell )
+    {
+        i_chapter++;
+    }
+
+    p_dvd->i_chapter = i_chapter;
 
-    /* We have to take care of offset of beginning of title */
-    i_pos = i_off + p_method->i_start_byte;
+    /* we have to take care of offset of beginning of title */
+    i_pos = i_off + p_input->stream.p_selected_area->i_start;
 
-    /* With DVD, we have to be on a sector boundary */
+    /* with DVD, we have to be on a sector boundary */
     i_pos = i_pos & (~0x7ff);
 
-    i_pos = lseek( p_input->i_handle, i_pos, SEEK_SET );
+    i_pos = lseek( p_dvd->i_fd, i_pos, SEEK_SET );
 
-    p_input->stream.i_tell = i_pos - p_method->i_start_byte;
+    p_input->stream.p_selected_area->i_tell = i_pos -
+                                    p_input->stream.p_selected_area->i_start;
+    p_input->stream.p_selected_area->i_part = p_dvd->i_chapter;
 
     return;
 }