X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_pictures.c;h=0cb0c72c7749b4b2d5c50e406351453d2ddd4607;hb=c9b3270a32eda5ba84d561461d734091e186ff1d;hp=8a65f8aeb2bb190bf43c14a52fd146f3314d1269;hpb=c1017cc7af170b5a94b1f63d7f02d3a6d0ab9810;p=vlc diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c index 8a65f8aeb2..0cb0c72c77 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,7 +19,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -33,14 +33,10 @@ #include "vlc_video.h" #include "video_output.h" +#include "vlc_spu.h" #include "vout_pictures.h" -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static void CopyPicture( vout_thread_t *, picture_t *, picture_t * ); - /** * Display a picture * @@ -290,13 +286,19 @@ 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 || @@ -310,10 +312,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_pic , 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]; } @@ -327,7 +330,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_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; } @@ -342,15 +346,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_pic, 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] ); @@ -372,10 +373,10 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, if( p_tmp_pic->i_status == FREE_PICTURE ) { vout_AllocatePicture( VLC_OBJECT(p_vout), - p_tmp_pic, p_vout->output.i_chroma, - p_vout->output.i_width, - p_vout->output.i_height, - p_vout->output.i_aspect ); + 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; } @@ -384,13 +385,15 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, p_vout->chroma.pf_convert( p_vout, p_pic, p_tmp_pic ); /* Render subpictures on the first direct buffer */ - vout_RenderSubPictures( p_vout, p_tmp_pic, p_tmp_pic, p_subpic ); + 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; - CopyPicture( p_vout, p_tmp_pic, &p_vout->p_picture[0] ); + vout_CopyPicture( p_vout, &p_vout->p_picture[0], p_tmp_pic ); } else { @@ -402,8 +405,9 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, p_vout->chroma.pf_convert( p_vout, p_pic, &p_vout->p_picture[0] ); /* Render subpictures on the first direct buffer */ - vout_RenderSubPictures( p_vout, &p_vout->p_picture[0], - &p_vout->p_picture[0], p_subpic ); + 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 ) @@ -426,7 +430,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; } @@ -437,29 +440,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 ) @@ -494,9 +491,9 @@ 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, i_width_aligned, i_height_aligned; @@ -504,8 +501,12 @@ void vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic, i_width_aligned = (i_width + 15) >> 4 << 4; i_height_aligned = (i_height + 15) >> 4 << 4; - vout_InitPicture( p_this, p_pic, i_chroma, - i_width, i_height, i_aspect ); + 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 * @@ -516,7 +517,7 @@ void vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic, if( p_pic->p_data == NULL ) { p_pic->i_planes = 0; - return; + return VLC_EGENERIC; } /* Fill the p_pixels field for each plane */ @@ -527,6 +528,8 @@ void vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic, 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; } /** @@ -563,17 +566,20 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma, 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; 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; @@ -619,9 +625,9 @@ 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, i_width_aligned, i_height_aligned; @@ -682,6 +688,7 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, case FOURCC_YV12: case FOURCC_I420: case FOURCC_IYUV: + 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; @@ -698,6 +705,7 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, break; case FOURCC_I422: + 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; @@ -714,6 +722,7 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, break; case FOURCC_I444: + 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; @@ -826,8 +835,10 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, 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; } /** @@ -892,17 +903,15 @@ int vout_ChromaCmp( vlc_fourcc_t i_chroma, vlc_fourcc_t i_amorhc ) } } -/* 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 ) { int i; @@ -911,7 +920,7 @@ static void CopyPicture( vout_thread_t * p_vout, 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_this->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_visible_lines ); } @@ -924,12 +933,17 @@ static void CopyPicture( vout_thread_t * p_vout, for( i_line = p_src->p[i].i_visible_lines; i_line--; ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_this->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; } } } + p_dest->date = p_src->date; + p_dest->b_force = p_src->b_force; + p_dest->i_nb_fields = p_src->i_nb_fields; + p_dest->b_progressive = p_src->b_progressive; + p_dest->b_top_field_first = p_src->b_top_field_first; }