/*****************************************************************************
* vout_pictures.c : picture management functions
*****************************************************************************
- * Copyright (C) 2000 VideoLAN
- * $Id: vout_pictures.c,v 1.37 2003/04/20 12:59:02 massiot Exp $
+ * Copyright (C) 2000-2004 the VideoLAN team
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
*
* 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 <stdlib.h> /* free() */
-#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
-#include <vlc/vlc.h>
-
-#include "video.h"
-#include "video_output.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <vlc_common.h>
+#include <vlc_vout.h>
+#include <vlc_osd.h>
+#include <vlc_filter.h>
#include "vout_pictures.h"
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static void CopyPicture( vout_thread_t *, picture_t *, picture_t * );
+#include <assert.h>
-/*****************************************************************************
- * vout_DisplayPicture: 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
+/**
+ * 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.
- *****************************************************************************/
+ */
void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->picture_lock );
vlc_mutex_unlock( &p_vout->picture_lock );
}
-/*****************************************************************************
- * vout_DatePicture: date a picture
- *****************************************************************************
+/**
+ * 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_unlock( &p_vout->picture_lock );
}
-/*****************************************************************************
- * vout_CreatePicture: allocate a picture in the video output heap.
- *****************************************************************************
+/**
+ * Allocate a picture in the video output heap.
+ *
* This function creates a reserved image in the video output heap.
* A null pointer is returned if the function fails. This method provides an
- * already allocated zone of memory in the picture data fields. It needs locking
- * since several pictures can be created by several producers threads.
- *****************************************************************************/
+ * already allocated zone of memory in the picture data fields.
+ * 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,
- vlc_bool_t b_repeat_first_field )
+ bool b_progressive,
+ bool b_top_field_first,
+ unsigned int i_nb_fields )
{
int i_pic; /* picture index */
picture_t * p_pic;
p_pic->b_force = 0;
p_pic->b_progressive = b_progressive;
- p_pic->b_repeat_first_field = b_repeat_first_field;
+ p_pic->i_nb_fields = i_nb_fields;
p_pic->b_top_field_first = b_top_field_first;
p_vout->i_heap_size++;
*/
if( p_freepic != NULL )
{
- vout_AllocatePicture( p_vout, p_freepic,
+ vout_AllocatePicture( VLC_OBJECT(p_vout),
+ p_freepic, p_vout->render.i_chroma,
p_vout->render.i_width, p_vout->render.i_height,
- p_vout->render.i_chroma );
+ p_vout->render.i_aspect );
if( p_freepic->i_planes )
{
/* 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;
p_freepic->b_progressive = b_progressive;
- p_freepic->b_repeat_first_field = b_repeat_first_field;
+ p_freepic->i_nb_fields = i_nb_fields;
p_freepic->b_top_field_first = b_top_field_first;
p_freepic->i_matrix_coefficients = 1;
return( NULL );
}
-/*****************************************************************************
- * vout_DestroyPicture: remove a permanent or reserved picture from the heap
- *****************************************************************************
+/**
+ * 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 !
- *****************************************************************************/
+ */
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) &&
vlc_mutex_unlock( &p_vout->picture_lock );
}
-/*****************************************************************************
- * vout_LinkPicture: increment reference counter of a picture
- *****************************************************************************
+/**
+ * Increment reference counter of a picture
+ *
* This function increments the reference counter of a picture in the video
* heap. It needs a lock since several producer threads can access the picture.
- *****************************************************************************/
+ */
void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->picture_lock );
vlc_mutex_unlock( &p_vout->picture_lock );
}
-/*****************************************************************************
- * vout_UnlinkPicture: decrement reference counter of a picture
- *****************************************************************************
- * This function decrement the reference counter of a picture in the video heap.
- *****************************************************************************/
+/**
+ * Decrement reference counter of a picture
+ *
+ * This function decrement the reference counter of a picture in the video heap
+ */
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 ) )
{
vlc_mutex_unlock( &p_vout->picture_lock );
}
-/*****************************************************************************
- * vout_RenderPicture: render a picture
- *****************************************************************************
+/**
+ * Render a picture
+ *
* This function chooses whether the current picture needs to be copied
* 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 )
{
+ 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
/* 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];
}
/* 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;
}
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] );
* 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] );
return &p_vout->p_picture[0];
}
-/*****************************************************************************
- * vout_PlacePicture: calculate image window coordinates
- *****************************************************************************
+/**
+ * Calculate image window coordinates
+ *
* 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,
unsigned int i_width, unsigned int i_height,
unsigned int *pi_x, unsigned int *pi_y,
if( (i_width <= 0) || (i_height <=0) )
{
*pi_width = *pi_height = *pi_x = *pi_y = 0;
-
return;
}
}
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;
+ *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;
}
- if( *pi_width > i_width )
+ switch( p_vout->i_alignment & VOUT_ALIGN_HMASK )
{
- *pi_width = i_width;
- *pi_height = VOUT_ASPECT_FACTOR * *pi_width / p_vout->render.i_aspect;
+ case VOUT_ALIGN_LEFT:
+ *pi_x = 0;
+ break;
+ case VOUT_ALIGN_RIGHT:
+ *pi_x = i_width - *pi_width;
+ break;
+ default:
+ *pi_x = ( i_width - *pi_width ) / 2;
}
- if( *pi_height > i_height )
+ switch( p_vout->i_alignment & VOUT_ALIGN_VMASK )
{
- *pi_height = i_height;
- *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR;
+ case VOUT_ALIGN_TOP:
+ *pi_y = 0;
+ break;
+ case VOUT_ALIGN_BOTTOM:
+ *pi_y = i_height - *pi_height;
+ break;
+ default:
+ *pi_y = ( i_height - *pi_height ) / 2;
}
-
- *pi_x = ( i_width - *pi_width ) / 2;
- *pi_y = ( i_height - *pi_height ) / 2;
}
-/*****************************************************************************
- * vout_AllocatePicture: allocate a new picture in the heap.
- *****************************************************************************
+/**
+ * Allocate a new picture in the heap.
+ *
* This function allocates a fake direct buffer in memory, which can be
* used exactly like a video buffer. The video output thread then manages
* how it gets displayed.
- *****************************************************************************/
-void vout_AllocatePicture( vout_thread_t *p_vout, picture_t *p_pic,
- int i_width, int i_height, vlc_fourcc_t i_chroma )
+ */
+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;
+
+ /* 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 *
+ 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 VLC_EGENERIC;
+ }
+
+ /* Fill the p_pixels field for each plane */
+ p_pic->p[ 0 ].p_pixels = p_pic->p_data;
+
+ 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;
+ }
+
+ return VLC_SUCCESS;
+}
+
+/**
+ * Initialise the video format fields given chroma/size.
+ *
+ * This function initializes all the video_frame_format_t fields given the
+ * static properties of a picture (chroma and size).
+ * \param p_format Pointer to the format structure to initialize
+ * \param i_chroma Chroma to set
+ * \param i_width Width to set
+ * \param i_height Height to set
+ * \param i_aspect Aspect ratio
+ */
+void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
+ int i_width, int i_height, int i_aspect )
+{
+ p_format->i_chroma = i_chroma;
+ p_format->i_width = p_format->i_visible_width = i_width;
+ p_format->i_height = p_format->i_visible_height = i_height;
+ p_format->i_x_offset = p_format->i_y_offset = 0;
+ p_format->i_aspect = i_aspect;
+
+#if 0
+ /* Assume we have square pixels */
+ if( i_width && i_height )
+ p_format->i_aspect = i_width * VOUT_ASPECT_FACTOR / i_height;
+ else
+ p_format->i_aspect = 0;
+#endif
+
+ 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_I411:
+ case FOURCC_YV12:
+ case FOURCC_I420:
+ case FOURCC_J420:
+ case FOURCC_IYUV:
+ p_format->i_bits_per_pixel = 12;
+ break;
+ case FOURCC_I410:
+ case FOURCC_YVU9:
+ p_format->i_bits_per_pixel = 9;
+ break;
+ 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:
+ p_format->i_bits_per_pixel = 24;
+ break;
+ case FOURCC_RV15:
+ case FOURCC_RV16:
+ p_format->i_bits_per_pixel = 16;
+ break;
+ 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;
+ }
+}
+
+/**
+ * Initialise the picture_t fields given chroma/size.
+ *
+ * This function initializes most of the picture_t fields given a chroma and
+ * size. It makes the assumption that stride == width.
+ * \param p_this The calling object
+ * \param p_pic Pointer to the picture to initialize
+ * \param i_chroma The chroma fourcc to set
+ * \param i_width The width of the picture
+ * \param i_height The height of the picture
+ * \param i_aspect The aspect ratio of the picture
+ */
+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;
/* Store default values */
for( i_index = 0; i_index < VOUT_MAX_PLANES; i_index++ )
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_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:
- 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;
+ case FOURCC_YVU9:
+ 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;
- p_pic->p->i_pitch = i_width * 3;
- 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 * 3;
+ p_pic->p->i_visible_pitch = i_width * 3;
p_pic->p->i_pixel_pitch = 3;
-/* 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_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_vout, "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;
}
- /* Calculate how big the new image should be */
- for( i_bytes = 0, i_index = 0; i_index < p_pic->i_planes; i_index++ )
- {
- i_bytes += p_pic->p[ i_index ].i_lines * p_pic->p[ i_index ].i_pitch;
- }
-
- 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;
- }
-
- /* Fill the p_pixels field for each plane */
- p_pic->p[ 0 ].p_pixels = p_pic->p_data;
-
- 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;
- }
+ return VLC_SUCCESS;
}
-/*****************************************************************************
- * vout_ChromaCmp: compare two chroma values
- *****************************************************************************
+/**
+ * Compare two chroma values
+ *
* This function returns 1 if the two fourcc values given as argument are
- * the same format (eg. UYVY / UYNV) or almost the same format (eg. I420/YV12)
- *****************************************************************************/
+ * the same format (eg. UYVY/UYNV) or almost the same format (eg. I420/YV12)
+ */
int vout_ChromaCmp( vlc_fourcc_t i_chroma, vlc_fourcc_t i_amorhc )
{
/* If they are the same, they are the same ! */
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;
}
+
+/*****************************************************************************
+ *
+ *****************************************************************************/
+
+
projects / vlc / blobdiff