X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdv.c;h=d0d962eaaf944c5d6e110288704a97fec1f5cb69;hb=b3cb03feaa065b38f2b05219dc38fb78bd3d68cf;hp=50f68ed462ece0b95bc328c5d8b9240eab50cab1;hpb=b587e9ff10d0102686a6c7a6ff38afbc58cacff8;p=vlc diff --git a/modules/access/dv.c b/modules/access/dv.c index 50f68ed462..d0d962eaaf 100644 --- a/modules/access/dv.c +++ b/modules/access/dv.c @@ -18,17 +18,20 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include +#include +#include -#include -#include #include #ifdef HAVE_SYS_TYPES_H # include @@ -67,16 +70,16 @@ static int Control( access_t *, int, va_list ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for file streams. This " \ - "value should be set in millisecond units." ) + "Caching value for DV streams. This" \ + "value should be set in milliseconds." ) vlc_module_begin(); set_description( _("Digital Video (Firewire/ieee1394) input") ); set_shortname( _("dv") ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); - add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - set_capability( "access2", 0 ); + add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); + set_capability( "access", 0 ); add_shortcut( "dv" ); add_shortcut( "dv1394" ); add_shortcut( "raw1394" ); @@ -142,17 +145,9 @@ static int Open( vlc_object_t *p_this ) msg_Dbg( p_access, "opening device %s", psz_name ); /* Set up p_access */ - p_access->pf_read = NULL; - p_access->pf_block = Block; - p_access->pf_control = Control; - p_access->pf_seek = NULL; - p_access->info.i_update = 0; - p_access->info.i_size = 0; - p_access->info.i_pos = 0; - p_access->info.b_eof = VLC_FALSE; - p_access->info.b_prebuffered = VLC_FALSE; - p_access->info.i_title = 0; - p_access->info.i_seekpoint = 0; + access_InitFields( p_access ); + ACCESS_SET_CALLBACKS( NULL, Block, Control, NULL ); + p_access->info.b_prebuffered = false; p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); if( !p_sys ) @@ -169,8 +164,9 @@ static int Open( vlc_object_t *p_this ) p_sys->p_raw1394 = NULL; p_sys->p_avc1394 = NULL; p_sys->p_frame = NULL; + p_sys->p_ev = NULL; - vlc_mutex_init( p_access, &p_sys->lock ); + vlc_mutex_init( &p_sys->lock ); p_sys->i_node = DiscoverAVC( p_access, &p_sys->i_port, p_sys->i_guid ); if( p_sys->i_node < 0 ) @@ -229,12 +225,20 @@ static int Open( vlc_object_t *p_this ) /* Now create our event thread catcher */ p_sys->p_ev = vlc_object_create( p_access, sizeof( event_thread_t ) ); + if( !p_sys->p_ev ) + { + msg_Err( p_access, "failed to create event thread for %s", psz_name ); + Close( p_this ); + free( psz_name ); + return VLC_EGENERIC; + } + p_sys->p_ev->p_frame = NULL; p_sys->p_ev->pp_last = &p_sys->p_ev->p_frame; p_sys->p_ev->p_access = p_access; - vlc_mutex_init( p_access, &p_sys->p_ev->lock ); + vlc_mutex_init( &p_sys->p_ev->lock ); vlc_thread_create( p_sys->p_ev, "dv event thread handler", Raw1394EventThread, - VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ); + VLC_THREAD_PRIORITY_OUTPUT, false ); free( psz_name ); return VLC_SUCCESS; @@ -251,7 +255,7 @@ static void Close( vlc_object_t *p_this ) if( p_sys->p_ev ) { /* stop the event handler */ - p_sys->p_ev->b_die = VLC_TRUE; + vlc_object_kill( p_sys->p_ev ); if( p_sys->p_raw1394 ) raw1394_stop_iso_rcv( p_sys->p_raw1394, p_sys->i_channel ); @@ -268,7 +272,7 @@ static void Close( vlc_object_t *p_this ) p_sys->p_ev->pp_last = &p_sys->p_frame; vlc_mutex_unlock( &p_sys->p_ev->lock ); } - vlc_object_destroy( p_sys->p_ev ); + vlc_object_release( p_sys->p_ev ); } if( p_sys->p_frame ) @@ -288,22 +292,22 @@ static void Close( vlc_object_t *p_this ) static int Control( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; - vlc_bool_t *pb_bool; + bool *pb_bool; int64_t *pi_64; switch( i_query ) { /* */ - case ACCESS_CAN_SEEK: - case ACCESS_CAN_FASTSEEK: case ACCESS_CAN_PAUSE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; - case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_FALSE; + case ACCESS_CAN_SEEK: + case ACCESS_CAN_FASTSEEK: + case ACCESS_CAN_CONTROL_PACE: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; break; case ACCESS_GET_PTS_DELAY: @@ -320,6 +324,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_SET_TITLE: case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: @@ -335,8 +340,13 @@ static block_t *Block( access_t *p_access ) access_sys_t *p_sys = p_access->p_sys; block_t *p_block = NULL; -// if( !p_access->psz_demux ) -// p_access->psz_demux = strdup( "rawdv" ); +#if 0 + if( !p_access->psz_demux ) + { + free( p_access->psz_demux ); + p_access->psz_demux = strdup( "rawdv" ); + } +#endif vlc_mutex_lock( &p_sys->lock ); p_block = p_sys->p_frame; @@ -470,13 +480,13 @@ static int Raw1394GetNumPorts( access_t *p_access ) /* get a raw1394 handle */ if ( !( handle = raw1394_new_handle() ) ) { - msg_Err( p_access, "raw1394 - failed to get handle: %s.\n", strerror( errno ) ); + msg_Err( p_access, "raw1394 - failed to get handle: %m." ); return VLC_EGENERIC; } if ( ( n_ports = raw1394_get_port_info( handle, pinf, 16 ) ) < 0 ) { - msg_Err( p_access, "raw1394 - failed to get port info: %s.\n", strerror( errno ) ); + msg_Err( p_access, "raw1394 - failed to get port info: %m.\n" ); raw1394_destroy_handle( handle ); return VLC_EGENERIC; } @@ -502,13 +512,13 @@ static raw1394handle_t Raw1394Open( access_t *p_access, int port ) if ( !handle ) { - msg_Err( p_access, "raw1394 - failed to get handle: %s.\n", strerror( errno ) ); + msg_Err( p_access, "raw1394 - failed to get handle: %m." ); return NULL; } if ( ( n_ports = raw1394_get_port_info( handle, pinf, 16 ) ) < 0 ) { - msg_Err( p_access, "raw1394 - failed to get port info: %s.\n", strerror( errno ) ); + msg_Err( p_access, "raw1394 - failed to get port info: %m." ); raw1394_destroy_handle( handle ); return NULL; } @@ -516,7 +526,7 @@ static raw1394handle_t Raw1394Open( access_t *p_access, int port ) /* tell raw1394 which host adapter to use */ if ( raw1394_set_port( handle, port ) < 0 ) { - msg_Err( p_access, "raw1394 - failed to set set port: %s.\n", strerror( errno ) ); + msg_Err( p_access, "raw1394 - failed to set set port: %m." ); return NULL; }