X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_filter%2Ftimeshift.c;h=b01cc1c649e54e8e7e1b661edec8e9a2e57a1ec9;hb=4e9597b800d1140dfab1cf33c3df8c608d58878f;hp=7ef7dcee46d9ddddb1301cfdd93aa90b94ea54e3;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/modules/access_filter/timeshift.c b/modules/access_filter/timeshift.c index 7ef7dcee46..b01cc1c649 100644 --- a/modules/access_filter/timeshift.c +++ b/modules/access_filter/timeshift.c @@ -25,18 +25,25 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include -#include +#include +#include #include #include #include +#include #include +#ifdef WIN32 +# include /* _wgetcwd */ +#endif + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -55,8 +62,8 @@ static void Close( vlc_object_t * ); "access declares that it can control pace or pause." ) vlc_module_begin(); - set_shortname( _("Timeshift") ); - set_description( _("Timeshift") ); + set_shortname( N_("Timeshift") ); + set_description( N_("Timeshift") ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS_FILTER ); set_capability( "access_filter", 0 ); @@ -64,10 +71,11 @@ vlc_module_begin(); set_callbacks( Open, Close ); add_integer( "timeshift-granularity", 50, NULL, GRANULARITY_TEXT, - GRANULARITY_LONGTEXT, VLC_TRUE ); - add_directory( "timeshift-dir", 0, 0, DIR_TEXT, DIR_LONGTEXT, VLC_FALSE ); - add_bool( "timeshift-force", VLC_FALSE, NULL, FORCE_TEXT, FORCE_LONGTEXT, - VLC_FALSE ); + GRANULARITY_LONGTEXT, true ); + add_directory( "timeshift-dir", 0, 0, DIR_TEXT, DIR_LONGTEXT, false ); + change_unsafe(); + add_bool( "timeshift-force", false, NULL, FORCE_TEXT, FORCE_LONGTEXT, + false ); vlc_module_end(); /***************************************************************************** @@ -108,6 +116,8 @@ struct access_sys_t char *psz_filename_base; char *psz_filename; + + int64_t i_data; }; /***************************************************************************** @@ -118,25 +128,24 @@ static int Open( vlc_object_t *p_this ) access_t *p_access = (access_t*)p_this; access_t *p_src = p_access->p_source; access_sys_t *p_sys; - vlc_bool_t b_bool; + bool b_bool; - var_Create( p_access, "timeshift-force", - VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - if( var_GetBool( p_access, "timeshift-force" ) == VLC_TRUE ) + var_Create( p_access, "timeshift-force", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); + if( var_GetBool( p_access, "timeshift-force" ) ) { msg_Dbg( p_access, "Forcing use of timeshift even if access can control pace or pause" ); } else { /* Only work with not pace controled access */ - if( access2_Control( p_src, ACCESS_CAN_CONTROL_PACE, &b_bool ) - || b_bool ) + if( access_Control( p_src, ACCESS_CAN_CONTROL_PACE, &b_bool ) || + b_bool ) { msg_Dbg( p_src, "ACCESS_CAN_CONTROL_PACE: timeshift useless" ); return VLC_EGENERIC; } /* Refuse access that can be paused */ - if( access2_Control( p_src, ACCESS_CAN_PAUSE, &b_bool ) || b_bool ) + if( access_Control( p_src, ACCESS_CAN_PAUSE, &b_bool ) || b_bool ) { msg_Dbg( p_src, "ACCESS_CAN_PAUSE: timeshift useless" ); return VLC_EGENERIC; @@ -153,9 +162,10 @@ static int Open( vlc_object_t *p_this ) p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); /* */ - p_sys->p_fifo = block_FifoNew( p_access ); + p_sys->p_fifo = block_FifoNew(); p_sys->i_write_size = 0; p_sys->i_files = 0; + p_sys->i_data = 0; p_sys->p_read_list = NULL; p_sys->pp_read_last = &p_sys->p_read_list; @@ -174,7 +184,7 @@ static int Open( vlc_object_t *p_this ) p_sys->psz_filename = malloc( strlen( p_sys->psz_filename_base ) + 1000 ); if( vlc_thread_create( p_access, "timeshift thread", Thread, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_LOW, false ) ) { msg_Err( p_access, "cannot spawn timeshift access thread" ); return VLC_EGENERIC; @@ -229,17 +239,31 @@ static void Close( vlc_object_t *p_this ) static block_t *Block( access_t *p_access ) { access_sys_t *p_sys = p_access->p_sys; - block_t *p_block; + access_t *p_src = p_access->p_source; + block_t *p_block = NULL; - if( p_access->b_die ) + /* Update info (we probably ought to be time caching that as well) */ + if( p_src->info.i_update & INPUT_UPDATE_META ) { - p_access->info.b_eof = VLC_TRUE; - return NULL; + p_src->info.i_update &= ~INPUT_UPDATE_META; + p_access->info.i_update |= INPUT_UPDATE_META; } - p_block = block_FifoGet( p_sys->p_fifo ); - //p_access->info.i_size -= p_block->i_buffer; - return p_block; + /* Get data from timeshift fifo */ + if( !p_access->info.b_eof ) + p_block = block_FifoGet( p_sys->p_fifo ); + + if( p_block && !p_block->i_buffer ) /* Used to signal EOF */ + { block_Release( p_block ); p_block = 0; } + + if( p_block ) + { + p_sys->i_data -= p_block->i_buffer; + return p_block; + } + + p_access->info.b_eof = p_src->info.b_eof; + return NULL; } /***************************************************************************** @@ -249,23 +273,14 @@ static void Thread( access_t *p_access ) { access_sys_t *p_sys = p_access->p_sys; access_t *p_src = p_access->p_source; - int i; + block_t *p_block; - while( !p_access->b_die ) + while( vlc_object_alive (p_access) ) { - block_t *p_block; - /* Get a new block from the source */ if( p_src->pf_block ) { p_block = p_src->pf_block( p_src ); - - if( p_block == NULL ) - { - if( p_src->info.b_eof ) break; - msleep( 1000 ); - continue; - } } else { @@ -274,27 +289,29 @@ static void Thread( access_t *p_access ) p_block->i_buffer = p_src->pf_read( p_src, p_block->p_buffer, 2048 ); - if( p_block->i_buffer < 0 ) + if( p_block->i_buffer <= 0 ) { - block_Release( p_block ); - if( p_block->i_buffer == 0 ) break; - msleep( 1000 ); - continue; + block_Release( p_block ); + p_block = NULL; } } + if( p_block == NULL ) + { + if( p_src->info.b_eof ) break; + msleep( 10000 ); + continue; + } + + p_sys->i_data += p_block->i_buffer; + /* Write block */ if( !p_sys->p_write_list && !p_sys->p_read_list && - p_sys->p_fifo->i_size < TIMESHIFT_FIFO_MAX ) + block_FifoSize( p_sys->p_fifo ) < TIMESHIFT_FIFO_MAX ) { /* If there isn't too much timeshifted data, * write directly to FIFO */ block_FifoPut( p_sys->p_fifo, p_block ); - - //p_access->info.i_size += p_block->i_buffer; - //p_access->info.i_update |= INPUT_UPDATE_SIZE; - - /* Nothing else to do */ continue; } @@ -302,25 +319,39 @@ static void Thread( access_t *p_access ) block_Release( p_block ); /* Read from file to fill up the fifo */ - while( p_sys->p_fifo->i_size < TIMESHIFT_FIFO_MIN && - !p_access->b_die ) + while( block_FifoSize( p_sys->p_fifo ) < TIMESHIFT_FIFO_MIN && + vlc_object_alive (p_access) ) { p_block = ReadBlockFromFile( p_access ); if( !p_block ) break; + block_FifoPut( p_sys->p_fifo, p_block ); } } - msg_Dbg( p_access, "timeshift: EOF" ); + msg_Dbg( p_access, "timeshift: no more input data" ); - /* Send dummy packet to avoid deadlock in TShiftBlock */ - for( i = 0; i < 2; i++ ) + while( vlc_object_alive (p_access) && + (p_sys->p_read_list || block_FifoSize( p_sys->p_fifo ) ) ) { - block_t *p_dummy = block_New( p_access, 128 ); - p_dummy->i_flags |= BLOCK_FLAG_DISCONTINUITY; - memset( p_dummy->p_buffer, 0, p_dummy->i_buffer ); - block_FifoPut( p_sys->p_fifo, p_dummy ); + /* Read from file to fill up the fifo */ + while( block_FifoSize( p_sys->p_fifo ) < TIMESHIFT_FIFO_MIN && + vlc_object_alive (p_access) && p_sys->p_read_list ) + { + p_block = ReadBlockFromFile( p_access ); + if( !p_block ) break; + + block_FifoPut( p_sys->p_fifo, p_block ); + } + + msleep( 100000 ); } + + msg_Dbg( p_access, "timeshift: EOF" ); + p_src->info.b_eof = true; + + /* Send dummy packet to avoid deadlock in Block() */ + block_FifoPut( p_sys->p_fifo, block_New( p_access, 0 ) ); } /***************************************************************************** @@ -400,8 +431,8 @@ static int WriteBlockToFile( access_t *p_access, block_t *p_block ) if( !file && p_sys->i_files < 2 ) { /* We just can't work with less than 2 buffer files */ - msg_Err( p_access, "cannot open temporary file '%s' (%s)", - p_sys->psz_filename, strerror(errno) ); + msg_Err( p_access, "cannot open temporary file '%s' (%m)", + p_sys->psz_filename ); return VLC_EGENERIC; } else if( !file ) return VLC_EGENERIC; @@ -493,53 +524,34 @@ static int Seek( access_t *p_access, int64_t i_pos ) *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - access_t *p_src = p_access->p_source; - - vlc_bool_t *pb_bool; + bool *pb_bool; int *pi_int; - int64_t *pi_64; switch( i_query ) { - case ACCESS_CAN_SEEK: - case ACCESS_CAN_FASTSEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; - break; - - case ACCESS_CAN_CONTROL_PACE: /* Not really true */ - case ACCESS_CAN_PAUSE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; - break; - - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; - break; - - case ACCESS_GET_PTS_DELAY: - pi_64 = (int64_t*)va_arg( args, int64_t * ); - return access2_Control( p_src, ACCESS_GET_PTS_DELAY, pi_64 ); - - case ACCESS_SET_PAUSE_STATE: - return VLC_SUCCESS; - - case ACCESS_GET_TITLE_INFO: - case ACCESS_SET_TITLE: - case ACCESS_SET_SEEKPOINT: - case ACCESS_GET_META: - return VLC_EGENERIC; - - case ACCESS_SET_PRIVATE_ID_STATE: - case ACCESS_GET_PRIVATE_ID_STATE: - case ACCESS_SET_PRIVATE_ID_CA: - return access2_vaControl( p_src, i_query, args ); - - default: - msg_Warn( p_access, "unimplemented query in control" ); - return VLC_EGENERIC; - + case ACCESS_CAN_SEEK: + case ACCESS_CAN_FASTSEEK: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; + break; + + case ACCESS_CAN_CONTROL_PACE: /* Not really true */ + case ACCESS_CAN_PAUSE: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; + break; + + case ACCESS_GET_MTU: + pi_int = (int*)va_arg( args, int * ); + *pi_int = 0; + break; + + case ACCESS_SET_PAUSE_STATE: + break; + + /* Forward everything else to the source access */ + default: + return access_vaControl( p_access->p_source, i_query, args ); } return VLC_SUCCESS; } @@ -548,19 +560,13 @@ static int Control( access_t *p_access, int i_query, va_list args ) * GetTmpFilePath: *****************************************************************************/ #ifdef WIN32 -#define getpid() GetCurrentProcessId() +#define getpid() (int)GetCurrentProcessId() #endif static char *GetTmpFilePath( access_t *p_access ) { - char *psz_dir = var_GetString( p_access, "timeshift-dir" ); + char *psz_dir = var_GetNonEmptyString( p_access, "timeshift-dir" ); char *psz_filename_base; - if( ( psz_dir != NULL ) && ( psz_dir[0] == '\0' ) ) - { - free( psz_dir ); - psz_dir = NULL; - } - if( psz_dir == NULL ) { #ifdef WIN32