]> git.sesse.net Git - vlc/blobdiff - plugins/dvd/dvd_summary.c
* ./src/libvlc.c: p_vlc->pf_memset is now usable (it's always the libc
[vlc] / plugins / dvd / dvd_summary.c
index 125d428131e1778ce90570a0d68d231cd33987d9..45655facee7d319acdcbd32f048156047063fddb 100644 (file)
@@ -3,7 +3,7 @@
  * found in .ifo.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_summary.c,v 1.13 2002/03/05 17:46:33 stef Exp $
+ * $Id: dvd_summary.c,v 1.20 2002/06/01 12:31:59 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <videolan/vlc.h>
+#include <vlc/vlc.h>
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #ifdef GOD_DAMN_DMCA
 #   include "dummy_dvdcss.h"
 #else
-#   include <videolan/dvdcss.h>
+#   include <dvdcss/dvdcss.h>
 #endif
 
-#include "input_dvd.h"
+#include "dvd.h"
 #include "dvd_ifo.h"
 #include "iso_lang.h"
 
-#include "debug.h"
-
 /*
  * Local tools to decode some data in ifo
  */
  ****************************************************************************/
 void IfoPrintTitle( thread_dvd_data_t * p_dvd )
 {
-    intf_WarnMsg( 5, "dvd info: title %d, %d chapter%s, %d angle%s, "
-                     "vobstart at %d blocks, stream size %d blocks",
-                     p_dvd->i_title, p_dvd->i_chapter_nb,
-                     (p_dvd->i_chapter_nb == 1) ? "" : "s",
-                     p_dvd->i_angle_nb,
-                     (p_dvd->i_angle_nb == 1) ? "" : "s",
-                     p_dvd->i_start, p_dvd->i_size );
+//X    intf_WarnMsg( 5, "dvd info: title %d, %d chapter%s, %d angle%s",
+//X                     p_dvd->i_title, p_dvd->i_chapter_nb,
+//X                     (p_dvd->i_chapter_nb == 1) ? "" : "s",
+//X                     p_dvd->i_angle_nb,
+//X                     (p_dvd->i_angle_nb == 1) ? "" : "s" );
 }
 
 /****************************************************************************
@@ -83,39 +79,39 @@ void IfoPrintTitle( thread_dvd_data_t * p_dvd )
 #define video p_dvd->p_ifo->vts.manager_inf.video_attr
 void IfoPrintVideo( thread_dvd_data_t * p_dvd )
 {
-    char*    psz_perm_displ[4] =
-             {
-                "pan-scan & letterboxed",
-                "pan-scan",
-                "letterboxed",
-                "not specified"
-             };
-    char*    psz_source_res[4] =
-             {
-                "720x480 ntsc or 720x576 pal",
-                "704x480 ntsc or 704x576 pal",
-                "352x480 ntsc or 352x576 pal",
-                "352x240 ntsc or 352x288 pal"
-             };
-
-    intf_WarnMsg( 5, "dvd info: MPEG-%d video, %sHz, aspect ratio %s",
-                     video.i_compression + 1,
-                     video.i_system ? "pal 625 @50" : "ntsc 525 @60",
-                     video.i_ratio ? (video.i_ratio == 3) ? "16:9"
-                                                          : "unknown"
-                                   : "4:3" );
-
-    intf_WarnMsg( 5, "dvd info: display mode %s, %s, %s",
-                     psz_perm_displ[video.i_perm_displ],
-                     video.i_line21_1 ? "line21-1 data in GOP"
-                                      : "no line21-1 data",
-                     video.i_line21_2 ? "line21-2 data in GOP"
-                                      : "no line21-2 data" );
-
-    intf_WarnMsg( 5, "dvd info: source is %s, %sletterboxed, %s mode",
-                     psz_source_res[video.i_source_res],
-                     video.i_letterboxed ? "" : "not ",
-                     video.i_mode ? "film (625/50 only)" : "camera" );
+//X    char*    psz_perm_displ[4] =
+//X             {
+//X                "pan-scan & letterboxed",
+//X                "pan-scan",
+//X                "letterboxed",
+//X                "not specified"
+//X             };
+//X    char*    psz_source_res[4] =
+//X             {
+//X                "720x480 ntsc or 720x576 pal",
+//X                "704x480 ntsc or 704x576 pal",
+//X                "352x480 ntsc or 352x576 pal",
+//X                "352x240 ntsc or 352x288 pal"
+//X             };
+
+//X    intf_WarnMsg( 5, "dvd info: MPEG-%d video, %sHz, aspect ratio %s",
+//X                     video.i_compression + 1,
+//X                     video.i_system ? "pal 625 @50" : "ntsc 525 @60",
+//X                     video.i_ratio ? (video.i_ratio == 3) ? "16:9"
+//X                                                          : "unknown"
+//X                                   : "4:3" );
+
+//X    intf_WarnMsg( 5, "dvd info: display mode %s, %s, %s",
+//X                     psz_perm_displ[video.i_perm_displ],
+//X                     video.i_line21_1 ? "line21-1 data in GOP"
+//X                                      : "no line21-1 data",
+//X                     video.i_line21_2 ? "line21-2 data in GOP"
+//X                                      : "no line21-2 data" );
+
+//X    intf_WarnMsg( 5, "dvd info: source is %s, %sletterboxed, %s mode",
+//X                     psz_source_res[video.i_source_res],
+//X                     video.i_letterboxed ? "" : "not ",
+//X                     video.i_mode ? "film (625/50 only)" : "camera" );
 }
 #undef video
 
@@ -129,29 +125,29 @@ void IfoPrintAudio( thread_dvd_data_t * p_dvd, int i )
 {
     if( audio_status.i_available )
     {
-        char* ppsz_mode[7] =
-                { "ac3", "unknown", "mpeg-1", "mpeg-2", "lpcm", "sdds", "dts" };
-        char* ppsz_appl_mode[3] =
-                { "no application specified", "karaoke", "surround sound" };
-        char* ppsz_quant[4] =
-                { "16 bits", "20 bits", "24 bits", "drc" };
+//X        char* ppsz_mode[8] =
+//X            { "AC3", "unknown", "MPEG", "MPEG-2", "LPCM", "SDDS", "DTS", "" };
+//X        char* ppsz_appl_mode[4] =
+//X            { "no application specified", "karaoke", "surround sound", "" };
+//X        char* ppsz_quant[4] =
+//X            { "16 bits", "20 bits", "24 bits", "drc" };
     
-        intf_WarnMsg( 5, "dvd info: audio %d (%s) is %s, "
-                         "%d%s channel%s, %dHz, %s", i,
-                         DecodeLanguage( hton16( audio.i_lang_code ) ),
-                         ppsz_mode[audio.i_coding_mode & 0x7],
-                         audio.i_num_channels + 1,
-                         audio.i_multichannel_extension ? " ext." : "",
-                         audio.i_num_channels ? "s" : "",
-                         audio.i_sample_freq ? 96000 : 48000,
-                         ppsz_appl_mode[audio.i_appl_mode & 0x2] );
-
-        intf_WarnMsg( 5, "dvd info: %s, quantization %s, status %x",
-                         (audio.i_caption == 1) ? "normal caption"
-                           : (audio.i_caption == 3) ? "directors comments"
-                               : "unknown caption",
-                         ppsz_quant[audio.i_quantization & 0x3],
-                         audio_status.i_position );
+//X        intf_WarnMsg( 5, "dvd info: audio %d (%s) is %s, "
+//X                         "%d%s channel%s, %dHz, %s", i,
+//X                         DecodeLanguage( audio.i_lang_code ),
+//X                         ppsz_mode[audio.i_coding_mode & 0x7],
+//X                         audio.i_num_channels + 1,
+//X                         audio.i_multichannel_extension ? " ext." : "",
+//X                         audio.i_num_channels ? "s" : "",
+//X                         audio.i_sample_freq ? 96000 : 48000,
+//X                         ppsz_appl_mode[audio.i_appl_mode & 0x3] );
+
+//X        intf_WarnMsg( 5, "dvd info: %s, quantization %s, status %x",
+//X                         (audio.i_caption == 1) ? "normal caption"
+//X                           : (audio.i_caption == 3) ? "directors comments"
+//X                               : "unknown caption",
+//X                         ppsz_quant[audio.i_quantization & 0x3],
+//X                         audio_status.i_position );
     }
 }
 #undef audio_status
@@ -168,14 +164,14 @@ void IfoPrintSpu( thread_dvd_data_t * p_dvd, int i )
 {
     if( spu_status.i_available )
     {
-        intf_WarnMsg( 5, "dvd info: spu %d (%s), caption %d "
-                         "prefix %x, modes [%s%s%s%s ]", i,
-                         DecodeLanguage( hton16( spu.i_lang_code ) ),
-                         spu.i_caption, spu.i_prefix,
-                         spu_status.i_position_43 ? " 4:3" : "",
-                         spu_status.i_position_wide ? " wide" : "",
-                         spu_status.i_position_letter ? " letter" : "",
-                         spu_status.i_position_pan ? " pan" : "" );
+//X        intf_WarnMsg( 5, "dvd info: spu %d (%s), caption %d "
+//X                         "prefix %x, modes [%s%s%s%s ]", i,
+//X                         DecodeLanguage( spu.i_lang_code ),
+//X                         spu.i_caption, spu.i_prefix,
+//X                         spu_status.i_position_43 ? " 4:3" : "",
+//X                         spu_status.i_position_wide ? " wide" : "",
+//X                         spu_status.i_position_letter ? " letter" : "",
+//X                         spu_status.i_position_pan ? " pan" : "" );
     }
 }
 #undef spu_status