X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_pictures.c;h=9c111445ac889c086973463cf6d9ad61bda9eadb;hb=7bbb46c1e2d22e7a144bcca18f6e0ca1e0eaf8e2;hp=1e82e817a14426a6954e97983a7d8aab87d7834a;hpb=32329d4ff2744d73f6dda89502a06c3cb50ca38a;p=vlc diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c index 1e82e817a1..9c111445ac 100644 --- a/src/video_output/vout_pictures.c +++ b/src/video_output/vout_pictures.c @@ -1,7 +1,7 @@ /***************************************************************************** * vout_pictures.c : picture management functions ***************************************************************************** - * Copyright (C) 2000-2004 VideoLAN + * Copyright (C) 2000-2004 the VideoLAN team * $Id$ * * Authors: Vincent Seguin @@ -19,83 +19,47 @@ * * 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 *****************************************************************************/ -#include /* free() */ -#include /* sprintf() */ -#include /* strerror() */ -#include - -#include "vlc_video.h" -#include "video_output.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include +#include +#include +#include +#include +#include #include "vout_pictures.h" - -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static void CopyPicture( vout_thread_t *, picture_t *, picture_t * ); +#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; } + p_vout->p->i_picture_qtype = p_pic->i_qtype; vlc_mutex_unlock( &p_vout->picture_lock ); } @@ -109,9 +73,38 @@ void vout_DatePicture( vout_thread_t *p_vout, * It needs locking since several pictures can be created by several producers * threads. */ +int vout_CountPictureAvailable( vout_thread_t *p_vout ) +{ + int i_free = 0; + int i_pic; + + vlc_mutex_lock( &p_vout->picture_lock ); + for( i_pic = 0; i_pic < I_RENDERPICTURES; i_pic++ ) + { + picture_t *p_pic = PP_RENDERPICTURE[(p_vout->render.i_last_used_pic + i_pic + 1) % I_RENDERPICTURES]; + + switch( p_pic->i_status ) + { + case DESTROYED_PICTURE: + i_free++; + break; + + case FREE_PICTURE: + i_free++; + break; + + default: + break; + } + } + vlc_mutex_unlock( &p_vout->picture_lock ); + + return i_free; +} + picture_t *vout_CreatePicture( vout_thread_t *p_vout, - vlc_bool_t b_progressive, - vlc_bool_t b_top_field_first, + bool b_progressive, + bool b_top_field_first, unsigned int i_nb_fields ) { int i_pic; /* picture index */ @@ -178,6 +171,7 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, /* Copy picture information, set some default values */ p_freepic->i_status = RESERVED_PICTURE; p_freepic->i_type = MEMORY_PICTURE; + p_freepic->b_slow = 0; p_freepic->i_refcount = 0; p_freepic->b_force = 0; @@ -186,8 +180,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 @@ -211,30 +203,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 ); - -#ifdef DEBUG +#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 ); } @@ -260,25 +297,31 @@ 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 ) - { - msg_Err( p_vout, "picture %p refcount is %i", + 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 ); - p_pic->i_refcount = 0; - } - 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_status == DISPLAYED_PICTURE ) + DestroyPicture( p_vout, p_pic ); vlc_mutex_unlock( &p_vout->picture_lock ); } +static int vout_LockPicture( vout_thread_t *p_vout, picture_t *p_picture ) +{ + if( p_picture->pf_lock ) + return p_picture->pf_lock( p_vout, p_picture ); + return VLC_SUCCESS; +} +static void vout_UnlockPicture( vout_thread_t *p_vout, picture_t *p_picture ) +{ + if( p_picture->pf_unlock ) + p_picture->pf_unlock( p_vout, p_picture ); +} + /** * Render a picture * @@ -286,72 +329,58 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) * 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 ) { if( p_pic == NULL ) - { - /* XXX: subtitles */ - return NULL; - } if( p_pic->i_type == DIRECT_PICTURE ) { - if( !p_vout->render.b_allow_modify_pics || p_pic->i_refcount ) + /* Picture is in a direct buffer. */ + + if( p_subpic != NULL ) { - /* Picture is in a direct buffer and is still in use, - * we need to copy it to another direct buffer before - * displaying it if there are subtitles. */ - if( p_subpic != NULL ) - { - /* We have subtitles. First copy the picture to - * the spare direct buffer, then render the - * subtitles. */ - CopyPicture( p_vout, p_pic, PP_OUTPUTPICTURE[0] ); + /* We have subtitles. First copy the picture to + * the spare direct buffer, then render the + * subtitles. */ + if( vout_LockPicture( p_vout, PP_OUTPUTPICTURE[0] ) ) + return NULL; - vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_subpic ); + picture_Copy( PP_OUTPUTPICTURE[0], p_pic ); - return PP_OUTPUTPICTURE[0]; - } + spu_RenderSubpictures( p_vout->p_spu, + PP_OUTPUTPICTURE[0], &p_vout->fmt_out, + p_subpic, &p_vout->fmt_in, b_paused ); - /* No subtitles, picture is in a directbuffer so - * we can display it directly even if it is still - * in use. */ - return p_pic; - } + vout_UnlockPicture( p_vout, PP_OUTPUTPICTURE[0] ); - /* Picture is in a direct buffer but isn't used by the - * decoder. We can safely render subtitles on it and - * display it. */ - vout_RenderSubPictures( p_vout, p_pic, p_subpic ); + return PP_OUTPUTPICTURE[0]; + } + /* No subtitles, picture is in a directbuffer so + * we can display it directly (even if it is still + * in use or not). */ return 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, * then render the subtitles. */ - if( PP_OUTPUTPICTURE[0]->pf_lock ) - if( PP_OUTPUTPICTURE[0]->pf_lock( p_vout, PP_OUTPUTPICTURE[0] ) ) - { - if( PP_OUTPUTPICTURE[0]->pf_unlock ) - PP_OUTPUTPICTURE[0]->pf_unlock( p_vout, PP_OUTPUTPICTURE[0] ); - - return NULL; - } - - CopyPicture( p_vout, p_pic, PP_OUTPUTPICTURE[0] ); + if( vout_LockPicture( p_vout, PP_OUTPUTPICTURE[0] ) ) + return NULL; - vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_subpic ); + 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 ); - if( PP_OUTPUTPICTURE[0]->pf_unlock ) - PP_OUTPUTPICTURE[0]->pf_unlock( p_vout, PP_OUTPUTPICTURE[0] ); + vout_UnlockPicture( p_vout, PP_OUTPUTPICTURE[0] ); return PP_OUTPUTPICTURE[0]; } @@ -361,18 +390,55 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, * well. This usually means software YUV, or hardware YUV with a * different chroma. */ - if( p_vout->p_picture[0].pf_lock ) - if( p_vout->p_picture[0].pf_lock( p_vout, &p_vout->p_picture[0] ) ) + if( p_subpic != NULL && p_vout->p_picture[0].b_slow ) + { + /* The picture buffer is in slow memory. We'll use + * the "2 * VOUT_MAX_PICTURES + 1" picture as a temporary + * one for subpictures rendering. */ + picture_t *p_tmp_pic = &p_vout->p_picture[2 * VOUT_MAX_PICTURES]; + if( p_tmp_pic->i_status == FREE_PICTURE ) + { + vout_AllocatePicture( VLC_OBJECT(p_vout), + p_tmp_pic, p_vout->fmt_out.i_chroma, + p_vout->fmt_out.i_width, + p_vout->fmt_out.i_height, + p_vout->fmt_out.i_aspect ); + p_tmp_pic->i_type = MEMORY_PICTURE; + p_tmp_pic->i_status = RESERVED_PICTURE; + /* some modules (such as blend) needs to know the extra information in picture heap */ + p_tmp_pic->p_heap = &p_vout->output; + } + + /* Convert image to the first direct buffer */ + 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_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; - /* Convert image to the first direct buffer */ - p_vout->chroma.pf_convert( p_vout, p_pic, &p_vout->p_picture[0] ); + picture_Copy( &p_vout->p_picture[0], p_tmp_pic ); + } + else + { + if( vout_LockPicture( p_vout, &p_vout->p_picture[0] ) ) + return NULL; - /* Render subpictures on the first direct buffer */ - vout_RenderSubPictures( p_vout, &p_vout->p_picture[0], p_subpic ); + /* Convert image to the first direct buffer */ + 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 ); - if( p_vout->p_picture[0].pf_unlock ) - p_vout->p_picture[0].pf_unlock( p_vout, &p_vout->p_picture[0] ); + /* Render subpictures on the first direct buffer */ + 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] ); return &p_vout->p_picture[0]; } @@ -383,50 +449,72 @@ 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) ) + if( i_width <= 0 || i_height <= 0 ) { *pi_width = *pi_height = *pi_x = *pi_y = 0; - return; } - if( p_vout->b_scale ) + if( p_vout->b_autoscale ) { *pi_width = i_width; *pi_height = i_height; } else { - *pi_width = __MIN( i_width, p_vout->render.i_width ); - *pi_height = __MIN( i_height, p_vout->render.i_height ); - } + 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 = 10 * ZOOM_FP_FACTOR; + else if( i_zoom < ZOOM_FP_FACTOR / 5 ) i_zoom = ZOOM_FP_FACTOR / 5; - if( VOUT_ASPECT_FACTOR * *pi_width / *pi_height < p_vout->render.i_aspect ) - { - *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR; - } - else - { - *pi_height = *pi_width * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect; - } + unsigned int i_original_width, i_original_height; - if( *pi_width > i_width ) - { - *pi_width = i_width; - *pi_height = VOUT_ASPECT_FACTOR * *pi_width / p_vout->render.i_aspect; + if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den ) + { + i_original_width = p_vout->fmt_in.i_visible_width * + p_vout->fmt_in.i_sar_num / p_vout->fmt_in.i_sar_den; + i_original_height = p_vout->fmt_in.i_visible_height; + } + else + { + i_original_width = p_vout->fmt_in.i_visible_width; + i_original_height = p_vout->fmt_in.i_visible_height * + p_vout->fmt_in.i_sar_den / p_vout->fmt_in.i_sar_num; + } +#ifdef WIN32 + /* On windows, inner video window exceeding container leads to black screen */ + *pi_width = __MIN( i_width, i_original_width * i_zoom / ZOOM_FP_FACTOR ); + *pi_height = __MIN( i_height, i_original_height * i_zoom / ZOOM_FP_FACTOR ); +#else + *pi_width = i_original_width * i_zoom / ZOOM_FP_FACTOR ; + *pi_height = i_original_height * i_zoom / ZOOM_FP_FACTOR ; +#endif } - if( *pi_height > i_height ) + 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; + int64_t i_scaled_height = p_vout->fmt_in.i_visible_height * (int64_t)p_vout->fmt_in.i_sar_den * + *pi_width / p_vout->fmt_in.i_visible_width / p_vout->fmt_in.i_sar_num; + + if( i_scaled_width <= 0 || i_scaled_height <= 0 ) { - *pi_height = i_height; - *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR; + msg_Warn( p_vout, "ignoring broken aspect ratio" ); + i_scaled_width = *pi_width; + i_scaled_height = *pi_height; } + if( i_scaled_width > *pi_width ) + *pi_height = i_scaled_height; + else + *pi_width = i_scaled_width; + switch( p_vout->i_alignment & VOUT_ALIGN_HMASK ) { case VOUT_ALIGN_LEFT: @@ -459,25 +547,33 @@ void vout_PlacePicture( vout_thread_t *p_vout, * used exactly like a video buffer. The video output thread then manages * how it gets displayed. */ -void vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic, - vlc_fourcc_t i_chroma, - int i_width, int i_height, int i_aspect ) +int __vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic, + vlc_fourcc_t i_chroma, + int i_width, int i_height, int i_aspect ) { - int i_bytes, i_index; + int i_bytes, i_index, i_width_aligned, i_height_aligned; - vout_InitPicture( p_this, p_pic, i_chroma, - i_width, i_height, i_aspect ); + /* Make sure the real dimensions are a multiple of 16 */ + i_width_aligned = (i_width + 15) >> 4 << 4; + i_height_aligned = (i_height + 15) >> 4 << 4; + + if( vout_InitPicture( p_this, p_pic, i_chroma, + i_width, i_height, i_aspect ) != VLC_SUCCESS ) + { + p_pic->i_planes = 0; + return VLC_EGENERIC; + } /* Calculate how big the new image should be */ i_bytes = p_pic->format.i_bits_per_pixel * - p_pic->format.i_width * p_pic->format.i_height / 8; + i_width_aligned * i_height_aligned / 8; p_pic->p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes ); if( p_pic->p_data == NULL ) { p_pic->i_planes = 0; - return; + return VLC_EGENERIC; } /* Fill the p_pixels field for each plane */ @@ -485,10 +581,11 @@ void vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic, for( i_index = 1; i_index < p_pic->i_planes; i_index++ ) { - p_pic->p[i_index].p_pixels = p_pic->p[i_index-1].p_pixels - + p_pic->p[i_index-1].i_lines - * p_pic->p[i_index-1].i_pitch; + p_pic->p[i_index].p_pixels = p_pic->p[i_index-1].p_pixels + + p_pic->p[i_index-1].i_lines * p_pic->p[i_index-1].i_pitch; } + + return VLC_SUCCESS; } /** @@ -521,18 +618,27 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma, switch( i_chroma ) { + case FOURCC_YUVA: + p_format->i_bits_per_pixel = 32; + break; case FOURCC_I444: + case FOURCC_J444: p_format->i_bits_per_pixel = 24; break; case FOURCC_I422: case FOURCC_YUY2: case FOURCC_UYVY: + case FOURCC_J422: p_format->i_bits_per_pixel = 16; + break; + case FOURCC_I440: + case FOURCC_J440: p_format->i_bits_per_pixel = 16; break; case FOURCC_I411: case FOURCC_YV12: case FOURCC_I420: + case FOURCC_J420: case FOURCC_IYUV: p_format->i_bits_per_pixel = 12; break; @@ -543,17 +649,16 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma, case FOURCC_Y211: p_format->i_bits_per_pixel = 8; break; + case FOURCC_YUVP: + p_format->i_bits_per_pixel = 8; + break; + case FOURCC_RV32: + case FOURCC_RGBA: p_format->i_bits_per_pixel = 32; break; case FOURCC_RV24: - /* FIXME: Should be 24 here but x11 and our chroma conversion - * routines assume 32. */ -#ifdef WIN32 p_format->i_bits_per_pixel = 24; -#else - p_format->i_bits_per_pixel = 32; -#endif break; case FOURCC_RV15: case FOURCC_RV16: @@ -562,6 +667,14 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma, case FOURCC_RGB2: p_format->i_bits_per_pixel = 8; break; + + case FOURCC_GREY: + case FOURCC_Y800: + case FOURCC_Y8: + case FOURCC_RGBP: + p_format->i_bits_per_pixel = 8; + break; + default: p_format->i_bits_per_pixel = 0; break; @@ -580,11 +693,11 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma, * \param i_height The height of the picture * \param i_aspect The aspect ratio of the picture */ -void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, - vlc_fourcc_t i_chroma, - int i_width, int i_height, int i_aspect ) +int __vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, + vlc_fourcc_t i_chroma, + int i_width, int i_height, int i_aspect ) { - int i_index; + int i_index, i_width_aligned, i_height_aligned; /* Store default values */ for( i_index = 0; i_index < VOUT_MAX_PLANES; i_index++ ) @@ -593,180 +706,242 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, p_pic->p[i_index].i_pixel_pitch = 1; } + p_pic->pf_release = NULL; + p_pic->pf_lock = NULL; + p_pic->pf_unlock = NULL; + p_pic->i_refcount = 0; + + p_pic->i_qtype = QTYPE_NONE; + p_pic->i_qstride = 0; + p_pic->p_q = NULL; + vout_InitFormat( &p_pic->format, i_chroma, i_width, i_height, i_aspect ); + /* Make sure the real dimensions are a multiple of 16 */ + i_width_aligned = (i_width + 15) >> 4 << 4; + i_height_aligned = (i_height + 15) >> 4 << 4; + /* Calculate coordinates */ switch( i_chroma ) { case FOURCC_I411: - p_pic->p[ Y_PLANE ].i_lines = i_height; - p_pic->p[ Y_PLANE ].i_pitch = i_width; - p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch; - p_pic->p[ U_PLANE ].i_lines = i_height; - p_pic->p[ U_PLANE ].i_pitch = i_width / 4; - p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch; - p_pic->p[ V_PLANE ].i_lines = i_height; - p_pic->p[ V_PLANE ].i_pitch = i_width / 4; - p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch; + p_pic->p[ Y_PLANE ].i_lines = i_height_aligned; + p_pic->p[ Y_PLANE ].i_visible_lines = i_height; + p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; + p_pic->p[ U_PLANE ].i_lines = i_height_aligned; + p_pic->p[ U_PLANE ].i_visible_lines = i_height; + p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 4; + p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 4; + p_pic->p[ V_PLANE ].i_lines = i_height_aligned; + p_pic->p[ V_PLANE ].i_visible_lines = i_height; + p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 4; + p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 4; p_pic->i_planes = 3; break; case FOURCC_I410: case FOURCC_YVU9: - p_pic->p[ Y_PLANE ].i_lines = i_height; - p_pic->p[ Y_PLANE ].i_pitch = i_width; - p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch; - p_pic->p[ U_PLANE ].i_lines = i_height / 4; - p_pic->p[ U_PLANE ].i_pitch = i_width / 4; - p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch; - p_pic->p[ V_PLANE ].i_lines = i_height / 4; - p_pic->p[ V_PLANE ].i_pitch = i_width / 4; - p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch; + p_pic->p[ Y_PLANE ].i_lines = i_height_aligned; + p_pic->p[ Y_PLANE ].i_visible_lines = i_height; + p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; + p_pic->p[ U_PLANE ].i_lines = i_height_aligned / 4; + p_pic->p[ U_PLANE ].i_visible_lines = i_height / 4; + p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 4; + p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 4; + p_pic->p[ V_PLANE ].i_lines = i_height_aligned / 4; + p_pic->p[ V_PLANE ].i_visible_lines = i_height / 4; + p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 4; + p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 4; p_pic->i_planes = 3; break; case FOURCC_YV12: case FOURCC_I420: case FOURCC_IYUV: - p_pic->p[ Y_PLANE ].i_lines = i_height; - p_pic->p[ Y_PLANE ].i_pitch = i_width; - p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch; - p_pic->p[ U_PLANE ].i_lines = i_height / 2; - p_pic->p[ U_PLANE ].i_pitch = i_width / 2; - p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch; - p_pic->p[ V_PLANE ].i_lines = i_height / 2; - p_pic->p[ V_PLANE ].i_pitch = i_width / 2; - p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch; + case FOURCC_J420: + p_pic->p[ Y_PLANE ].i_lines = i_height_aligned; + p_pic->p[ Y_PLANE ].i_visible_lines = i_height; + p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; + p_pic->p[ U_PLANE ].i_lines = i_height_aligned / 2; + p_pic->p[ U_PLANE ].i_visible_lines = i_height / 2; + p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 2; + p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 2; + p_pic->p[ V_PLANE ].i_lines = i_height_aligned / 2; + p_pic->p[ V_PLANE ].i_visible_lines = i_height / 2; + p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 2; + p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 2; p_pic->i_planes = 3; break; case FOURCC_I422: - p_pic->p[ Y_PLANE ].i_lines = i_height; - p_pic->p[ Y_PLANE ].i_pitch = i_width; - p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch; - p_pic->p[ U_PLANE ].i_lines = i_height; - p_pic->p[ U_PLANE ].i_pitch = i_width / 2; - p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch; - p_pic->p[ V_PLANE ].i_lines = i_height; - p_pic->p[ V_PLANE ].i_pitch = i_width / 2; - p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch; + case FOURCC_J422: + p_pic->p[ Y_PLANE ].i_lines = i_height_aligned; + p_pic->p[ Y_PLANE ].i_visible_lines = i_height; + p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; + p_pic->p[ U_PLANE ].i_lines = i_height_aligned; + p_pic->p[ U_PLANE ].i_visible_lines = i_height; + p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 2; + p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 2; + p_pic->p[ V_PLANE ].i_lines = i_height_aligned; + p_pic->p[ V_PLANE ].i_visible_lines = i_height; + p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 2; + p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 2; + p_pic->i_planes = 3; + break; + + case FOURCC_I440: + case FOURCC_J440: + p_pic->p[ Y_PLANE ].i_lines = i_height_aligned; + p_pic->p[ Y_PLANE ].i_visible_lines = i_height; + p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; + p_pic->p[ U_PLANE ].i_lines = i_height_aligned / 2; + p_pic->p[ U_PLANE ].i_visible_lines = i_height / 2; + p_pic->p[ U_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ U_PLANE ].i_visible_pitch = i_width; + p_pic->p[ V_PLANE ].i_lines = i_height_aligned / 2; + p_pic->p[ V_PLANE ].i_visible_lines = i_height / 2; + p_pic->p[ V_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ V_PLANE ].i_visible_pitch = i_width; p_pic->i_planes = 3; break; case FOURCC_I444: - p_pic->p[ Y_PLANE ].i_lines = i_height; - p_pic->p[ Y_PLANE ].i_pitch = i_width; - p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch; - p_pic->p[ U_PLANE ].i_lines = i_height; - p_pic->p[ U_PLANE ].i_pitch = i_width; - p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch; - p_pic->p[ V_PLANE ].i_lines = i_height; - p_pic->p[ V_PLANE ].i_pitch = i_width; - p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch; + case FOURCC_J444: + p_pic->p[ Y_PLANE ].i_lines = i_height_aligned; + p_pic->p[ Y_PLANE ].i_visible_lines = i_height; + p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; + p_pic->p[ U_PLANE ].i_lines = i_height_aligned; + p_pic->p[ U_PLANE ].i_visible_lines = i_height; + p_pic->p[ U_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ U_PLANE ].i_visible_pitch = i_width; + p_pic->p[ V_PLANE ].i_lines = i_height_aligned; + p_pic->p[ V_PLANE ].i_visible_lines = i_height; + p_pic->p[ V_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ V_PLANE ].i_visible_pitch = i_width; p_pic->i_planes = 3; break; + case FOURCC_YUVA: + p_pic->p[ Y_PLANE ].i_lines = i_height_aligned; + p_pic->p[ Y_PLANE ].i_visible_lines = i_height; + p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; + p_pic->p[ U_PLANE ].i_lines = i_height_aligned; + p_pic->p[ U_PLANE ].i_visible_lines = i_height; + p_pic->p[ U_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ U_PLANE ].i_visible_pitch = i_width; + p_pic->p[ V_PLANE ].i_lines = i_height_aligned; + p_pic->p[ V_PLANE ].i_visible_lines = i_height; + p_pic->p[ V_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ V_PLANE ].i_visible_pitch = i_width; + p_pic->p[ A_PLANE ].i_lines = i_height_aligned; + p_pic->p[ A_PLANE ].i_visible_lines = i_height; + p_pic->p[ A_PLANE ].i_pitch = i_width_aligned; + p_pic->p[ A_PLANE ].i_visible_pitch = i_width; + p_pic->i_planes = 4; + break; + + case FOURCC_YUVP: + p_pic->p->i_lines = i_height_aligned; + p_pic->p->i_visible_lines = i_height; + p_pic->p->i_pitch = i_width_aligned; + p_pic->p->i_visible_pitch = i_width; + p_pic->p->i_pixel_pitch = 8; + p_pic->i_planes = 1; + break; + case FOURCC_Y211: - p_pic->p->i_lines = i_height; - p_pic->p->i_pitch = i_width; - p_pic->p->i_visible_pitch = p_pic->p->i_pitch; + p_pic->p->i_lines = i_height_aligned; + p_pic->p->i_visible_lines = i_height; + p_pic->p->i_pitch = i_width_aligned; + p_pic->p->i_visible_pitch = i_width; p_pic->p->i_pixel_pitch = 4; p_pic->i_planes = 1; break; case FOURCC_UYVY: case FOURCC_YUY2: - p_pic->p->i_lines = i_height; - p_pic->p->i_pitch = i_width * 2; - p_pic->p->i_visible_pitch = p_pic->p->i_pitch; + p_pic->p->i_lines = i_height_aligned; + p_pic->p->i_visible_lines = i_height; + p_pic->p->i_pitch = i_width_aligned * 2; + p_pic->p->i_visible_pitch = i_width * 2; p_pic->p->i_pixel_pitch = 4; p_pic->i_planes = 1; break; case FOURCC_RGB2: - p_pic->p->i_lines = i_height; - p_pic->p->i_pitch = i_width; - p_pic->p->i_visible_pitch = p_pic->p->i_pitch; + p_pic->p->i_lines = i_height_aligned; + p_pic->p->i_visible_lines = i_height; + p_pic->p->i_pitch = i_width_aligned; + p_pic->p->i_visible_pitch = i_width; p_pic->p->i_pixel_pitch = 1; p_pic->i_planes = 1; break; case FOURCC_RV15: - p_pic->p->i_lines = i_height; - p_pic->p->i_pitch = i_width * 2; - p_pic->p->i_visible_pitch = p_pic->p->i_pitch; + p_pic->p->i_lines = i_height_aligned; + p_pic->p->i_visible_lines = i_height; + p_pic->p->i_pitch = i_width_aligned * 2; + p_pic->p->i_visible_pitch = i_width * 2; p_pic->p->i_pixel_pitch = 2; -/* FIXME: p_heap isn't always reachable - p_pic->p_heap->i_rmask = 0x001f; - p_pic->p_heap->i_gmask = 0x03e0; - p_pic->p_heap->i_bmask = 0x7c00; */ p_pic->i_planes = 1; break; case FOURCC_RV16: - p_pic->p->i_lines = i_height; - p_pic->p->i_pitch = i_width * 2; - p_pic->p->i_visible_pitch = p_pic->p->i_pitch; + p_pic->p->i_lines = i_height_aligned; + p_pic->p->i_visible_lines = i_height; + p_pic->p->i_pitch = i_width_aligned * 2; + p_pic->p->i_visible_pitch = i_width * 2; p_pic->p->i_pixel_pitch = 2; -/* FIXME: p_heap isn't always reachable - p_pic->p_heap->i_rmask = 0x001f; - p_pic->p_heap->i_gmask = 0x07e0; - p_pic->p_heap->i_bmask = 0xf800; */ p_pic->i_planes = 1; break; case FOURCC_RV24: - p_pic->p->i_lines = i_height; - - /* FIXME: Should be 3 here but x11 and our chroma conversion - * routines assume 4. */ -#ifdef WIN32 - p_pic->p->i_pitch = i_width * 3; + p_pic->p->i_lines = i_height_aligned; + p_pic->p->i_visible_lines = i_height; + p_pic->p->i_pitch = i_width_aligned * 3; + p_pic->p->i_visible_pitch = i_width * 3; p_pic->p->i_pixel_pitch = 3; -#else - p_pic->p->i_pitch = i_width * 4; - p_pic->p->i_pixel_pitch = 4; -#endif - p_pic->p->i_visible_pitch = p_pic->p->i_pitch; -/* FIXME: p_heap isn't always reachable - p_pic->p_heap->i_rmask = 0xff0000; - p_pic->p_heap->i_gmask = 0x00ff00; - p_pic->p_heap->i_bmask = 0x0000ff; */ p_pic->i_planes = 1; break; case FOURCC_RV32: - p_pic->p->i_lines = i_height; - p_pic->p->i_pitch = i_width * 4; - p_pic->p->i_visible_pitch = p_pic->p->i_pitch; + case FOURCC_RGBA: + p_pic->p->i_lines = i_height_aligned; + p_pic->p->i_visible_lines = i_height; + p_pic->p->i_pitch = i_width_aligned * 4; + p_pic->p->i_visible_pitch = i_width * 4; p_pic->p->i_pixel_pitch = 4; -/* FIXME: p_heap isn't always reachable - p_pic->p_heap->i_rmask = 0xff0000; - p_pic->p_heap->i_gmask = 0x00ff00; - p_pic->p_heap->i_bmask = 0x0000ff; */ p_pic->i_planes = 1; break; - case FOURCC_YUVA: - p_pic->p[ Y_PLANE ].i_lines = i_height; - p_pic->p[ Y_PLANE ].i_pitch = i_width; - p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch; - p_pic->p[ U_PLANE ].i_lines = i_height; - p_pic->p[ U_PLANE ].i_pitch = i_width; - p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch; - p_pic->p[ V_PLANE ].i_lines = i_height; - p_pic->p[ V_PLANE ].i_pitch = i_width; - p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch; - p_pic->p[ A_PLANE ].i_lines = i_height; - p_pic->p[ A_PLANE ].i_pitch = i_width; - p_pic->p[ A_PLANE ].i_visible_pitch = p_pic->p[ A_PLANE ].i_pitch; - p_pic->i_planes = 4; + + 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; + p_pic->p->i_visible_pitch = i_width; + p_pic->p->i_pixel_pitch = 1; + p_pic->i_planes = 1; + break; default: - msg_Err( p_this, "unknown chroma type 0x%.8x (%4.4s)", - i_chroma, (char*)&i_chroma ); + if( p_this ) + msg_Err( p_this, "unknown chroma type 0x%.8x (%4.4s)", + i_chroma, (char*)&i_chroma ); p_pic->i_planes = 0; - return; + return VLC_EGENERIC; } + + return VLC_SUCCESS; } /** @@ -826,49 +1001,114 @@ int vout_ChromaCmp( vlc_fourcc_t i_chroma, vlc_fourcc_t i_amorhc ) return 0; } + case FOURCC_GREY: + case FOURCC_Y800: + case FOURCC_Y8: + switch( i_amorhc ) + { + case FOURCC_GREY: + case FOURCC_Y800: + case FOURCC_Y8: + return 1; + + default: + return 0; + } + default: return 0; } } -/* Following functions are local */ +/***************************************************************************** + * + *****************************************************************************/ +static void PictureReleaseCallback( picture_t *p_picture ) +{ + if( --p_picture->i_refcount > 0 ) + return; + picture_Delete( p_picture ); +} +/***************************************************************************** + * + *****************************************************************************/ +picture_t *picture_New( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_aspect ) +{ + picture_t *p_picture = calloc( 1, sizeof(*p_picture) ); + if( !p_picture ) + return NULL; + + if( __vout_AllocatePicture( NULL, p_picture, + i_chroma, i_width, i_height, i_aspect ) ) + { + free( p_picture ); + return NULL; + } + + p_picture->i_refcount = 1; + p_picture->pf_release = PictureReleaseCallback; + p_picture->i_status = RESERVED_PICTURE; + + return p_picture; +} + +/***************************************************************************** + * + *****************************************************************************/ +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 ); +} /***************************************************************************** - * 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. + * *****************************************************************************/ -static void CopyPicture( vout_thread_t * p_vout, - picture_t *p_src, picture_t *p_dest ) +void picture_CopyPixels( picture_t *p_dst, const picture_t *p_src ) { int i; for( i = 0; i < p_src->i_planes ; i++ ) + plane_CopyPixels( p_dst->p+i, p_src->p+i ); +} + +void plane_CopyPixels( plane_t *p_dst, const plane_t *p_src ) +{ + const unsigned i_width = __MIN( p_dst->i_visible_pitch, + p_src->i_visible_pitch ); + const unsigned i_height = __MIN( p_dst->i_visible_lines, + p_src->i_visible_lines ); + + if( p_src->i_pitch == p_dst->i_pitch ) { - if( p_src->p[i].i_pitch == p_dest->p[i].i_pitch ) - { - /* There are margins, but with the same width : perfect ! */ - p_vout->p_vlc->pf_memcpy( - p_dest->p[i].p_pixels, p_src->p[i].p_pixels, - p_src->p[i].i_pitch * p_src->p[i].i_lines ); - } - else - { - /* We need to proceed line by line */ - uint8_t *p_in = p_src->p[i].p_pixels; - uint8_t *p_out = p_dest->p[i].p_pixels; - int i_line; + /* There are margins, but with the same width : perfect ! */ + vlc_memcpy( p_dst->p_pixels, p_src->p_pixels, + p_src->i_pitch * i_height ); + } + else + { + /* We need to proceed line by line */ + uint8_t *p_in = p_src->p_pixels; + uint8_t *p_out = p_dst->p_pixels; + int i_line; - for( i_line = p_src->p[i].i_lines; i_line--; ) - { - p_vout->p_vlc->pf_memcpy( p_out, p_in, - p_src->p[i].i_visible_pitch ); - p_in += p_src->p[i].i_pitch; - p_out += p_dest->p[i].i_pitch; - } + assert( p_in ); + assert( p_out ); + + for( i_line = i_height; i_line--; ) + { + vlc_memcpy( p_out, p_in, i_width ); + p_in += p_src->i_pitch; + p_out += p_dst->i_pitch; } } - p_dest->date = p_src->date; } + +/***************************************************************************** + * + *****************************************************************************/ +