X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_pictures.c;h=3275aac7d16f0a48e7456fb5593fe81ee2fcbfb7;hb=9885e3480e42d648daef956dd84ce59d7bd4d9bf;hp=81f29ba1fceb7e07726a76b1f5cadd49f57671ff;hpb=3cbe2bd0122f78a44e6d59e76b43a15126b62c79;p=vlc diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c index 81f29ba1fc..3275aac7d1 100644 --- a/src/video_output/vout_pictures.c +++ b/src/video_output/vout_pictures.c @@ -29,69 +29,35 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include #include +#include #include #include #include #include "vout_pictures.h" - -#include +#include "vout_internal.h" /** * Display a picture * * Remove the reservation flag of a picture, which will cause it to be ready - * for display. The picture won't be displayed until vout_DatePicture has been - * called. + * for display. */ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic ) { vlc_mutex_lock( &p_vout->picture_lock ); - switch( p_pic->i_status ) + + if( p_pic->i_status == RESERVED_PICTURE ) { - case RESERVED_PICTURE: - p_pic->i_status = RESERVED_DISP_PICTURE; - break; - case RESERVED_DATED_PICTURE: p_pic->i_status = READY_PICTURE; - break; - default: - msg_Err( p_vout, "picture to display %p has invalid status %d", - p_pic, p_pic->i_status ); - break; + vlc_cond_signal( &p_vout->p->picture_wait ); } - - vlc_mutex_unlock( &p_vout->picture_lock ); -} - -/** - * Date a picture - * - * Remove the reservation flag of a picture, which will cause it to be ready - * for display. The picture won't be displayed until vout_DisplayPicture has - * been called. - * \param p_vout The vout in question - * \param p_pic The picture to date - * \param date The date to display the picture - */ -void vout_DatePicture( vout_thread_t *p_vout, - picture_t *p_pic, mtime_t date ) -{ - vlc_mutex_lock( &p_vout->picture_lock ); - p_pic->date = date; - switch( p_pic->i_status ) + else { - case RESERVED_PICTURE: - p_pic->i_status = RESERVED_DATED_PICTURE; - break; - case RESERVED_DISP_PICTURE: - p_pic->i_status = READY_PICTURE; - break; - default: - msg_Err( p_vout, "picture to date %p has invalid status %d", + msg_Err( p_vout, "picture to display %p has invalid status %d", p_pic, p_pic->i_status ); - break; } vlc_mutex_unlock( &p_vout->picture_lock ); @@ -213,8 +179,6 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, p_freepic->i_nb_fields = i_nb_fields; p_freepic->b_top_field_first = b_top_field_first; - p_freepic->i_matrix_coefficients = 1; - p_vout->i_heap_size++; } else @@ -238,30 +202,75 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, return( NULL ); } +/* */ +static void DestroyPicture( vout_thread_t *p_vout, picture_t *p_picture ) +{ + vlc_assert_locked( &p_vout->picture_lock ); + + p_picture->i_status = DESTROYED_PICTURE; + p_vout->i_heap_size--; + picture_CleanupQuant( p_picture ); + + vlc_cond_signal( &p_vout->p->picture_wait ); +} + /** * Remove a permanent or reserved picture from the heap * * This function frees a previously reserved picture or a permanent * picture. It is meant to be used when the construction of a picture aborted. * Note that the picture will be destroyed even if it is linked ! + * + * TODO remove it, vout_DropPicture should be used instead */ void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic ) { - vlc_mutex_lock( &p_vout->picture_lock ); - #ifndef NDEBUG /* Check if picture status is valid */ - if( (p_pic->i_status != RESERVED_PICTURE) && - (p_pic->i_status != RESERVED_DATED_PICTURE) && - (p_pic->i_status != RESERVED_DISP_PICTURE) ) + vlc_mutex_lock( &p_vout->picture_lock ); + if( p_pic->i_status != RESERVED_PICTURE ) { msg_Err( p_vout, "picture to destroy %p has invalid status %d", p_pic, p_pic->i_status ); } + vlc_mutex_unlock( &p_vout->picture_lock ); #endif - p_pic->i_status = DESTROYED_PICTURE; - p_vout->i_heap_size--; + vout_DropPicture( p_vout, p_pic ); +} + +/* */ +void vout_UsePictureLocked( vout_thread_t *p_vout, picture_t *p_picture ) +{ + vlc_assert_locked( &p_vout->picture_lock ); + if( p_picture->i_refcount > 0 ) + { + /* 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 */ + DestroyPicture( p_vout, p_picture ); + } +} + +/* */ +void vout_DropPicture( vout_thread_t *p_vout, picture_t *p_pic ) +{ + vlc_mutex_lock( &p_vout->picture_lock ); + + if( p_pic->i_status == READY_PICTURE ) + { + /* Grr cannot destroy ready picture by myself so be sure vout won't like it */ + p_pic->date = 1; + vlc_cond_signal( &p_vout->p->picture_wait ); + } + else + { + vout_UsePictureLocked( p_vout, p_pic ); + } vlc_mutex_unlock( &p_vout->picture_lock ); } @@ -287,14 +296,15 @@ void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) { vlc_mutex_lock( &p_vout->picture_lock ); - p_pic->i_refcount--; - if( ( p_pic->i_refcount == 0 ) && - ( p_pic->i_status == DISPLAYED_PICTURE ) ) - { - p_pic->i_status = DESTROYED_PICTURE; - p_vout->i_heap_size--; - } + if( p_pic->i_refcount > 0 ) + p_pic->i_refcount--; + else + msg_Err( p_vout, "Invalid picture reference count (%p, %d)", + p_pic, p_pic->i_refcount ); + + if( p_pic->i_refcount == 0 && p_pic->i_status == DISPLAYED_PICTURE ) + DestroyPicture( p_vout, p_pic ); vlc_mutex_unlock( &p_vout->picture_lock ); } @@ -318,21 +328,11 @@ static void vout_UnlockPicture( vout_thread_t *p_vout, picture_t *p_picture ) * before rendering, does the subpicture magic, and tells the video output * thread which direct buffer needs to be displayed. */ -picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, - subpicture_t *p_subpic ) +picture_t *vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, + subpicture_t *p_subpic, bool b_paused ) { - int i_scale_width, i_scale_height; - if( p_pic == NULL ) - { - /* XXX: subtitles */ return NULL; - } - - i_scale_width = p_vout->fmt_out.i_visible_width * 1000 / - p_vout->fmt_in.i_visible_width; - i_scale_height = p_vout->fmt_out.i_visible_height * 1000 / - p_vout->fmt_in.i_visible_height; if( p_pic->i_type == DIRECT_PICTURE ) { @@ -346,11 +346,11 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, if( vout_LockPicture( p_vout, PP_OUTPUTPICTURE[0] ) ) return NULL; - vout_CopyPicture( p_vout, PP_OUTPUTPICTURE[0], p_pic ); + picture_Copy( PP_OUTPUTPICTURE[0], p_pic ); - spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, - PP_OUTPUTPICTURE[0], p_pic, p_subpic, - i_scale_width, i_scale_height ); + spu_RenderSubpictures( p_vout->p_spu, + PP_OUTPUTPICTURE[0], &p_vout->fmt_out, + p_subpic, &p_vout->fmt_in, b_paused ); vout_UnlockPicture( p_vout, PP_OUTPUTPICTURE[0] ); @@ -365,7 +365,7 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, /* Not a direct buffer. We either need to copy it to a direct buffer, * or render it if the chroma isn't the same. */ - if( p_vout->b_direct ) + if( p_vout->p->b_direct ) { /* Picture is not in a direct buffer, but is exactly the * same size as the direct buffers. A memcpy() is enough, @@ -374,10 +374,10 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, if( vout_LockPicture( p_vout, PP_OUTPUTPICTURE[0] ) ) return NULL; - vout_CopyPicture( p_vout, PP_OUTPUTPICTURE[0], p_pic ); - spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, - PP_OUTPUTPICTURE[0], p_pic, - p_subpic, i_scale_width, i_scale_height ); + picture_Copy( PP_OUTPUTPICTURE[0], p_pic ); + spu_RenderSubpictures( p_vout->p_spu, + PP_OUTPUTPICTURE[0], &p_vout->fmt_out, + p_subpic, &p_vout->fmt_in, b_paused ); vout_UnlockPicture( p_vout, PP_OUTPUTPICTURE[0] ); @@ -409,18 +409,18 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, } /* Convert image to the first direct buffer */ - p_vout->p_chroma->p_owner = (filter_owner_sys_t *)p_tmp_pic; - p_vout->p_chroma->pf_video_filter( p_vout->p_chroma, p_pic ); + p_vout->p->p_chroma->p_owner = (filter_owner_sys_t *)p_tmp_pic; + p_vout->p->p_chroma->pf_video_filter( p_vout->p->p_chroma, p_pic ); /* Render subpictures on the first direct buffer */ - spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, p_tmp_pic, - p_tmp_pic, p_subpic, - i_scale_width, i_scale_height ); + spu_RenderSubpictures( p_vout->p_spu, + p_tmp_pic, &p_vout->fmt_out, + p_subpic, &p_vout->fmt_in, b_paused ); if( vout_LockPicture( p_vout, &p_vout->p_picture[0] ) ) return NULL; - vout_CopyPicture( p_vout, &p_vout->p_picture[0], p_tmp_pic ); + picture_Copy( &p_vout->p_picture[0], p_tmp_pic ); } else { @@ -428,13 +428,13 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, return NULL; /* Convert image to the first direct buffer */ - p_vout->p_chroma->p_owner = (filter_owner_sys_t *)&p_vout->p_picture[0]; - p_vout->p_chroma->pf_video_filter( p_vout->p_chroma, p_pic ); + p_vout->p->p_chroma->p_owner = (filter_owner_sys_t *)&p_vout->p_picture[0]; + p_vout->p->p_chroma->pf_video_filter( p_vout->p->p_chroma, p_pic ); /* Render subpictures on the first direct buffer */ - spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, - &p_vout->p_picture[0], &p_vout->p_picture[0], - p_subpic, i_scale_width, i_scale_height ); + spu_RenderSubpictures( p_vout->p_spu, + &p_vout->p_picture[0], &p_vout->fmt_out, + p_subpic, &p_vout->fmt_in, b_paused ); } vout_UnlockPicture( p_vout, &p_vout->p_picture[0] ); @@ -448,10 +448,12 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, * This function will be accessed by plugins. It calculates the relative * position of the output window and the image window. */ -void vout_PlacePicture( vout_thread_t *p_vout, +void vout_PlacePicture( const vout_thread_t *p_vout, unsigned int i_width, unsigned int i_height, - unsigned int *pi_x, unsigned int *pi_y, - unsigned int *pi_width, unsigned int *pi_height ) + unsigned int *restrict pi_x, + unsigned int *restrict pi_y, + unsigned int *restrict pi_width, + unsigned int *restrict pi_height ) { if( (i_width <= 0) || (i_height <=0) ) { @@ -459,16 +461,30 @@ void vout_PlacePicture( vout_thread_t *p_vout, return; } - if( p_vout->b_scale ) + bool b_autoscale = p_vout->b_autoscale; + int i_zoom = p_vout->i_zoom; + + /* be realistic, scaling factor confined between .2 and 10. */ + if( i_zoom > 10 * ZOOM_FP_FACTOR || i_zoom < ZOOM_FP_FACTOR / 5 ) + i_zoom = ZOOM_FP_FACTOR; + + if( b_autoscale ) { *pi_width = i_width; *pi_height = i_height; } - else + else if( i_zoom == ZOOM_FP_FACTOR ) /* original size */ { *pi_width = __MIN( i_width, p_vout->fmt_in.i_visible_width ); *pi_height = __MIN( i_height, p_vout->fmt_in.i_visible_height ); } + else + { + *pi_width = + p_vout->fmt_in.i_visible_width * i_zoom / ZOOM_FP_FACTOR; + *pi_height = + p_vout->fmt_in.i_visible_height * i_zoom / ZOOM_FP_FACTOR; + } int64_t i_scaled_width = p_vout->fmt_in.i_visible_width * (int64_t)p_vout->fmt_in.i_sar_num * *pi_height / p_vout->fmt_in.i_visible_height / p_vout->fmt_in.i_sar_den; @@ -643,6 +659,7 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma, case FOURCC_GREY: case FOURCC_Y800: case FOURCC_Y8: + case FOURCC_RGBP: p_format->i_bits_per_pixel = 8; break; @@ -895,6 +912,7 @@ int __vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, case FOURCC_GREY: case FOURCC_Y800: case FOURCC_Y8: + case FOURCC_RGBP: p_pic->p->i_lines = i_height_aligned; p_pic->p->i_visible_lines = i_height; p_pic->p->i_pitch = i_width_aligned; @@ -990,20 +1008,6 @@ int vout_ChromaCmp( vlc_fourcc_t i_chroma, vlc_fourcc_t i_amorhc ) } } -/***************************************************************************** - * vout_CopyPicture: copy a picture to another one - ***************************************************************************** - * This function takes advantage of the image format, and reduces the - * number of calls to memcpy() to the minimum. Source and destination - * images must have same width (hence i_visible_pitch), height, and chroma. - *****************************************************************************/ -void __vout_CopyPicture( vlc_object_t *p_this, - picture_t *p_dest, picture_t *p_src ) -{ - VLC_UNUSED(p_this); - picture_Copy( p_dest, p_src ); -} - /***************************************************************************** * *****************************************************************************/ @@ -1018,12 +1022,10 @@ static void PictureReleaseCallback( picture_t *p_picture ) *****************************************************************************/ picture_t *picture_New( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_aspect ) { - picture_t *p_picture = malloc( sizeof(*p_picture) ); - + picture_t *p_picture = calloc( 1, sizeof(*p_picture) ); if( !p_picture ) return NULL; - memset( p_picture, 0, sizeof(*p_picture) ); if( __vout_AllocatePicture( NULL, p_picture, i_chroma, i_width, i_height, i_aspect ) ) { @@ -1045,6 +1047,7 @@ void picture_Delete( picture_t *p_picture ) { assert( p_picture && p_picture->i_refcount == 0 ); + free( p_picture->p_q ); free( p_picture->p_data_orig ); free( p_picture->p_sys ); free( p_picture ); @@ -1097,4 +1100,3 @@ void plane_CopyPixels( plane_t *p_dst, const plane_t *p_src ) * *****************************************************************************/ -