X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fes_out_timeshift.c;h=aa17e7ad0d4052fbb6d09c4d01d26d061791638c;hb=ac8243334cd14ffcf8f407cb5fbee89d4790d389;hp=0ee51225bf8df6024aa04566d95dfc3c281cd767;hpb=c0f8369c9bed7d38959fe59ea39674696b91ad5a;p=vlc diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c index 0ee51225bf..aa17e7ad0d 100644 --- a/src/input/es_out_timeshift.c +++ b/src/input/es_out_timeshift.c @@ -30,7 +30,6 @@ #include #include -#include #include #if defined (WIN32) && !defined (UNDER_CE) # include @@ -40,8 +39,10 @@ #endif #include -#include - +#include +#ifdef WIN32 +# include +#endif #include #include #include @@ -53,6 +54,13 @@ * Local prototypes *****************************************************************************/ +/* XXX attribute_packed is (and MUST be) used ONLY to reduce memory usage */ +#ifdef HAVE_ATTRIBUTE_PACKED +# define attribute_packed __attribute__((__packed__)) +#else +# define attribute_packed +#endif + enum { C_ADD, @@ -61,39 +69,78 @@ enum C_CONTROL, }; -typedef struct +typedef struct attribute_packed { es_out_id_t *p_es; es_format_t *p_fmt; } ts_cmd_add_t; -typedef struct +typedef struct attribute_packed { es_out_id_t *p_es; } ts_cmd_del_t; -typedef struct +typedef struct attribute_packed { es_out_id_t *p_es; block_t *p_block; + int i_offset; /* We do not use file > INT_MAX */ } ts_cmd_send_t; -typedef struct +typedef struct attribute_packed { int i_query; - bool b_bool; - int i_int; - int64_t i_i64; - vlc_meta_t *p_meta; - vlc_epg_t *p_epg; - es_out_id_t *p_es; - es_format_t *p_fmt; + union + { + bool b_bool; + int i_int; + int64_t i_i64; + es_out_id_t *p_es; + struct + { + int i_int; + int64_t i_i64; + } int_i64; + struct + { + int i_int; + vlc_meta_t *p_meta; + } int_meta; + struct + { + int i_int; + vlc_epg_t *p_epg; + } int_epg; + struct + { + es_out_id_t *p_es; + bool b_bool; + } es_bool; + struct + { + es_out_id_t *p_es; + es_format_t *p_fmt; + } es_fmt; + struct + { + /* FIXME Really too big (double make the whole thing too big) */ + double f_position; + mtime_t i_time; + mtime_t i_length; + } times; + struct + { + mtime_t i_pts_delay; + mtime_t i_pts_jitter; + int i_cr_average; + } jitter; + } u; } ts_cmd_control_t; -typedef struct +typedef struct attribute_packed { - int i_type; + int8_t i_type; mtime_t i_date; union { @@ -101,9 +148,28 @@ typedef struct ts_cmd_del_t del; ts_cmd_send_t send; ts_cmd_control_t control; - }; + } u; } ts_cmd_t; +typedef struct ts_storage_t ts_storage_t; +struct ts_storage_t +{ + ts_storage_t *p_next; + + /* */ + char *psz_file; /* Filename */ + size_t i_file_max; /* Max size in bytes */ + int64_t i_file_size;/* Current size in bytes */ + FILE *p_filew; /* FILE handle for data writing */ + FILE *p_filer; /* FILE handle for data reading */ + + /* */ + int i_cmd_r; + int i_cmd_w; + int i_cmd_max; + ts_cmd_t *p_cmd; +}; + typedef struct { VLC_COMMON_MEMBERS @@ -111,6 +177,8 @@ typedef struct /* */ input_thread_t *p_input; es_out_t *p_out; + int64_t i_tmp_size_max; + const char *psz_tmp_path; /* Lock for all following fields */ vlc_mutex_t lock; @@ -130,8 +198,9 @@ typedef struct mtime_t i_buffering_delay; /* */ - int i_cmd; - ts_cmd_t **pp_cmd; + ts_storage_t *p_storage_r; + ts_storage_t *p_storage_w; + mtime_t i_cmd_delay; } ts_thread_t; @@ -178,8 +247,8 @@ static int TsStart( es_out_t * ); static void TsAutoStop( es_out_t * ); static void TsStop( ts_thread_t * ); -static void TsPushCmd( ts_thread_t *, const ts_cmd_t * ); -static int TsPopCmdLocked( ts_thread_t *, ts_cmd_t * ); +static void TsPushCmd( ts_thread_t *, ts_cmd_t * ); +static int TsPopCmdLocked( ts_thread_t *, ts_cmd_t *, bool b_flush ); static bool TsHasCmd( ts_thread_t * ); static bool TsIsUnused( ts_thread_t * ); static int TsChangePause( ts_thread_t *, bool b_source_paused, bool b_paused, mtime_t i_date ); @@ -187,6 +256,14 @@ static int TsChangeRate( ts_thread_t *, int i_src_rate, int i_rate ); static void *TsRun( vlc_object_t * ); +static ts_storage_t *TsStorageNew( const char *psz_path, int64_t i_tmp_size_max ); +static void TsStorageDelete( ts_storage_t * ); +static void TsStoragePack( ts_storage_t *p_storage ); +static bool TsStorageIsFull( ts_storage_t *, const ts_cmd_t *p_cmd ); +static bool TsStorageIsEmpty( ts_storage_t * ); +static void TsStoragePushCmd( ts_storage_t *, const ts_cmd_t *p_cmd, bool b_flush ); +static void TsStoragePopCmd( ts_storage_t *p_storage, ts_cmd_t *p_cmd, bool b_flush ); + static void CmdClean( ts_cmd_t * ); static void cmd_cleanup_routine( void *p ) { CmdClean( p ); } @@ -208,7 +285,7 @@ static int CmdExecuteControl( es_out_t *, ts_cmd_t * ); /* File helpers */ static char *GetTmpPath( char *psz_path ); -static FILE *GetTmpFile( const char *psz_path ); +static FILE *GetTmpFile( char **ppsz_file, const char *psz_path ); /***************************************************************************** * input_EsOutTimeshiftNew: @@ -233,7 +310,6 @@ es_out_t *input_EsOutTimeshiftNew( input_thread_t *p_input, es_out_t *p_next_out p_out->pf_control = Control; p_out->pf_destroy = Destroy; p_out->p_sys = p_sys; - p_out->b_sout = p_input->p->p_sout != NULL; /* */ p_sys->b_input_paused = false; @@ -250,12 +326,28 @@ es_out_t *input_EsOutTimeshiftNew( input_thread_t *p_input, es_out_t *p_next_out TAB_INIT( p_sys->i_es, p_sys->pp_es ); - /* TODO config - * timeshift-granularity - * timeshift-path - */ - p_sys->i_tmp_size_max = 50 * 1024*1024; - p_sys->psz_tmp_path = GetTmpPath( NULL ); + /* */ + const int i_tmp_size_max = var_CreateGetInteger( p_input, "input-timeshift-granularity" ); + if( i_tmp_size_max < 0 ) + p_sys->i_tmp_size_max = 50*1024*1024; + else + p_sys->i_tmp_size_max = __MAX( i_tmp_size_max, 1*1024*1024 ); + msg_Dbg( p_input, "using timeshift granularity of %d MiB", + (int)p_sys->i_tmp_size_max/(1024*1024) ); + + char *psz_tmp_path = var_CreateGetNonEmptyString( p_input, "input-timeshift-path" ); + p_sys->psz_tmp_path = GetTmpPath( psz_tmp_path ); + msg_Dbg( p_input, "using timeshift path '%s'", p_sys->psz_tmp_path ); + +#if 0 +#define S(t) msg_Err( p_input, "SIZEOF("#t")=%d", sizeof(t) ) + S(ts_cmd_t); + S(ts_cmd_control_t); + S(ts_cmd_send_t); + S(ts_cmd_del_t); + S(ts_cmd_add_t); +#undef S +#endif return p_out; } @@ -371,7 +463,7 @@ static int ControlLockedGetWakeup( es_out_t *p_out, mtime_t *pi_wakeup ) if( p_sys->b_delayed ) { - assert( !p_sys->p_input->b_can_pace_control ); + assert( !p_sys->p_input->p->b_can_pace_control ); *pi_wakeup = 0; } else @@ -404,7 +496,7 @@ static int ControlLockedSetPauseState( es_out_t *p_out, bool b_source_paused, bo else { i_ret = VLC_EGENERIC; - if( !p_sys->p_input->b_can_pace_control ) + if( !p_sys->p_input->p->b_can_pace_control ) { if( !p_sys->b_delayed ) TsStart( p_out ); @@ -439,7 +531,7 @@ static int ControlLockedSetRate( es_out_t *p_out, int i_src_rate, int i_rate ) else { i_ret = VLC_EGENERIC; - if( !p_sys->p_input->b_can_pace_control ) + if( !p_sys->p_input->p->b_can_pace_control ) { if( !p_sys->b_delayed ) TsStart( p_out ); @@ -491,17 +583,13 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args ) case ES_OUT_SET_ES_BY_ID: case ES_OUT_RESTART_ES_BY_ID: case ES_OUT_SET_ES_DEFAULT_BY_ID: + case ES_OUT_GET_ES_OBJECTS_BY_ID: case ES_OUT_SET_DELAY: case ES_OUT_SET_RECORD_STATE: assert(0); return VLC_EGENERIC; - /* TODO ? or to remove ? */ - case ES_OUT_GET_TS: - return VLC_EGENERIC; - /* Pass-through control */ - case ES_OUT_SET_ACTIVE: case ES_OUT_SET_MODE: case ES_OUT_SET_GROUP: case ES_OUT_SET_PCR: @@ -510,12 +598,16 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args ) case ES_OUT_SET_NEXT_DISPLAY_TIME: case ES_OUT_SET_GROUP_META: case ES_OUT_SET_GROUP_EPG: + case ES_OUT_SET_ES_SCRAMBLED_STATE: case ES_OUT_DEL_GROUP: + case ES_OUT_SET_META: case ES_OUT_SET_ES: case ES_OUT_RESTART_ES: case ES_OUT_SET_ES_DEFAULT: case ES_OUT_SET_ES_STATE: case ES_OUT_SET_ES_FMT: + case ES_OUT_SET_TIMES: + case ES_OUT_SET_JITTER: { ts_cmd_t cmd; if( CmdInitControl( &cmd, i_query, args, p_sys->b_delayed ) ) @@ -539,7 +631,7 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args ) *pb_enabled = true; return VLC_SUCCESS; } - return es_out_Control( p_sys->p_out, ES_OUT_GET_ES_STATE, p_es, pb_enabled ); + return es_out_Control( p_sys->p_out, ES_OUT_GET_ES_STATE, p_es->p_es, pb_enabled ); } /* Special internal input control */ @@ -583,7 +675,25 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args ) { return ControlLockedSetFrameNext( p_out ); } + case ES_OUT_GET_PCR_SYSTEM: + { + if( p_sys->b_delayed ) + return VLC_EGENERIC; + mtime_t *pi_system = (mtime_t*)va_arg( args, mtime_t * ); + mtime_t *pi_delay = (mtime_t*)va_arg( args, mtime_t * ); + return es_out_ControlGetPcrSystem( p_sys->p_out, pi_system, pi_delay ); + } + case ES_OUT_MODIFY_PCR_SYSTEM: + { + const bool b_absolute = va_arg( args, int ); + const mtime_t i_system = va_arg( args, mtime_t ); + + if( b_absolute && p_sys->b_delayed ) + return VLC_EGENERIC; + + return es_out_ControlModifyPcrSystem( p_sys->p_out, b_absolute, i_system ); + } default: msg_Err( p_sys->p_input, "Unknown es_out_Control query !" ); assert(0); @@ -628,6 +738,8 @@ static int TsStart( es_out_t *p_out ) if( !p_ts ) return VLC_EGENERIC; + p_ts->i_tmp_size_max = p_sys->i_tmp_size_max; + p_ts->psz_tmp_path = p_sys->psz_tmp_path; p_ts->p_input = p_sys->p_input; p_ts->p_out = p_sys->p_out; vlc_mutex_init( &p_ts->lock ); @@ -640,13 +752,14 @@ static int TsStart( es_out_t *p_out ) p_ts->i_rate_delay = 0; p_ts->i_buffering_delay = 0; p_ts->i_cmd_delay = 0; - TAB_INIT( p_ts->i_cmd, p_ts->pp_cmd ); + p_ts->p_storage_r = NULL; + p_ts->p_storage_w = NULL; vlc_object_set_destructor( p_ts, TsDestructor ); p_sys->b_delayed = true; if( vlc_thread_create( p_ts, "es out timeshift", - TsRun, VLC_THREAD_PRIORITY_INPUT, false ) ) + TsRun, VLC_THREAD_PRIORITY_INPUT ) ) { msg_Err( p_sys->p_input, "cannot create input thread" ); @@ -680,43 +793,72 @@ static void TsStop( ts_thread_t *p_ts ) { ts_cmd_t cmd; - if( TsPopCmdLocked( p_ts, &cmd ) ) + if( TsPopCmdLocked( p_ts, &cmd, true ) ) break; CmdClean( &cmd ); } + assert( !p_ts->p_storage_r || !p_ts->p_storage_r->p_next ); + if( p_ts->p_storage_r ) + TsStorageDelete( p_ts->p_storage_r ); vlc_mutex_unlock( &p_ts->lock ); - TAB_CLEAN( p_ts->i_cmd, p_ts->pp_cmd ); vlc_object_release( p_ts ); } -static void TsPushCmd( ts_thread_t *p_ts, const ts_cmd_t *p_cmd ) +static void TsPushCmd( ts_thread_t *p_ts, ts_cmd_t *p_cmd ) { - ts_cmd_t *p_dup = malloc( sizeof(*p_dup) ); + vlc_mutex_lock( &p_ts->lock ); - if( p_dup ) + if( !p_ts->p_storage_w || TsStorageIsFull( p_ts->p_storage_w, p_cmd ) ) { - *p_dup = *p_cmd; + ts_storage_t *p_storage = TsStorageNew( p_ts->psz_tmp_path, p_ts->i_tmp_size_max ); - vlc_mutex_lock( &p_ts->lock ); - - TAB_APPEND( p_ts->i_cmd, p_ts->pp_cmd, p_dup ); - vlc_cond_signal( &p_ts->wait ); + if( !p_storage ) + { + CmdClean( p_cmd ); + vlc_mutex_unlock( &p_ts->lock ); + /* TODO warn the user (but only once) */ + return; + } - vlc_mutex_unlock( &p_ts->lock ); + if( !p_ts->p_storage_w ) + { + p_ts->p_storage_r = p_ts->p_storage_w = p_storage; + } + else + { + TsStoragePack( p_ts->p_storage_w ); + p_ts->p_storage_w->p_next = p_storage; + p_ts->p_storage_w = p_storage; + } } + + /* TODO return error and warn the user (but only once) */ + TsStoragePushCmd( p_ts->p_storage_w, p_cmd, p_ts->p_storage_r == p_ts->p_storage_w ); + + vlc_cond_signal( &p_ts->wait ); + + vlc_mutex_unlock( &p_ts->lock ); } -static int TsPopCmdLocked( ts_thread_t *p_ts, ts_cmd_t *p_cmd ) +static int TsPopCmdLocked( ts_thread_t *p_ts, ts_cmd_t *p_cmd, bool b_flush ) { vlc_assert_locked( &p_ts->lock ); - if( p_ts->i_cmd <= 0 ) + if( TsStorageIsEmpty( p_ts->p_storage_r ) ) return VLC_EGENERIC; - *p_cmd = *p_ts->pp_cmd[0]; + TsStoragePopCmd( p_ts->p_storage_r, p_cmd, b_flush ); + + while( p_ts->p_storage_r && TsStorageIsEmpty( p_ts->p_storage_r ) ) + { + ts_storage_t *p_next = p_ts->p_storage_r->p_next; + if( !p_next ) + break; + + TsStorageDelete( p_ts->p_storage_r ); + p_ts->p_storage_r = p_next; + } - free( p_ts->pp_cmd[0] ); - TAB_REMOVE( p_ts->i_cmd, p_ts->pp_cmd, p_ts->pp_cmd[0] ); return VLC_SUCCESS; } static bool TsHasCmd( ts_thread_t *p_ts ) @@ -724,7 +866,7 @@ static bool TsHasCmd( ts_thread_t *p_ts ) bool b_cmd; vlc_mutex_lock( &p_ts->lock ); - b_cmd = p_ts->i_cmd > 0; + b_cmd = TsStorageIsEmpty( p_ts->p_storage_r ); vlc_mutex_unlock( &p_ts->lock ); return b_cmd; @@ -736,7 +878,7 @@ static bool TsIsUnused( ts_thread_t *p_ts ) vlc_mutex_lock( &p_ts->lock ); b_unused = !p_ts->b_paused && p_ts->i_rate == p_ts->i_rate_source && - p_ts->i_cmd <= 0; + TsStorageIsEmpty( p_ts->p_storage_r ); vlc_mutex_unlock( &p_ts->lock ); return b_unused; @@ -810,10 +952,13 @@ static void *TsRun( vlc_object_t *p_thread ) { const int canc = vlc_savecancel(); b_buffering = es_out_GetBuffering( p_ts->p_out ); - vlc_restorecancel( canc ); - if( ( !p_ts->b_paused || b_buffering ) && !TsPopCmdLocked( p_ts, &cmd ) ) + if( ( !p_ts->b_paused || b_buffering ) && !TsPopCmdLocked( p_ts, &cmd, false ) ) + { + vlc_restorecancel( canc ); break; + } + vlc_restorecancel( canc ); vlc_cond_wait( &p_ts->wait, &p_ts->lock ); } @@ -906,6 +1051,160 @@ static void *TsRun( vlc_object_t *p_thread ) return NULL; } +/***************************************************************************** + * + *****************************************************************************/ +static ts_storage_t *TsStorageNew( const char *psz_tmp_path, int64_t i_tmp_size_max ) +{ + ts_storage_t *p_storage = calloc( 1, sizeof(ts_storage_t) ); + if( !p_storage ) + return NULL; + + /* */ + p_storage->p_next = NULL; + + /* */ + p_storage->i_file_max = i_tmp_size_max; + p_storage->i_file_size = 0; + p_storage->p_filew = GetTmpFile( &p_storage->psz_file, psz_tmp_path ); + if( p_storage->psz_file ) + p_storage->p_filer = vlc_fopen( p_storage->psz_file, "rb" ); + + /* */ + p_storage->i_cmd_w = 0; + p_storage->i_cmd_r = 0; + p_storage->i_cmd_max = 30000; + p_storage->p_cmd = malloc( p_storage->i_cmd_max * sizeof(*p_storage->p_cmd) ); + //fprintf( stderr, "\nSTORAGE name=%s size=%d KiB\n", p_storage->psz_file, p_storage->i_cmd_max * sizeof(*p_storage->p_cmd) /1024 ); + + if( !p_storage->p_cmd || !p_storage->p_filew || !p_storage->p_filer ) + { + TsStorageDelete( p_storage ); + return NULL; + } + return p_storage; +} +static void TsStorageDelete( ts_storage_t *p_storage ) +{ + while( p_storage->i_cmd_r < p_storage->i_cmd_w ) + { + ts_cmd_t cmd; + + TsStoragePopCmd( p_storage, &cmd, true ); + + CmdClean( &cmd ); + } + free( p_storage->p_cmd ); + + if( p_storage->p_filer ) + fclose( p_storage->p_filer ); + if( p_storage->p_filew ) + fclose( p_storage->p_filew ); + + if( p_storage->psz_file ) + { + vlc_unlink( p_storage->psz_file ); + free( p_storage->psz_file ); + } + + free( p_storage ); +} +static void TsStoragePack( ts_storage_t *p_storage ) +{ + /* Try to release a bit of memory */ + if( p_storage->i_cmd_w >= p_storage->i_cmd_max ) + return; + + p_storage->i_cmd_max = __MAX( p_storage->i_cmd_w, 1 ); + + ts_cmd_t *p_new = realloc( p_storage->p_cmd, p_storage->i_cmd_max * sizeof(*p_storage->p_cmd) ); + if( p_new ) + p_storage->p_cmd = p_new; +} +static bool TsStorageIsFull( ts_storage_t *p_storage, const ts_cmd_t *p_cmd ) +{ + if( p_cmd && p_cmd->i_type == C_SEND && p_storage->i_cmd_w > 0 ) + { + size_t i_size = sizeof(*p_cmd->u.send.p_block) + p_cmd->u.send.p_block->i_buffer; + + if( p_storage->i_file_size + i_size >= p_storage->i_file_max ) + return true; + } + return p_storage->i_cmd_w >= p_storage->i_cmd_max; +} +static bool TsStorageIsEmpty( ts_storage_t *p_storage ) +{ + return !p_storage || p_storage->i_cmd_r >= p_storage->i_cmd_w; +} +static void TsStoragePushCmd( ts_storage_t *p_storage, const ts_cmd_t *p_cmd, bool b_flush ) +{ + ts_cmd_t cmd = *p_cmd; + + assert( !TsStorageIsFull( p_storage, p_cmd ) ); + + if( cmd.i_type == C_SEND ) + { + block_t *p_block = cmd.u.send.p_block; + + cmd.u.send.p_block = NULL; + cmd.u.send.i_offset = ftell( p_storage->p_filew ); + + if( fwrite( p_block, sizeof(*p_block), 1, p_storage->p_filew ) != 1 ) + { + block_Release( p_block ); + return; + } + p_storage->i_file_size += sizeof(*p_block); + if( p_block->i_buffer > 0 ) + { + if( fwrite( p_block->p_buffer, p_block->i_buffer, 1, p_storage->p_filew ) != 1 ) + { + block_Release( p_block ); + return; + } + } + p_storage->i_file_size += p_block->i_buffer; + block_Release( p_block ); + + if( b_flush ) + fflush( p_storage->p_filew ); + } + p_storage->p_cmd[p_storage->i_cmd_w++] = cmd; +} +static void TsStoragePopCmd( ts_storage_t *p_storage, ts_cmd_t *p_cmd, bool b_flush ) +{ + assert( !TsStorageIsEmpty( p_storage ) ); + + *p_cmd = p_storage->p_cmd[p_storage->i_cmd_r++]; + if( p_cmd->i_type == C_SEND ) + { + block_t block; + + if( !b_flush && + !fseek( p_storage->p_filer, p_cmd->u.send.i_offset, SEEK_SET ) && + fread( &block, sizeof(block), 1, p_storage->p_filer ) == 1 ) + { + block_t *p_block = block_Alloc( block.i_buffer ); + if( p_block ) + { + p_block->i_dts = block.i_dts; + p_block->i_pts = block.i_pts; + p_block->i_flags = block.i_flags; + p_block->i_length = block.i_length; + p_block->i_rate = block.i_rate; + p_block->i_nb_samples = block.i_nb_samples; + p_block->i_buffer = fread( p_block->p_buffer, 1, block.i_buffer, p_storage->p_filer ); + } + p_cmd->u.send.p_block = p_block; + } + else + { + //fprintf( stderr, "TsStoragePopCmd: %m\n" ); + p_cmd->u.send.p_block = block_Alloc( 1 ); + } + } +} + /***************************************************************************** * *****************************************************************************/ @@ -934,150 +1233,152 @@ static int CmdInitAdd( ts_cmd_t *p_cmd, es_out_id_t *p_es, const es_format_t *p_ { p_cmd->i_type = C_ADD; p_cmd->i_date = mdate(); - p_cmd->add.p_es = p_es; + p_cmd->u.add.p_es = p_es; if( b_copy ) { - p_cmd->add.p_fmt = malloc( sizeof(*p_fmt) ); - if( !p_cmd->add.p_fmt ) + p_cmd->u.add.p_fmt = malloc( sizeof(*p_fmt) ); + if( !p_cmd->u.add.p_fmt ) return VLC_EGENERIC; - es_format_Copy( p_cmd->add.p_fmt, p_fmt ); + es_format_Copy( p_cmd->u.add.p_fmt, p_fmt ); } else { - p_cmd->add.p_fmt = (es_format_t*)p_fmt; + p_cmd->u.add.p_fmt = (es_format_t*)p_fmt; } return VLC_SUCCESS; } static void CmdExecuteAdd( es_out_t *p_out, ts_cmd_t *p_cmd ) { - p_cmd->add.p_es->p_es = es_out_Add( p_out, p_cmd->add.p_fmt ); + p_cmd->u.add.p_es->p_es = es_out_Add( p_out, p_cmd->u.add.p_fmt ); } static void CmdCleanAdd( ts_cmd_t *p_cmd ) { - es_format_Clean( p_cmd->add.p_fmt ); - free( p_cmd->add.p_fmt ); + es_format_Clean( p_cmd->u.add.p_fmt ); + free( p_cmd->u.add.p_fmt ); } static void CmdInitSend( ts_cmd_t *p_cmd, es_out_id_t *p_es, block_t *p_block ) { p_cmd->i_type = C_SEND; p_cmd->i_date = mdate(); - p_cmd->send.p_es = p_es; - p_cmd->send.p_block = p_block; + p_cmd->u.send.p_es = p_es; + p_cmd->u.send.p_block = p_block; } static int CmdExecuteSend( es_out_t *p_out, ts_cmd_t *p_cmd ) { - block_t *p_block = p_cmd->send.p_block; + block_t *p_block = p_cmd->u.send.p_block; - p_cmd->send.p_block = NULL; + p_cmd->u.send.p_block = NULL; if( p_block ) { - if( p_cmd->send.p_es->p_es ) - return es_out_Send( p_out, p_cmd->send.p_es->p_es, p_block ); + if( p_cmd->u.send.p_es->p_es ) + return es_out_Send( p_out, p_cmd->u.send.p_es->p_es, p_block ); block_Release( p_block ); } return VLC_EGENERIC; } static void CmdCleanSend( ts_cmd_t *p_cmd ) { - if( p_cmd->send.p_block ) - block_Release( p_cmd->send.p_block ); + if( p_cmd->u.send.p_block ) + block_Release( p_cmd->u.send.p_block ); } static int CmdInitDel( ts_cmd_t *p_cmd, es_out_id_t *p_es ) { p_cmd->i_type = C_DEL; p_cmd->i_date = mdate(); - p_cmd->del.p_es = p_es; + p_cmd->u.del.p_es = p_es; return VLC_SUCCESS; } static void CmdExecuteDel( es_out_t *p_out, ts_cmd_t *p_cmd ) { - if( p_cmd->del.p_es->p_es ) - es_out_Del( p_out, p_cmd->del.p_es->p_es ); - free( p_cmd->del.p_es ); + if( p_cmd->u.del.p_es->p_es ) + es_out_Del( p_out, p_cmd->u.del.p_es->p_es ); + free( p_cmd->u.del.p_es ); } static int CmdInitControl( ts_cmd_t *p_cmd, int i_query, va_list args, bool b_copy ) { p_cmd->i_type = C_CONTROL; p_cmd->i_date = mdate(); - p_cmd->control.i_query = i_query; - p_cmd->control.p_meta = NULL; - p_cmd->control.p_epg = NULL; - p_cmd->control.p_fmt = NULL; + p_cmd->u.control.i_query = i_query; switch( i_query ) { /* Pass-through control */ - case ES_OUT_SET_ACTIVE: /* arg1= bool */ - p_cmd->control.b_bool = (bool)va_arg( args, int ); - break; - case ES_OUT_SET_MODE: /* arg1= int */ case ES_OUT_SET_GROUP: /* arg1= int */ case ES_OUT_DEL_GROUP: /* arg1=int i_group */ - p_cmd->control.i_int = (int)va_arg( args, int ); + p_cmd->u.control.u.i_int = (int)va_arg( args, int ); break; case ES_OUT_SET_PCR: /* arg1=int64_t i_pcr(microsecond!) (using default group 0)*/ case ES_OUT_SET_NEXT_DISPLAY_TIME: /* arg1=int64_t i_pts(microsecond) */ - p_cmd->control.i_i64 = (int64_t)va_arg( args, int64_t ); + p_cmd->u.control.u.i_i64 = (int64_t)va_arg( args, int64_t ); break; case ES_OUT_SET_GROUP_PCR: /* arg1= int i_group, arg2=int64_t i_pcr(microsecond!)*/ - p_cmd->control.i_int = (int)va_arg( args, int ); - p_cmd->control.i_i64 = (int64_t)va_arg( args, int64_t ); + p_cmd->u.control.u.int_i64.i_int = (int)va_arg( args, int ); + p_cmd->u.control.u.int_i64.i_i64 = (int64_t)va_arg( args, int64_t ); + break; + + case ES_OUT_SET_ES_SCRAMBLED_STATE: + p_cmd->u.control.u.es_bool.p_es = (es_out_id_t*)va_arg( args, es_out_id_t * ); + p_cmd->u.control.u.es_bool.b_bool = (bool)va_arg( args, int ); break; case ES_OUT_RESET_PCR: /* no arg */ break; - case ES_OUT_SET_GROUP_META: /* arg1=int i_group arg2=vlc_meta_t* */ + case ES_OUT_SET_META: /* arg1=const vlc_meta_t* */ + case ES_OUT_SET_GROUP_META: /* arg1=int i_group arg2=const vlc_meta_t* */ { - p_cmd->control.i_int = (int)va_arg( args, int ); - vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t * ); + if( i_query == ES_OUT_SET_GROUP_META ) + p_cmd->u.control.u.int_meta.i_int = (int)va_arg( args, int ); + const vlc_meta_t *p_meta = va_arg( args, const vlc_meta_t * ); if( b_copy ) { - p_cmd->control.p_meta = vlc_meta_New(); - if( !p_cmd->control.p_meta ) + p_cmd->u.control.u.int_meta.p_meta = vlc_meta_New(); + if( !p_cmd->u.control.u.int_meta.p_meta ) return VLC_EGENERIC; - vlc_meta_Merge( p_cmd->control.p_meta, p_meta ); + vlc_meta_Merge( p_cmd->u.control.u.int_meta.p_meta, p_meta ); } else { - p_cmd->control.p_meta = p_meta; + /* The cast is only needed to avoid warning */ + p_cmd->u.control.u.int_meta.p_meta = (vlc_meta_t*)p_meta; } break; } - case ES_OUT_SET_GROUP_EPG: /* arg1=int i_group arg2=vlc_epg_t* */ + case ES_OUT_SET_GROUP_EPG: /* arg1=int i_group arg2=const vlc_epg_t* */ { - p_cmd->control.i_int = (int)va_arg( args, int ); - vlc_epg_t *p_epg = (vlc_epg_t*)va_arg( args, vlc_epg_t * ); + p_cmd->u.control.u.int_epg.i_int = (int)va_arg( args, int ); + const vlc_epg_t *p_epg = va_arg( args, const vlc_epg_t * ); if( b_copy ) { - p_cmd->control.p_epg = vlc_epg_New( p_epg->psz_name ); - if( !p_cmd->control.p_epg ) + p_cmd->u.control.u.int_epg.p_epg = vlc_epg_New( p_epg->psz_name ); + if( !p_cmd->u.control.u.int_epg.p_epg ) return VLC_EGENERIC; for( int i = 0; i < p_epg->i_event; i++ ) { vlc_epg_event_t *p_evt = p_epg->pp_event[i]; - vlc_epg_AddEvent( p_cmd->control.p_epg, + vlc_epg_AddEvent( p_cmd->u.control.u.int_epg.p_epg, p_evt->i_start, p_evt->i_duration, p_evt->psz_name, p_evt->psz_short_description, p_evt->psz_description ); } - vlc_epg_SetCurrent( p_cmd->control.p_epg, + vlc_epg_SetCurrent( p_cmd->u.control.u.int_epg.p_epg, p_epg->p_current ? p_epg->p_current->i_start : -1 ); } else { - p_cmd->control.p_epg = p_epg; + /* The cast is only needed to avoid warning */ + p_cmd->u.control.u.int_epg.p_epg = (vlc_epg_t*)p_epg; } break; } @@ -1086,32 +1387,54 @@ static int CmdInitControl( ts_cmd_t *p_cmd, int i_query, va_list args, bool b_co case ES_OUT_SET_ES: /* arg1= es_out_id_t* */ case ES_OUT_RESTART_ES: /* arg1= es_out_id_t* */ case ES_OUT_SET_ES_DEFAULT: /* arg1= es_out_id_t* */ - p_cmd->control.p_es = (es_out_id_t*)va_arg( args, es_out_id_t * ); + p_cmd->u.control.u.p_es = (es_out_id_t*)va_arg( args, es_out_id_t * ); break; case ES_OUT_SET_ES_STATE:/* arg1= es_out_id_t* arg2=bool */ - p_cmd->control.p_es = (es_out_id_t*)va_arg( args, es_out_id_t * ); - p_cmd->control.b_bool = (bool)va_arg( args, int ); + p_cmd->u.control.u.es_bool.p_es = (es_out_id_t*)va_arg( args, es_out_id_t * ); + p_cmd->u.control.u.es_bool.b_bool = (bool)va_arg( args, int ); break; case ES_OUT_SET_ES_FMT: /* arg1= es_out_id_t* arg2=es_format_t* */ { - p_cmd->control.p_es = (es_out_id_t*)va_arg( args, es_out_id_t * ); + p_cmd->u.control.u.es_fmt.p_es = (es_out_id_t*)va_arg( args, es_out_id_t * ); es_format_t *p_fmt = (es_format_t*)va_arg( args, es_format_t * ); if( b_copy ) { - p_cmd->control.p_fmt = malloc( sizeof(*p_fmt) ); - if( !p_cmd->control.p_fmt ) + p_cmd->u.control.u.es_fmt.p_fmt = malloc( sizeof(*p_fmt) ); + if( !p_cmd->u.control.u.es_fmt.p_fmt ) return VLC_EGENERIC; - es_format_Copy( p_cmd->control.p_fmt, p_fmt ); + es_format_Copy( p_cmd->u.control.u.es_fmt.p_fmt, p_fmt ); } else { - p_cmd->control.p_fmt = p_fmt; + p_cmd->u.control.u.es_fmt.p_fmt = p_fmt; } break; } + case ES_OUT_SET_TIMES: + { + double f_position = (double)va_arg( args, double ); + mtime_t i_time = (mtime_t)va_arg( args, mtime_t ); + mtime_t i_length = (mtime_t)va_arg( args, mtime_t ); + + p_cmd->u.control.u.times.f_position = f_position; + p_cmd->u.control.u.times.i_time = i_time; + p_cmd->u.control.u.times.i_length = i_length; + break; + } + case ES_OUT_SET_JITTER: + { + mtime_t i_pts_delay = (mtime_t)va_arg( args, mtime_t ); + mtime_t i_pts_jitter = (mtime_t)va_arg( args, mtime_t ); + int i_cr_average = (int)va_arg( args, int ); + + p_cmd->u.control.u.jitter.i_pts_delay = i_pts_delay; + p_cmd->u.control.u.jitter.i_pts_jitter = i_pts_jitter; + p_cmd->u.control.u.jitter.i_cr_average = i_cr_average; + break; + } default: assert(0); @@ -1122,46 +1445,64 @@ static int CmdInitControl( ts_cmd_t *p_cmd, int i_query, va_list args, bool b_co } static int CmdExecuteControl( es_out_t *p_out, ts_cmd_t *p_cmd ) { - const int i_query = p_cmd->control.i_query; + const int i_query = p_cmd->u.control.i_query; switch( i_query ) { /* Pass-through control */ - case ES_OUT_SET_ACTIVE: /* arg1= bool */ - return es_out_Control( p_out, i_query, p_cmd->control.b_bool ); - case ES_OUT_SET_MODE: /* arg1= int */ case ES_OUT_SET_GROUP: /* arg1= int */ case ES_OUT_DEL_GROUP: /* arg1=int i_group */ - return es_out_Control( p_out, i_query, p_cmd->control.i_int ); + return es_out_Control( p_out, i_query, p_cmd->u.control.u.i_int ); case ES_OUT_SET_PCR: /* arg1=int64_t i_pcr(microsecond!) (using default group 0)*/ case ES_OUT_SET_NEXT_DISPLAY_TIME: /* arg1=int64_t i_pts(microsecond) */ - return es_out_Control( p_out, i_query, p_cmd->control.i_i64 ); + return es_out_Control( p_out, i_query, p_cmd->u.control.u.i_i64 ); case ES_OUT_SET_GROUP_PCR: /* arg1= int i_group, arg2=int64_t i_pcr(microsecond!)*/ - return es_out_Control( p_out, i_query, p_cmd->control.i_int, p_cmd->control.i_i64 ); + return es_out_Control( p_out, i_query, p_cmd->u.control.u.int_i64.i_int, + p_cmd->u.control.u.int_i64.i_i64 ); case ES_OUT_RESET_PCR: /* no arg */ return es_out_Control( p_out, i_query ); - case ES_OUT_SET_GROUP_META: /* arg1=int i_group arg2=vlc_meta_t* */ - return es_out_Control( p_out, i_query, p_cmd->control.i_int, p_cmd->control.p_meta ); + case ES_OUT_SET_GROUP_META: /* arg1=int i_group arg2=const vlc_meta_t* */ + return es_out_Control( p_out, i_query, p_cmd->u.control.u.int_meta.i_int, + p_cmd->u.control.u.int_meta.p_meta ); + + case ES_OUT_SET_GROUP_EPG: /* arg1=int i_group arg2=const vlc_epg_t* */ + return es_out_Control( p_out, i_query, p_cmd->u.control.u.int_epg.i_int, + p_cmd->u.control.u.int_epg.p_epg ); + + case ES_OUT_SET_ES_SCRAMBLED_STATE: /* arg1=int es_out_id_t* arg2=bool */ + return es_out_Control( p_out, i_query, p_cmd->u.control.u.es_bool.p_es->p_es, + p_cmd->u.control.u.es_bool.b_bool ); - case ES_OUT_SET_GROUP_EPG: /* arg1=int i_group arg2=vlc_epg_t* */ - return es_out_Control( p_out, i_query, p_cmd->control.i_int, p_cmd->control.p_epg ); + case ES_OUT_SET_META: /* arg1=const vlc_meta_t* */ + return es_out_Control( p_out, i_query, p_cmd->u.control.u.int_meta.p_meta ); /* Modified control */ case ES_OUT_SET_ES: /* arg1= es_out_id_t* */ case ES_OUT_RESTART_ES: /* arg1= es_out_id_t* */ case ES_OUT_SET_ES_DEFAULT: /* arg1= es_out_id_t* */ - return es_out_Control( p_out, i_query, p_cmd->control.p_es->p_es ); + return es_out_Control( p_out, i_query, p_cmd->u.control.u.p_es->p_es ); case ES_OUT_SET_ES_STATE:/* arg1= es_out_id_t* arg2=bool */ - return es_out_Control( p_out, i_query, p_cmd->control.p_es->p_es, p_cmd->control.b_bool ); + return es_out_Control( p_out, i_query, p_cmd->u.control.u.es_bool.p_es->p_es, + p_cmd->u.control.u.es_bool.b_bool ); case ES_OUT_SET_ES_FMT: /* arg1= es_out_id_t* arg2=es_format_t* */ - return es_out_Control( p_out, i_query, p_cmd->control.p_es->p_es, p_cmd->control.p_fmt ); + return es_out_Control( p_out, i_query, p_cmd->u.control.u.es_fmt.p_es->p_es, + p_cmd->u.control.u.es_fmt.p_fmt ); + + case ES_OUT_SET_TIMES: + return es_out_Control( p_out, i_query, p_cmd->u.control.u.times.f_position, + p_cmd->u.control.u.times.i_time, + p_cmd->u.control.u.times.i_length ); + case ES_OUT_SET_JITTER: + return es_out_Control( p_out, i_query, p_cmd->u.control.u.jitter.i_pts_delay, + p_cmd->u.control.u.jitter.i_pts_jitter, + p_cmd->u.control.u.jitter.i_cr_average ); default: assert(0); @@ -1170,14 +1511,22 @@ static int CmdExecuteControl( es_out_t *p_out, ts_cmd_t *p_cmd ) } static void CmdCleanControl( ts_cmd_t *p_cmd ) { - if( p_cmd->control.p_meta ) - vlc_meta_Delete( p_cmd->control.p_meta ); - if( p_cmd->control.p_epg ) - vlc_epg_Delete( p_cmd->control.p_epg ); - if( p_cmd->control.p_fmt ) + if( ( p_cmd->u.control.i_query == ES_OUT_SET_GROUP_META || + p_cmd->u.control.i_query == ES_OUT_SET_META ) && + p_cmd->u.control.u.int_meta.p_meta ) + { + vlc_meta_Delete( p_cmd->u.control.u.int_meta.p_meta ); + } + else if( p_cmd->u.control.i_query == ES_OUT_SET_GROUP_EPG && + p_cmd->u.control.u.int_epg.p_epg ) + { + vlc_epg_Delete( p_cmd->u.control.u.int_epg.p_epg ); + } + else if( p_cmd->u.control.i_query == ES_OUT_SET_ES_FMT && + p_cmd->u.control.u.es_fmt.p_fmt ) { - es_format_Clean( p_cmd->control.p_fmt ); - free( p_cmd->control.p_fmt ); + es_format_Clean( p_cmd->u.control.u.es_fmt.p_fmt ); + free( p_cmd->u.control.u.es_fmt.p_fmt ); } } @@ -1191,9 +1540,9 @@ static char *GetTmpPath( char *psz_path ) { /* Make sure that the path exists and is a directory */ struct stat s; - const int i_ret = utf8_stat( psz_path, &s ); + const int i_ret = vlc_stat( psz_path, &s ); - if( i_ret < 0 && !utf8_mkdir( psz_path, 0600 ) ) + if( i_ret < 0 && !vlc_mkdir( psz_path, 0600 ) ) return psz_path; else if( i_ret == 0 && ( s.st_mode & S_IFDIR ) ) return psz_path; @@ -1236,25 +1585,26 @@ static char *GetTmpPath( char *psz_path ) return psz_path; } -static FILE *GetTmpFile( const char *psz_path ) +static FILE *GetTmpFile( char **ppsz_file, const char *psz_path ) { char *psz_name; int fd; FILE *f; /* */ + *ppsz_file = NULL; if( asprintf( &psz_name, "%s/vlc-timeshift.XXXXXX", psz_path ) < 0 ) return NULL; /* */ - fd = mkstemp( psz_name ); - free( psz_name ); + fd = vlc_mkstemp( psz_name ); + *ppsz_file = psz_name; if( fd < 0 ) return NULL; /* */ - f = fdopen( fd, "rw+" ); + f = fdopen( fd, "w+b" ); if( !f ) close( fd );