X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=3511ccb6f3a1bb8f657fc17f335d94ae101f0468;hb=d5a04763bde647b3a59ac18898dc06d12bc52491;hp=8de929c3aef52d6824d45574a36f6171e2e0eedb;hpb=a76c04610bb31cd895cbd43bc1f93e871772c043;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 8de929c3ae..3511ccb6f3 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -65,6 +65,7 @@ static int InitThread ( vout_thread_t * ); static void RunThread ( vout_thread_t * ); static void ErrorThread ( vout_thread_t * ); +static void CleanThread ( vout_thread_t * ); static void EndThread ( vout_thread_t * ); static void AspectRatio ( int, int *, int * ); @@ -124,13 +125,11 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, { if( !p_fmt ) { - /* Reattach video output to the instance before bailing out */ + /* Video output is no longer used. + * TODO: support for reusing video outputs with proper _thread-safe_ + * reference handling. */ if( p_vout ) - { - spu_Attach( p_vout->p_spu, p_this, false ); - vlc_object_detach( p_vout ); - vlc_object_attach( p_vout, p_this->p_libvlc ); - } + vout_CloseAndRelease( p_vout ); return NULL; } @@ -139,24 +138,8 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, { vlc_object_yield( p_vout ); } - else - { - p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_CHILD ); - if( !p_vout ) - { - p_vout = vlc_object_find( p_this->p_libvlc, - VLC_OBJECT_VOUT, FIND_CHILD ); - /* only first children of p_input for unused vout */ - if( p_vout && p_vout->p_parent != VLC_OBJECT(p_this->p_libvlc) ) - { - vlc_object_release( p_vout ); - p_vout = NULL; - } - if( p_vout ) - vlc_object_detach( p_vout ); /* Remove it from the GC */ - } - } + /* TODO: find a suitable unused video output */ /* If we now have a video output, check it has the right properties */ if( p_vout ) @@ -196,7 +179,7 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, p_vout->b_filter_change ) { /* We are not interested in this format, close this vout */ - vlc_object_release( p_vout ); + vout_CloseAndRelease( p_vout ); vlc_object_release( p_vout ); p_vout = NULL; } @@ -277,9 +260,9 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) p_vout->render.i_chroma = i_chroma; p_vout->render.i_aspect = i_aspect; - p_vout->render.i_rmask = 0; - p_vout->render.i_gmask = 0; - p_vout->render.i_bmask = 0; + p_vout->render.i_rmask = p_fmt->i_rmask; + p_vout->render.i_gmask = p_fmt->i_gmask; + p_vout->render.i_bmask = p_fmt->i_bmask; p_vout->render.i_last_used_pic = -1; p_vout->render.b_allow_modify_pics = 1; @@ -394,6 +377,8 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) if( p_vout->p_module == NULL ) { msg_Err( p_vout, "no suitable vout module" ); + // FIXME it's ugly but that's exactly the function that need to be called. + EndThread( p_vout ); vlc_object_detach( p_vout ); vlc_object_release( p_vout ); return NULL; @@ -456,30 +441,44 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) if( p_vout->b_error ) { msg_Err( p_vout, "video output creation failed" ); - - /* Make sure the thread is destroyed and data released */ - vlc_object_release( p_vout ); + vout_CloseAndRelease( p_vout ); return NULL; } return p_vout; } +/***************************************************************************** + * vout_Close: Close a vout created by vout_Create. + ***************************************************************************** + * You HAVE to call it on vout created by vout_Create before vlc_object_release. + * You should NEVER call it on vout not obtained though vout_Create + * (like with vout_Request or vlc_object_find.) + * You can use vout_CloseAndRelease() as a convenient method. + *****************************************************************************/ +void vout_Close( vout_thread_t *p_vout ) +{ + assert( p_vout ); + + vlc_object_kill( p_vout ); + vlc_thread_join( p_vout ); + module_Unneed( p_vout, p_vout->p_module ); + p_vout->p_module = NULL; +} + +/* */ static void vout_Destructor( vlc_object_t * p_this ) { vout_thread_t *p_vout = (vout_thread_t *)p_this; + /* Make sure the vout was stopped first */ + assert( !p_vout->p_module ); + /* Destroy the locks */ vlc_mutex_destroy( &p_vout->picture_lock ); vlc_mutex_destroy( &p_vout->change_lock ); vlc_mutex_destroy( &p_vout->vfilter_lock ); - /* Release the module */ - if( p_vout->p_module ) - { - module_Unneed( p_vout, p_vout->p_module ); - } - free( p_vout->psz_filter_chain ); config_ChainDestroy( p_vout->p_cfg ); @@ -511,6 +510,7 @@ static void vout_Destructor( vlc_object_t * p_this ) *****************************************************************************/ static int ChromaCreate( vout_thread_t *p_vout ); static void ChromaDestroy( vout_thread_t *p_vout ); +static void DropPicture( vout_thread_t *p_vout, picture_t *p_picture ); static int InitThread( vout_thread_t *p_vout ) { @@ -601,6 +601,13 @@ static int InitThread( vout_thread_t *p_vout ) p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den ); /* Calculate shifts from system-updated masks */ + MaskToShift( &p_vout->render.i_lrshift, &p_vout->output.i_rrshift, + p_vout->render.i_rmask ); + MaskToShift( &p_vout->render.i_lgshift, &p_vout->output.i_rgshift, + p_vout->render.i_gmask ); + MaskToShift( &p_vout->render.i_lbshift, &p_vout->output.i_rbshift, + p_vout->render.i_bmask ); + MaskToShift( &p_vout->output.i_lrshift, &p_vout->output.i_rrshift, p_vout->output.i_rmask ); MaskToShift( &p_vout->output.i_lgshift, &p_vout->output.i_rgshift, @@ -724,6 +731,7 @@ static void RunThread( vout_thread_t *p_vout) if( p_vout->b_error ) { + EndThread( p_vout ); vlc_mutex_unlock( &p_vout->change_lock ); return; } @@ -737,7 +745,7 @@ static void RunThread( vout_thread_t *p_vout) * Main loop - it is not executed if an error occurred during * initialization */ - while( (vlc_object_alive( p_vout )) && (!p_vout->b_error) ) + while( vlc_object_alive( p_vout ) && !p_vout->b_error ) { /* Initialize loop variables */ p_picture = NULL; @@ -745,24 +753,24 @@ static void RunThread( vout_thread_t *p_vout) current_date = mdate(); i_loops++; - if( !p_input ) - { - p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, - FIND_PARENT ); - } - if( p_input ) - { - vlc_mutex_lock( &p_input->p->counters.counters_lock ); - stats_UpdateInteger( p_vout, p_input->p->counters.p_lost_pictures, - i_lost , NULL); - stats_UpdateInteger( p_vout, - p_input->p->counters.p_displayed_pictures, - i_displayed , NULL); - i_displayed = i_lost = 0; - vlc_mutex_unlock( &p_input->p->counters.counters_lock ); - vlc_object_release( p_input ); - p_input = NULL; - } + if( !p_input ) + { + p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, + FIND_PARENT ); + } + if( p_input ) + { + vlc_mutex_lock( &p_input->p->counters.counters_lock ); + stats_UpdateInteger( p_vout, p_input->p->counters.p_lost_pictures, + i_lost , NULL); + stats_UpdateInteger( p_vout, + p_input->p->counters.p_displayed_pictures, + i_displayed , NULL); + i_displayed = i_lost = 0; + vlc_mutex_unlock( &p_input->p->counters.counters_lock ); + vlc_object_release( p_input ); + p_input = NULL; + } #if 0 p_vout->c_loops++; if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) ) @@ -809,17 +817,7 @@ static void RunThread( vout_thread_t *p_vout) /* If we found better than the last picture, destroy it */ if( p_last_picture && p_picture != p_last_picture ) { - vlc_mutex_lock( &p_vout->picture_lock ); - if( p_last_picture->i_refcount ) - { - p_last_picture->i_status = DISPLAYED_PICTURE; - } - else - { - p_last_picture->i_status = DESTROYED_PICTURE; - p_vout->i_heap_size--; - } - vlc_mutex_unlock( &p_vout->picture_lock ); + DropPicture( p_vout, p_last_picture ); p_last_picture = NULL; } @@ -834,24 +832,10 @@ static void RunThread( vout_thread_t *p_vout) { /* Picture is late: it will be destroyed and the thread * will directly choose the next picture */ - vlc_mutex_lock( &p_vout->picture_lock ); - if( p_picture->i_refcount ) - { - /* Pretend we displayed the picture, but don't destroy - * it since the decoder might still need it. */ - p_picture->i_status = DISPLAYED_PICTURE; - } - else - { - /* Destroy the picture without displaying it */ - p_picture->i_status = DESTROYED_PICTURE; - p_vout->i_heap_size--; - } + DropPicture( p_vout, p_picture ); + i_lost++; msg_Warn( p_vout, "late picture skipped (%"PRId64")", current_date - display_date ); - i_lost++; - vlc_mutex_unlock( &p_vout->picture_lock ); - continue; } @@ -859,25 +843,11 @@ static void RunThread( vout_thread_t *p_vout) current_date + p_vout->i_pts_delay + VOUT_BOGUS_DELAY ) { /* Picture is waaay too early: it will be destroyed */ - vlc_mutex_lock( &p_vout->picture_lock ); - if( p_picture->i_refcount ) - { - /* Pretend we displayed the picture, but don't destroy - * it since the decoder might still need it. */ - p_picture->i_status = DISPLAYED_PICTURE; - } - else - { - /* Destroy the picture without displaying it */ - p_picture->i_status = DESTROYED_PICTURE; - p_vout->i_heap_size--; - } + DropPicture( p_vout, p_picture ); i_lost++; msg_Warn( p_vout, "vout warning: early picture skipped " "(%"PRId64")", display_date - current_date - p_vout->i_pts_delay ); - vlc_mutex_unlock( &p_vout->picture_lock ); - continue; } @@ -1035,6 +1005,7 @@ static void RunThread( vout_thread_t *p_vout) * causes the immediate end of the main while() loop. */ // FIXME pf_end p_vout->b_error = 1; + break; } if( p_vout->i_changes & VOUT_SIZE_CHANGE ) @@ -1047,11 +1018,19 @@ static void RunThread( vout_thread_t *p_vout) p_vout->i_changes &= ~VOUT_SIZE_CHANGE; + assert( !p_vout->b_direct ); + + ChromaDestroy( p_vout ); + + vlc_mutex_lock( &p_vout->picture_lock ); + p_vout->pf_end( p_vout ); + for( i = 0; i < I_OUTPUTPICTURES; i++ ) p_vout->p_picture[ i ].i_status = FREE_PICTURE; I_OUTPUTPICTURES = 0; + if( p_vout->pf_init( p_vout ) ) { msg_Err( p_vout, "cannot resize display" ); @@ -1059,19 +1038,19 @@ static void RunThread( vout_thread_t *p_vout) p_vout->b_error = 1; } + vlc_mutex_unlock( &p_vout->picture_lock ); + /* Need to reinitialise the chroma plugin. Since we might need * resizing too and it's not sure that we already had it, * recreate the chroma plugin chain from scratch. */ /* dionoea */ - if( !p_vout->b_direct ) + if( ChromaCreate( p_vout ) ) { - ChromaDestroy( p_vout ); - - if( ChromaCreate( p_vout ) ) - { - msg_Err( p_vout, "WOW THIS SUCKS BIG TIME!!!!!" ); - } + msg_Err( p_vout, "WOW THIS SUCKS BIG TIME!!!!!" ); + p_vout->b_error = 1; } + if( p_vout->b_error ) + break; } if( p_vout->i_changes & VOUT_PICTURE_BUFFERS_CHANGE ) @@ -1092,10 +1071,14 @@ static void RunThread( vout_thread_t *p_vout) I_OUTPUTPICTURES = I_RENDERPICTURES = 0; - vlc_mutex_lock( &p_vout->change_lock ); // FIXME is that valid ? p_vout->b_error = InitThread( p_vout ); + if( p_vout->b_error ) + msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed\n" ); vlc_mutex_unlock( &p_vout->picture_lock ); + + if( p_vout->b_error ) + break; } /* Check for "video filter2" changes */ @@ -1128,11 +1111,10 @@ static void RunThread( vout_thread_t *p_vout) * Error loop - wait until the thread destruction is requested */ if( p_vout->b_error ) - { ErrorThread( p_vout ); - } /* End of thread */ + CleanThread( p_vout ); EndThread( p_vout ); vlc_mutex_unlock( &p_vout->change_lock ); @@ -1149,34 +1131,21 @@ static void RunThread( vout_thread_t *p_vout) static void ErrorThread( vout_thread_t *p_vout ) { /* Wait until a `die' order */ - while( !p_vout->b_die ) - { - /* Sleep a while */ - msleep( VOUT_IDLE_SLEEP ); - } + while( vlc_object_alive( p_vout ) ) + vlc_object_wait( p_vout ); } /***************************************************************************** - * EndThread: thread destruction + * CleanThread: clean up after InitThread ***************************************************************************** - * This function is called when the thread ends after a sucessful + * This function is called after a sucessful * initialization. It frees all resources allocated by InitThread. * XXX You have to enter it with change_lock taken. *****************************************************************************/ -static void EndThread( vout_thread_t *p_vout ) +static void CleanThread( vout_thread_t *p_vout ) { int i_index; /* index in heap */ -#ifdef STATS - { - struct tms cpu_usage; - times( &cpu_usage ); - - msg_Dbg( p_vout, "cpu usage (user: %d, system: %d)", - cpu_usage.tms_utime, cpu_usage.tms_stime ); - } -#endif - if( !p_vout->b_direct ) ChromaDestroy( p_vout ); @@ -1189,15 +1158,38 @@ static void EndThread( vout_thread_t *p_vout ) } } + /* Destroy translation tables */ + if( !p_vout->b_error ) + p_vout->pf_end( p_vout ); +} + +/***************************************************************************** + * EndThread: thread destruction + ***************************************************************************** + * This function is called when the thread ends. + * It frees all resources not allocated by InitThread. + * XXX You have to enter it with change_lock taken. + *****************************************************************************/ +static void EndThread( vout_thread_t *p_vout ) +{ +#ifdef STATS + { + struct tms cpu_usage; + times( &cpu_usage ); + + msg_Dbg( p_vout, "cpu usage (user: %d, system: %d)", + cpu_usage.tms_utime, cpu_usage.tms_stime ); + } +#endif + + /* FIXME does that function *really* need to be called inside the thread ? */ + /* Destroy subpicture unit */ spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false ); spu_Destroy( p_vout->p_spu ); /* Destroy the video filters2 */ filter_chain_Delete( p_vout->p_vf2_chain ); - - /* Destroy translation tables FIXME if b_error is set, it can already be done */ - p_vout->pf_end( p_vout ); } /* Thread helpers */ @@ -1208,28 +1200,37 @@ static picture_t *ChromaGetPicture( filter_t *p_filter ) return p_pic; } +static void ChromaCopyRgbInfo( es_format_t *p_fmt, picture_heap_t *p_heap ) +{ + p_fmt->video.i_rmask = p_heap->i_rmask; + p_fmt->video.i_gmask = p_heap->i_gmask; + p_fmt->video.i_bmask = p_heap->i_bmask; + p_fmt->video.i_rrshift = p_heap->i_rrshift; + p_fmt->video.i_lrshift = p_heap->i_lrshift; + p_fmt->video.i_rgshift = p_heap->i_rgshift; + p_fmt->video.i_lgshift = p_heap->i_lgshift; + p_fmt->video.i_rbshift = p_heap->i_rbshift; + p_fmt->video.i_lbshift = p_heap->i_lbshift; +} + static int ChromaCreate( vout_thread_t *p_vout ) { + static const char typename[] = "chroma"; filter_t *p_chroma; /* Choose the best module */ - p_chroma = p_vout->p_chroma = vlc_object_create( p_vout, sizeof(filter_t) ); + p_chroma = p_vout->p_chroma = + vlc_custom_create( p_vout, sizeof(filter_t), VLC_OBJECT_GENERIC, + typename ); vlc_object_attach( p_chroma, p_vout ); /* TODO: Set the fmt_in and fmt_out stuff here */ p_chroma->fmt_in.video = p_vout->fmt_render; p_chroma->fmt_out.video = p_vout->fmt_out; + ChromaCopyRgbInfo( &p_chroma->fmt_in, &p_vout->render ); + ChromaCopyRgbInfo( &p_chroma->fmt_out, &p_vout->output ); - p_chroma->fmt_out.video.i_rmask = p_vout->output.i_rmask; - p_chroma->fmt_out.video.i_gmask = p_vout->output.i_gmask; - p_chroma->fmt_out.video.i_bmask = p_vout->output.i_bmask; - p_chroma->fmt_out.video.i_rrshift = p_vout->output.i_rrshift; - p_chroma->fmt_out.video.i_lrshift = p_vout->output.i_lrshift; - p_chroma->fmt_out.video.i_rgshift = p_vout->output.i_rgshift; - p_chroma->fmt_out.video.i_lgshift = p_vout->output.i_lgshift; - p_chroma->fmt_out.video.i_rbshift = p_vout->output.i_rbshift; - p_chroma->fmt_out.video.i_lbshift = p_vout->output.i_lbshift; p_chroma->p_module = module_Need( p_chroma, "video filter2", NULL, 0 ); if( p_chroma->p_module == NULL ) @@ -1261,6 +1262,24 @@ static void ChromaDestroy( vout_thread_t *p_vout ) p_vout->p_chroma = NULL; } +static void DropPicture( vout_thread_t *p_vout, picture_t *p_picture ) +{ + vlc_mutex_lock( &p_vout->picture_lock ); + if( p_picture->i_refcount ) + { + /* Pretend we displayed the picture, but don't destroy + * it since the decoder might still need it. */ + p_picture->i_status = DISPLAYED_PICTURE; + } + else + { + /* Destroy the picture without displaying it */ + p_picture->i_status = DESTROYED_PICTURE; + p_vout->i_heap_size--; + } + vlc_mutex_unlock( &p_vout->picture_lock ); +} + /* following functions are local */ @@ -1359,21 +1378,6 @@ static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask ) *pi_right = (8 - i_high + i_low); } -/***************************************************************************** - * vout_VarCallback: generic callback for intf variables - *****************************************************************************/ -int vout_VarCallback( vlc_object_t * p_this, const char * psz_variable, - vlc_value_t oldval, vlc_value_t newval, - void *p_data ) -{ - vout_thread_t * p_vout = (vout_thread_t *)p_this; - vlc_value_t val; - (void)psz_variable; (void)newval; (void)oldval; (void)p_data; - val.b_bool = true; - var_Set( p_vout, "intf-change", val ); - return VLC_SUCCESS; -} - /***************************************************************************** * Helper thread for object variables callbacks. * Only used to avoid deadlocks when using the video embedded mode. @@ -1387,18 +1391,12 @@ typedef struct suxor_thread_t static void SuxorRestartVideoES( suxor_thread_t *p_this ) { - vlc_value_t val; - - vlc_thread_ready( p_this ); - /* Now restart current video stream */ - var_Get( p_this->p_input, "video-es", &val ); - if( val.i_int >= 0 ) + int val = var_GetInteger( p_this->p_input, "video-es" ); + if( val >= 0 ) { - vlc_value_t val_es; - val_es.i_int = -VIDEO_ES; - var_Set( p_this->p_input, "video-es", val_es ); - var_Set( p_this->p_input, "video-es", val ); + var_SetInteger( p_this->p_input, "video-es", -VIDEO_ES ); + var_SetInteger( p_this->p_input, "video-es", val ); } vlc_object_release( p_this->p_input ); @@ -1494,8 +1492,10 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "video-es", &val ); if( val.i_int >= 0 ) { + static const char typename[] = "kludge"; suxor_thread_t *p_suxor = - vlc_object_create( p_vout, sizeof(suxor_thread_t) ); + vlc_custom_create( p_vout, sizeof(suxor_thread_t), + VLC_OBJECT_GENERIC, typename ); p_suxor->p_input = p_input; p_vout->b_filter_change = true; vlc_object_yield( p_input ); @@ -1529,6 +1529,8 @@ static void DisplayTitleOnOSD( vout_thread_t *p_vout ) input_thread_t *p_input; mtime_t i_now, i_stop; + if( !config_GetInt( p_vout, "osd" ) ) return; + p_input = (input_thread_t *)vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( p_input )