Commit de409e6f authored by Rocky Bernstein's avatar Rocky Bernstein

Reorganize more analogous to dvdplay. Should give some growing room to

start the custom demuxer.
parent 2a335dff
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
* using libcdio, libvcd and libvcdinfo. vlc-specific things tend * using libcdio, libvcd and libvcdinfo. vlc-specific things tend
* to go here. * to go here.
***************************************************************************** *****************************************************************************
* Copyright (C) 2000 VideoLAN * Copyright (C) 2000,2003 VideoLAN
* $Id: access.c,v 1.2 2003/11/07 10:31:38 rocky Exp $ * $Id: access.c,v 1.3 2003/11/20 03:56:22 rocky Exp $
* *
* Authors: Johan Bilien <jobi@via.ecp.fr> * Authors: Rocky Bernstein <rocky@panix.com>
* Rocky Bernstein <rocky@panix.com> * Johan Bilien <jobi@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
#if 0 // Disabled until this is working
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/input.h> #include <vlc/input.h>
#include <vlc_interface.h>
#include "../../demux/mpeg/system.h" #include "../../demux/mpeg/system.h"
#include "vcd.h" #include "vcd.h"
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "vcdplayer.h" #include "vcdplayer.h"
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/cd_types.h>
#include <cdio/logging.h> #include <cdio/logging.h>
#include <cdio/util.h> #include <cdio/util.h>
#include <libvcd/info.h> #include <libvcd/info.h>
...@@ -54,9 +55,6 @@ ...@@ -54,9 +55,6 @@
*****************************************************************************/ *****************************************************************************/
/* First those which are accessed from outside (via pointers). */ /* First those which are accessed from outside (via pointers). */
static int VCDOpen ( vlc_object_t * );
static void VCDClose ( vlc_object_t * );
static int VCDRead ( input_thread_t *, byte_t *, size_t );
static int VCDRead ( input_thread_t *, byte_t *, size_t ); static int VCDRead ( input_thread_t *, byte_t *, size_t );
static int VCDSetProgram ( input_thread_t *, pgrm_descriptor_t * ); static int VCDSetProgram ( input_thread_t *, pgrm_descriptor_t * );
...@@ -79,32 +77,17 @@ static void VCDUpdateVar( input_thread_t *p_input, int i_entry, int i_action, ...@@ -79,32 +77,17 @@ static void VCDUpdateVar( input_thread_t *p_input, int i_entry, int i_action,
static vcdinfo_obj_t *vcd_Open ( vlc_object_t *p_this, const char *psz_dev ); static vcdinfo_obj_t *vcd_Open ( vlc_object_t *p_this, const char *psz_dev );
static int debug_callback ( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val,
void *p_data );
#define DEBUG_TEXT N_("set debug mask for additional debugging.")
#define DEBUG_LONGTEXT N_( \
"This integer when viewed in binary is a debugging mask\n" \
"MRL 1\n" \
"external call 2\n" \
"all calls 4\n" \
"LSN 8\n" \
"PBC (10) 16\n" \
"libcdio (20) 32\n" \
"seeks (40) 64\n" \
"still (80) 128\n" \
"vcdinfo (100) 256\n" )
/**************************************************************************** /****************************************************************************
* Private functions * Private functions
****************************************************************************/ ****************************************************************************/
/* FIXME: This variable is a hack. Would be nice to eliminate the /* FIXME: This variable is a hack. Would be nice to eliminate the
global-ness. */ global-ness. */
static input_thread_t *p_vcd_input = NULL; static input_thread_t *p_vcd_input = NULL;
int int
vcd_debug_callback ( vlc_object_t *p_this, const char *psz_name, E_(DebugCallback) ( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val, void *p_data ) vlc_value_t oldval, vlc_value_t val, void *p_data )
{ {
thread_vcd_data_t *p_vcd; thread_vcd_data_t *p_vcd;
...@@ -186,14 +169,14 @@ vcd_log_handler (vcd_log_level_t level, const char message[]) ...@@ -186,14 +169,14 @@ vcd_log_handler (vcd_log_level_t level, const char message[])
On success we return VLC_SUCCESS, on memory exhausted VLC_ENOMEM, On success we return VLC_SUCCESS, on memory exhausted VLC_ENOMEM,
and VLC_EGENERIC for some other error. and VLC_EGENERIC for some other error.
*****************************************************************************/ *****************************************************************************/
static int int
VCDOpen( vlc_object_t *p_this ) E_(VCDOpen) ( vlc_object_t *p_this )
{ {
input_thread_t * p_input = (input_thread_t *)p_this; input_thread_t * p_input = (input_thread_t *)p_this;
thread_vcd_data_t * p_vcd; thread_vcd_data_t * p_vcd;
char * psz_source; char * psz_source;
vcdinfo_itemid_t itemid; vcdinfo_itemid_t itemid;
bool play_ok; bool b_play_ok;
p_input->pf_read = VCDRead; p_input->pf_read = VCDRead;
p_input->pf_seek = VCDSeek; p_input->pf_seek = VCDSeek;
...@@ -290,11 +273,11 @@ VCDOpen( vlc_object_t *p_this ) ...@@ -290,11 +273,11 @@ VCDOpen( vlc_object_t *p_this )
msg_Warn( p_input, "could not read entry LIDs" ); msg_Warn( p_input, "could not read entry LIDs" );
} }
play_ok = (VLC_SUCCESS == VCDPlay( p_input, itemid )); b_play_ok = (VLC_SUCCESS == VCDPlay( p_input, itemid ));
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
if ( ! play_ok ) { if ( ! b_play_ok ) {
vcdinfo_close( p_vcd->vcd ); vcdinfo_close( p_vcd->vcd );
free( p_vcd ); free( p_vcd );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -309,14 +292,18 @@ VCDOpen( vlc_object_t *p_this ) ...@@ -309,14 +292,18 @@ VCDOpen( vlc_object_t *p_this )
#endif #endif
} }
p_vcd->p_intf = intf_Create( p_input, "vcdx" );
p_vcd->p_intf->b_block = VLC_FALSE;
intf_RunThread( p_vcd->p_intf );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/***************************************************************************** /*****************************************************************************
* VCDClose: closes VCD releasing allocated memory. * VCDClose: closes VCD releasing allocated memory.
*****************************************************************************/ *****************************************************************************/
static void void
VCDClose( vlc_object_t *p_this ) E_(VCDClose) ( vlc_object_t *p_this )
{ {
input_thread_t * p_input = (input_thread_t *)p_this; input_thread_t * p_input = (input_thread_t *)p_this;
thread_vcd_data_t *p_vcd = (thread_vcd_data_t *)p_input->p_access_data; thread_vcd_data_t *p_vcd = (thread_vcd_data_t *)p_input->p_access_data;
...@@ -326,7 +313,18 @@ VCDClose( vlc_object_t *p_this ) ...@@ -326,7 +313,18 @@ VCDClose( vlc_object_t *p_this )
free( p_vcd->p_entries ); free( p_vcd->p_entries );
free( p_vcd->p_segments ); free( p_vcd->p_segments );
/* For reasons that are a mystery to me we don't have to deal with
stopping, and destroying the p_vcd->p_intf thread. And if we do
it causes problems upstream.
*/
if( p_vcd->p_intf != NULL )
{
p_vcd->p_intf = NULL;
}
free( p_vcd ); free( p_vcd );
p_input->p_access_data = NULL;
p_vcd_input = NULL; p_vcd_input = NULL;
} }
...@@ -347,6 +345,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) ...@@ -347,6 +345,8 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
i_read = 0; i_read = 0;
dbg_print( (INPUT_DBG_CALL), "lsn: %u", p_vcd->cur_lsn );
/* Compute the number of blocks we have to read */ /* Compute the number of blocks we have to read */
i_blocks = i_len / M2F2_SECTOR_SIZE; i_blocks = i_len / M2F2_SECTOR_SIZE;
...@@ -371,14 +371,32 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) ...@@ -371,14 +371,32 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
case READ_ERROR: case READ_ERROR:
/* Some sort of error. */ /* Some sort of error. */
return i_read; return i_read;
case READ_STILL_FRAME: case READ_STILL_FRAME:
{ {
/* Reached the end of a still frame. */
byte_t * p_buf = p_buffer; byte_t * p_buf = p_buffer;
pgrm_descriptor_t * p_pgrm = p_input->stream.p_selected_program;;
p_buf += (i_index*M2F2_SECTOR_SIZE); p_buf += (i_index*M2F2_SECTOR_SIZE);
memset(p_buf, 0, M2F2_SECTOR_SIZE); memset(p_buf, 0, M2F2_SECTOR_SIZE);
p_buf += 2; p_buf += 2;
*p_buf = 0x01; *p_buf = 0x01;
dbg_print(INPUT_DBG_STILL, "Handled still event\n"); dbg_print(INPUT_DBG_STILL, "Handled still event\n");
/* p_vcd->p_intf->b_end_of_cell = true; */
input_SetStatus( p_input, INPUT_STATUS_PAUSE );
vlc_mutex_lock( &p_input->stream.stream_lock );
p_pgrm = p_input->stream.p_selected_program;
p_pgrm->i_synchro_state = SYNCHRO_REINIT;
vlc_mutex_unlock( &p_input->stream.stream_lock );
input_ClockManageControl( p_input, p_pgrm, 0 );
return i_read + M2F2_SECTOR_SIZE; return i_read + M2F2_SECTOR_SIZE;
} }
default: default:
...@@ -474,8 +492,10 @@ VCDSetArea( input_thread_t * p_input, input_area_t * p_area ) ...@@ -474,8 +492,10 @@ VCDSetArea( input_thread_t * p_input, input_area_t * p_area )
unsigned int i_nb = p_area->i_plugin_data + p_area->i_part_nb; unsigned int i_nb = p_area->i_plugin_data + p_area->i_part_nb;
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT), dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT),
"track: %d, entry %d, seekable %d", "track: %d, entry %d, seekable %d, area %lx, select area %lx ",
i_track, i_entry, old_seekable ); i_track, i_entry, old_seekable,
(long unsigned int) p_area,
(long unsigned int) p_input->stream.p_selected_area );
/* we can't use the interface slider until initilization is complete */ /* we can't use the interface slider until initilization is complete */
p_input->stream.b_seekable = 0; p_input->stream.b_seekable = 0;
...@@ -578,6 +598,9 @@ VCDPlay( input_thread_t *p_input, vcdinfo_itemid_t itemid ) ...@@ -578,6 +598,9 @@ VCDPlay( input_thread_t *p_input, vcdinfo_itemid_t itemid )
p_vcd->in_still = 0; p_vcd->in_still = 0;
dbg_print(INPUT_DBG_CALL, "itemid.num: %d, itemid.type: %d\n",
itemid.num, itemid.type);
#define area p_input->stream.pp_areas #define area p_input->stream.pp_areas
switch (itemid.type) { switch (itemid.type) {
...@@ -791,8 +814,9 @@ VCDSegments( input_thread_t * p_input ) ...@@ -791,8 +814,9 @@ VCDSegments( input_thread_t * p_input )
area[0]->i_part_nb = 0; area[0]->i_part_nb = 0;
dbg_print( INPUT_DBG_MRL, "area id %d, for segment track %d", dbg_print( INPUT_DBG_MRL,
area[0]->i_id, 0 ); "area[0] id: %d, i_start: %lld, i_size: %lld",
area[0]->i_id, area[0]->i_start, area[0]->i_size );
if (num_segments == 0) return 0; if (num_segments == 0) return 0;
...@@ -977,14 +1001,27 @@ VCDParse( input_thread_t * p_input, /*out*/ vcdinfo_itemid_t * p_itemid ) ...@@ -977,14 +1001,27 @@ VCDParse( input_thread_t * p_input, /*out*/ vcdinfo_itemid_t * p_itemid )
} }
if( !*psz_source ) if( !*psz_source ) {
{
if( !p_input->psz_access ) /* No source specified, so figure it out. */
{ if( !p_input->psz_access ) return NULL;
psz_source = config_GetPsz( p_input, MODULE_STRING "-device" );
if( !psz_source ) {
/* Scan for a CD with a VCD in it. */
char **cd_drives = cdio_get_devices_with_cap(NULL,
(CDIO_FS_ANAL_SVCD|CDIO_FS_ANAL_CVD
|CDIO_FS_ANAL_VIDEOCD|CDIO_FS_UNKNOWN),
true);
if (NULL == cd_drives) return NULL;
if (cd_drives[0] == NULL) {
cdio_free_device_list(cd_drives);
return NULL; return NULL;
} }
psz_source = config_GetPsz( p_input, "vcd" ); psz_source = strdup(cd_drives[0]);
if( !psz_source ) return NULL; cdio_free_device_list(cd_drives);
}
} }
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_MRL), dbg_print( (INPUT_DBG_CALL|INPUT_DBG_MRL),
...@@ -1089,4 +1126,3 @@ VCDUpdateVar( input_thread_t *p_input, int i_num, int i_action, ...@@ -1089,4 +1126,3 @@ VCDUpdateVar( input_thread_t *p_input, int i_num, int i_action,
} }
var_Change( p_input, varname, i_action, &val, NULL ); var_Change( p_input, varname, i_action, &val, NULL );
} }
#endif
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment