#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
*
picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
subpicture_t *p_subpic )
{
+ video_format_t fmt;
+ int i_scale_width, i_scale_height;
+
if( p_pic == NULL )
{
/* XXX: subtitles */
return NULL;
}
+ fmt.i_aspect = p_vout->output.i_aspect;
+ fmt.i_chroma = p_vout->output.i_chroma;
+ fmt.i_width = p_vout->output.i_width;
+ fmt.i_height = p_vout->output.i_height;
+ fmt.i_sar_num = p_vout->output.i_aspect * fmt.i_height / fmt.i_width;
+ fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+ i_scale_width = p_vout->output.i_width * 1000 / p_vout->render.i_width;
+ i_scale_height = p_vout->output.i_height * 1000 / p_vout->render.i_height;
+
if( p_pic->i_type == DIRECT_PICTURE )
{
if( !p_vout->render.b_allow_modify_pics || p_pic->i_refcount ||
/* 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, &fmt,
+ PP_OUTPUTPICTURE[0], p_pic, p_subpic,
+ i_scale_width, i_scale_height );
return 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_pic, p_subpic );
+ spu_RenderSubpictures( p_vout->p_spu, &fmt, p_pic, p_pic, p_subpic,
+ i_scale_width, i_scale_height );
return 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, &fmt, 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] );
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, &fmt, 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
{
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, &fmt, &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 )
* 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;
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 *
if( p_pic->p_data == NULL )
{
p_pic->i_planes = 0;
- return;
+ return VLC_EGENERIC;
}
/* Fill the p_pixels field for each plane */
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;
}
/**
* \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;
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;
}
/**
}
}
-/* 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;
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 );
}
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;
}
projects / vlc / blobdiff