X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_pictures.c;h=55895f756c99b62e481215e75984058d65ae09b1;hb=2e812d10e98bb36a52947297c3059da6d32812dc;hp=1e82e817a14426a6954e97983a7d8aab87d7834a;hpb=32329d4ff2744d73f6dda89502a06c3cb50ca38a;p=vlc diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c index 1e82e817a1..55895f756c 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,27 +19,24 @@ * * 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 "vout_pictures.h" -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static void CopyPicture( vout_thread_t *, picture_t *, picture_t * ); +#include /** * Display a picture @@ -109,9 +106,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 +204,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; @@ -222,7 +249,7 @@ 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) && @@ -262,13 +289,6 @@ 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", - p_pic, p_pic->i_refcount ); - p_pic->i_refcount = 0; - } - if( ( p_pic->i_refcount == 0 ) && ( p_pic->i_status == DISPLAYED_PICTURE ) ) { @@ -289,16 +309,23 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, subpicture_t *p_subpic ) { + 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 ) { - if( !p_vout->render.b_allow_modify_pics || p_pic->i_refcount ) + if( !p_vout->render.b_allow_modify_pics || p_pic->i_refcount || + p_pic->b_force ) { /* Picture is in a direct buffer and is still in use, * we need to copy it to another direct buffer before @@ -308,9 +335,11 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, /* We have subtitles. First copy the picture to * the spare direct buffer, then render the * subtitles. */ - CopyPicture( p_vout, p_pic, PP_OUTPUTPICTURE[0] ); + vout_CopyPicture( p_vout, PP_OUTPUTPICTURE[0], p_pic ); - vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_subpic ); + spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, + PP_OUTPUTPICTURE[0], p_pic, p_subpic, + i_scale_width, i_scale_height ); return PP_OUTPUTPICTURE[0]; } @@ -324,7 +353,8 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, /* 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 ); + spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, p_pic, p_pic, + p_subpic, i_scale_width, i_scale_height ); return p_pic; } @@ -339,16 +369,12 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, 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] ); - - vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_subpic ); + 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 ); if( PP_OUTPUTPICTURE[0]->pf_unlock ) PP_OUTPUTPICTURE[0]->pf_unlock( p_vout, PP_OUTPUTPICTURE[0] ); @@ -361,15 +387,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] ) ) - return NULL; + 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_chroma->p_owner = (filter_owner_sys_t *)p_tmp_pic; + p_vout->p_chroma->pf_video_filter( p_vout->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 ); + + if( p_vout->p_picture[0].pf_lock ) + if( p_vout->p_picture[0].pf_lock( p_vout, &p_vout->p_picture[0] ) ) + return NULL; + + vout_CopyPicture( p_vout, &p_vout->p_picture[0], p_tmp_pic ); + } + else + { + if( p_vout->p_picture[0].pf_lock ) + if( p_vout->p_picture[0].pf_lock( 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] ); + /* 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 ); - /* Render subpictures on the first direct buffer */ - vout_RenderSubPictures( p_vout, &p_vout->p_picture[0], p_subpic ); + /* 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 ); + } if( p_vout->p_picture[0].pf_unlock ) p_vout->p_picture[0].pf_unlock( p_vout, &p_vout->p_picture[0] ); @@ -391,7 +457,6 @@ void vout_PlacePicture( vout_thread_t *p_vout, if( (i_width <= 0) || (i_height <=0) ) { *pi_width = *pi_height = *pi_x = *pi_y = 0; - return; } @@ -402,29 +467,23 @@ void vout_PlacePicture( vout_thread_t *p_vout, } else { - *pi_width = __MIN( i_width, p_vout->render.i_width ); - *pi_height = __MIN( i_height, p_vout->render.i_height ); + *pi_width = __MIN( i_width, p_vout->fmt_in.i_visible_width ); + *pi_height = __MIN( i_height, p_vout->fmt_in.i_visible_height ); } - if( VOUT_ASPECT_FACTOR * *pi_width / *pi_height < p_vout->render.i_aspect ) + if( 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 > *pi_width ) { - *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR; + *pi_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; } else { - *pi_height = *pi_width * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect; - } - - if( *pi_width > i_width ) - { - *pi_width = i_width; - *pi_height = VOUT_ASPECT_FACTOR * *pi_width / p_vout->render.i_aspect; - } - - if( *pi_height > i_height ) - { - *pi_height = i_height; - *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR; + *pi_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; } switch( p_vout->i_alignment & VOUT_ALIGN_HMASK ) @@ -459,25 +518,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 +552,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 +589,23 @@ 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: - p_format->i_bits_per_pixel = 16; + case FOURCC_J422: 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 +616,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 +634,13 @@ 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: + p_format->i_bits_per_pixel = 8; + break; + default: p_format->i_bits_per_pixel = 0; break; @@ -580,11 +659,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 +672,220 @@ 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 = 0; + p_pic->pf_lock = 0; + p_pic->pf_unlock = 0; + p_pic->i_refcount = 0; + 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_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: + 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 +945,127 @@ 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 */ - /***************************************************************************** - * CopyPicture: copy a picture to another one + * 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. *****************************************************************************/ -static void CopyPicture( vout_thread_t * p_vout, - picture_t *p_src, picture_t *p_dest ) +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 ); +} + +/***************************************************************************** + * + *****************************************************************************/ +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 = malloc( 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 ) ) + { + 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_data_orig ); + free( p_picture->p_sys ); + free( p_picture ); +} + +/***************************************************************************** + * + *****************************************************************************/ +void picture_CopyPixels( picture_t *p_dst, const picture_t *p_src ) { int i; for( i = 0; i < p_src->i_planes ; i++ ) { - if( p_src->p[i].i_pitch == p_dest->p[i].i_pitch ) + const unsigned i_width = __MIN( p_dst->p[i].i_visible_pitch, + p_src->p[i].i_visible_pitch ); + const unsigned i_height = __MIN( p_dst->p[i].i_visible_lines, + p_src->p[i].i_visible_lines ); + + if( p_src->p[i].i_pitch == p_dst->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 ); + vlc_memcpy( p_dst->p[i].p_pixels, p_src->p[i].p_pixels, + p_src->p[i].i_pitch * i_height ); } 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; + uint8_t *p_out = p_dst->p[i].p_pixels; int i_line; - for( i_line = p_src->p[i].i_lines; i_line--; ) + assert( p_in ); + assert( p_out ); + + for( i_line = i_height; i_line--; ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, - p_src->p[i].i_visible_pitch ); + vlc_memcpy( p_out, p_in, i_width ); p_in += p_src->p[i].i_pitch; - p_out += p_dest->p[i].i_pitch; + p_out += p_dst->p[i].i_pitch; } } } - p_dest->date = p_src->date; } + +/***************************************************************************** + * + *****************************************************************************/ + +