* vout_pictures.c : picture management functions
*****************************************************************************
* Copyright (C) 2000 VideoLAN
- * $Id: vout_pictures.c,v 1.7 2002/01/02 14:37:42 sam Exp $
+ * $Id: vout_pictures.c,v 1.8 2002/01/04 14:01:35 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* display. The picture won't be displayed until vout_DatePicture has been
* called.
*****************************************************************************/
-void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_picture )
+void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->picture_lock );
- switch( p_picture->i_status )
+ switch( p_pic->i_status )
{
case RESERVED_PICTURE:
- p_picture->i_status = RESERVED_DISP_PICTURE;
+ p_pic->i_status = RESERVED_DISP_PICTURE;
break;
case RESERVED_DATED_PICTURE:
- p_picture->i_status = READY_PICTURE;
+ p_pic->i_status = READY_PICTURE;
break;
#ifdef DEBUG
default:
- intf_ErrMsg("error: picture %p has invalid status %d", p_picture, p_picture->i_status );
+ intf_ErrMsg( "error: picture %p has invalid status %d",
+ p_pic, p_pic->i_status );
break;
#endif
}
#ifdef TRACE_VOUT
- intf_DbgMsg("picture %p", p_picture);
+ intf_DbgMsg("picture %p", p_pic);
#endif
vlc_mutex_unlock( &p_vout->picture_lock );
}
* been called.
*****************************************************************************/
void vout_DatePicture( vout_thread_t *p_vout,
- picture_t *p_picture, mtime_t date )
+ picture_t *p_pic, mtime_t date )
{
#ifdef TRACE_VOUT
char psz_date[ MSTRTIME_MAX_SIZE ]; /* date */
#endif
vlc_mutex_lock( &p_vout->picture_lock );
- p_picture->date = date;
- switch( p_picture->i_status )
+ p_pic->date = date;
+ switch( p_pic->i_status )
{
case RESERVED_PICTURE:
- p_picture->i_status = RESERVED_DATED_PICTURE;
+ p_pic->i_status = RESERVED_DATED_PICTURE;
break;
case RESERVED_DISP_PICTURE:
- p_picture->i_status = READY_PICTURE;
+ p_pic->i_status = READY_PICTURE;
break;
#ifdef DEBUG
default:
- intf_ErrMsg("error: picture %p has invalid status %d", p_picture, p_picture->i_status );
+ intf_ErrMsg( "error: picture %p has invalid status %d",
+ p_pic, p_pic->i_status );
break;
#endif
}
#ifdef TRACE_VOUT
- intf_DbgMsg("picture %p, display date: %s", p_picture, mstrtime( psz_date, p_picture->date) );
+ intf_DbgMsg( "picture %p, display date: %s",
+ p_pic, mstrtime( psz_date, p_pic->date) );
#endif
vlc_mutex_unlock( &p_vout->picture_lock );
}
boolean_t b_top_field_first,
boolean_t b_repeat_first_field )
{
- int i_picture; /* picture index */
- picture_t * p_picture;
- picture_t * p_free_picture = NULL; /* first free picture */
+ int i_pic; /* picture index */
+ picture_t * p_pic;
+ picture_t * p_freepic = NULL; /* first free picture */
/* Get lock */
vlc_mutex_lock( &p_vout->picture_lock );
* Look for an empty place. We start at 1 because the first
* directbuffer is reserved for memcpy()ed pictures.
*/
- for( i_picture = 0;
- i_picture < I_RENDERPICTURES && p_free_picture == NULL;
- i_picture++ )
+ for( i_pic = 0; i_pic < I_RENDERPICTURES && p_freepic == NULL; i_pic++ )
{
- p_picture = PP_RENDERPICTURE[ i_picture ];
+ p_pic = PP_RENDERPICTURE[ i_pic ];
/* If the picture we found is a memory buffer, and we might have
* enough room later for a direct buffer, skip it. If no other
* pictures are found, the video decoder will try again later. */
if( p_vout->b_direct && ( p_vout->output.i_pictures > 3 )
- && ( p_picture->i_type != DIRECT_PICTURE ) )
+ && ( p_pic->i_type != DIRECT_PICTURE ) )
{
break;
}
- switch( p_picture->i_status )
+ switch( p_pic->i_status )
{
case DESTROYED_PICTURE:
/* Memory will not be reallocated, and function can end
* immediately - this is the best possible case, since no
* memory allocation needs to be done */
- p_picture->i_status = RESERVED_PICTURE;
- p_picture->i_refcount = 0;
+ p_pic->i_status = RESERVED_PICTURE;
+ p_pic->i_refcount = 0;
- p_picture->b_progressive = b_progressive;
- p_picture->b_repeat_first_field = b_repeat_first_field;
- p_picture->b_top_field_first = b_top_field_first;
+ p_pic->b_progressive = b_progressive;
+ p_pic->b_repeat_first_field = b_repeat_first_field;
+ p_pic->b_top_field_first = b_top_field_first;
p_vout->i_heap_size++;
vlc_mutex_unlock( &p_vout->picture_lock );
- return( p_picture );
+ return( p_pic );
case FREE_PICTURE:
/* Picture is empty and ready for allocation */
- p_free_picture = p_picture;
+ p_freepic = p_pic;
break;
default:
/*
* Prepare picture
*/
- if( p_free_picture != NULL )
+ if( p_freepic != NULL )
{
- vout_AllocatePicture( p_free_picture,
+ vout_AllocatePicture( p_freepic,
p_vout->render.i_width, p_vout->render.i_height,
p_vout->render.i_chroma );
- if( p_free_picture->i_planes )
+ if( p_freepic->i_planes )
{
/* Copy picture information, set some default values */
- p_free_picture->i_status = RESERVED_PICTURE;
- p_free_picture->i_type = MEMORY_PICTURE;
+ p_freepic->i_status = RESERVED_PICTURE;
+ p_freepic->i_type = MEMORY_PICTURE;
- p_free_picture->i_refcount = 0;
+ p_freepic->i_refcount = 0;
- p_free_picture->b_progressive = b_progressive;
- p_free_picture->b_repeat_first_field = b_repeat_first_field;
- p_free_picture->b_top_field_first = b_top_field_first;
+ p_freepic->b_progressive = b_progressive;
+ p_freepic->b_repeat_first_field = b_repeat_first_field;
+ p_freepic->b_top_field_first = b_top_field_first;
- p_free_picture->i_matrix_coefficients = 1;
+ p_freepic->i_matrix_coefficients = 1;
p_vout->i_heap_size++;
}
else
{
/* Memory allocation failed : set picture as empty */
- p_free_picture->i_status = FREE_PICTURE;
- p_free_picture = NULL;
+ p_freepic->i_status = FREE_PICTURE;
+ p_freepic = NULL;
intf_ErrMsg( "vout error: picture allocation failed" );
}
vlc_mutex_unlock( &p_vout->picture_lock );
/* Initialize mutex */
- vlc_mutex_init( &(p_free_picture->lock_deccount) );
+ vlc_mutex_init( &(p_freepic->lock_deccount) );
- return( p_free_picture );
+ return( p_freepic );
}
/* No free or destroyed picture could be found, but the decoder
* 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_picture )
+void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->picture_lock );
#ifdef DEBUG
/* Check if picture status is valid */
- if( (p_picture->i_status != RESERVED_PICTURE) &&
- (p_picture->i_status != RESERVED_DATED_PICTURE) &&
- (p_picture->i_status != RESERVED_DISP_PICTURE) )
+ if( (p_pic->i_status != RESERVED_PICTURE) &&
+ (p_pic->i_status != RESERVED_DATED_PICTURE) &&
+ (p_pic->i_status != RESERVED_DISP_PICTURE) )
{
intf_ErrMsg( "error: picture %p has invalid status %d",
- p_picture, p_picture->i_status );
+ p_pic, p_pic->i_status );
}
#endif
- p_picture->i_status = DESTROYED_PICTURE;
+ p_pic->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
/* destroy the lock that had been initialized in CreatePicture */
- vlc_mutex_destroy( &(p_picture->lock_deccount) );
+ vlc_mutex_destroy( &(p_pic->lock_deccount) );
vlc_mutex_unlock( &p_vout->picture_lock );
}
* 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_picture )
+void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->picture_lock );
- p_picture->i_refcount++;
+ p_pic->i_refcount++;
#ifdef TRACE_VOUT
- intf_DbgMsg( "picture %p refcount=%d", p_picture, p_picture->i_refcount );
+ intf_DbgMsg( "picture %p refcount=%d", p_pic, p_pic->i_refcount );
#endif
vlc_mutex_unlock( &p_vout->picture_lock );
*****************************************************************************
* This function decrement the reference counter of a picture in the video heap.
*****************************************************************************/
-void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_picture )
+void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->picture_lock );
- p_picture->i_refcount--;
+ p_pic->i_refcount--;
#ifdef TRACE_VOUT
- if( p_picture->i_refcount < 0 )
+ if( p_pic->i_refcount < 0 )
{
intf_DbgMsg( "error: refcount < 0" );
- p_picture->i_refcount = 0;
+ p_pic->i_refcount = 0;
}
#endif
- if( ( p_picture->i_refcount == 0 ) &&
- ( p_picture->i_status == DISPLAYED_PICTURE ) )
+ if( ( p_pic->i_refcount == 0 ) &&
+ ( p_pic->i_status == DISPLAYED_PICTURE ) )
{
- p_picture->i_status = DESTROYED_PICTURE;
+ p_pic->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
}
#ifdef TRACE_VOUT
- intf_DbgMsg( "picture %p refcount=%d", p_picture, p_picture->i_refcount );
+ intf_DbgMsg( "picture %p refcount=%d", p_pic, p_pic->i_refcount );
#endif
vlc_mutex_unlock( &p_vout->picture_lock );
* 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_picture,
+picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
subpicture_t *p_subpic )
{
- int i_index;
-
- if( p_picture == NULL )
+ if( p_pic == NULL )
{
/* XXX: subtitles */
return NULL;
}
- if( p_picture->i_type == DIRECT_PICTURE )
+ if( p_pic->i_type == DIRECT_PICTURE )
{
- if( p_picture->i_refcount )
+ if( p_pic->i_refcount )
{
/* 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. */
- for( i_index = 0 ; i_index < p_picture->i_planes ; i_index++ )
- {
- FAST_MEMCPY(
- PP_OUTPUTPICTURE[0]->planes[ i_index ].p_data,
- p_picture->planes[ i_index ].p_data,
- p_picture->planes[ i_index ].i_bytes );
- }
+ vout_CopyPicture( p_pic, PP_OUTPUTPICTURE[0] );
vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_subpic );
* we can display it directly even if it is still
* in use. */
//printf("direct (refcount == 0)\n");
- return p_picture;
+ return 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. */
//printf("direct (refcount == 0)\n");
- vout_RenderSubPictures( p_vout, p_picture, p_subpic );
+ vout_RenderSubPictures( p_vout, p_pic, p_subpic );
- return p_picture;
+ return p_pic;
}
/* Not a direct buffer. We either need to copy it to a direct buffer,
* same size as the direct buffers. A memcpy() is enough,
* then render the subtitles. */
//printf("memcpy (not a direct buffer)\n");
- for( i_index = 0; i_index < p_picture->i_planes; i_index++ )
- {
- FAST_MEMCPY( PP_OUTPUTPICTURE[0]->planes[ i_index ].p_data,
- p_picture->planes[ i_index ].p_data,
- p_picture->planes[ i_index ].i_bytes );
- }
+ vout_CopyPicture( p_pic, PP_OUTPUTPICTURE[0] );
vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_subpic );
/* XXX: render to the first direct buffer */
//printf("render (not a direct buffer)\n");
- p_vout->chroma.pf_convert( p_vout, p_picture, &p_vout->p_picture[0] );
+ p_vout->chroma.pf_convert( p_vout, p_pic, &p_vout->p_picture[0] );
- vout_RenderSubPictures( p_vout, p_picture, p_subpic );
+ vout_RenderSubPictures( p_vout, p_pic, p_subpic );
return &p_vout->p_picture[0];
}
* used exactly like a video buffer. The video output thread then manages
* how it gets displayed.
*****************************************************************************/
-void vout_AllocatePicture( picture_t *p_picture,
- int i_width, int i_height, int i_chroma )
+void vout_AllocatePicture( picture_t *p_pic,
+ int i_width, int i_height, u32 i_chroma )
{
-#define P p_picture->planes
int i_bytes, i_index;
+ /* Store default values */
+ for( i_index = 0; i_index < VOUT_MAX_PLANES; i_index++ )
+ {
+ p_pic->p[i_index].p_pixels = NULL;
+ p_pic->p[i_index].b_margin = 0;
+ p_pic->p[i_index].i_pixel_bytes = 1;
+ }
+
/* Calculate coordinates */
switch( i_chroma )
{
- case FOURCC_YV12: /* YUV 420: 1,1/4,1/4 samples per pixel */
+ case FOURCC_YV12:
case FOURCC_I420:
case FOURCC_IYUV:
- P[ Y_PLANE ].i_bytes = i_width * i_height;
- P[ Y_PLANE ].i_line_bytes = i_width;
- P[ U_PLANE ].i_bytes = i_width * i_height / 4;
- P[ U_PLANE ].i_line_bytes = i_width / 2;
- P[ V_PLANE ].i_bytes = i_width * i_height / 4;
- P[ V_PLANE ].i_line_bytes = i_width / 2;
- p_picture->i_planes = 3;
+ p_pic->p[ Y_PLANE ].i_lines = i_height;
+ p_pic->p[ Y_PLANE ].i_pitch = i_width;
+ p_pic->p[ U_PLANE ].i_lines = i_height / 2;
+ p_pic->p[ U_PLANE ].i_pitch = i_width / 2;
+ p_pic->p[ V_PLANE ].i_lines = i_height / 2;
+ p_pic->p[ V_PLANE ].i_pitch = i_width / 2;
+ p_pic->i_planes = 3;
break;
- case FOURCC_I422: /* YUV 422: 1,1/2,1/2 samples per pixel */
- P[ Y_PLANE ].i_bytes = i_width * i_height;
- P[ Y_PLANE ].i_line_bytes = i_width;
- P[ U_PLANE ].i_bytes = i_width * i_height / 2;
- P[ U_PLANE ].i_line_bytes = i_width / 2;
- P[ V_PLANE ].i_bytes = i_width * i_height / 2;
- P[ V_PLANE ].i_line_bytes = i_width / 2;
- p_picture->i_planes = 3;
+ case FOURCC_I422:
+ p_pic->p[ Y_PLANE ].i_lines = i_height;
+ p_pic->p[ Y_PLANE ].i_pitch = i_width;
+ p_pic->p[ U_PLANE ].i_lines = i_height;
+ p_pic->p[ U_PLANE ].i_pitch = i_width / 2;
+ p_pic->p[ V_PLANE ].i_lines = i_height;
+ p_pic->p[ V_PLANE ].i_pitch = i_width / 2;
+ p_pic->i_planes = 3;
break;
- case FOURCC_I444: /* YUV 444: 1,1,1 samples per pixel */
- P[ Y_PLANE ].i_bytes = i_width * i_height;
- P[ Y_PLANE ].i_line_bytes = i_width;
- P[ U_PLANE ].i_bytes = i_width * i_height;
- P[ U_PLANE ].i_line_bytes = i_width;
- P[ V_PLANE ].i_bytes = i_width * i_height;
- P[ V_PLANE ].i_line_bytes = i_width;
- p_picture->i_planes = 3;
+ case FOURCC_I444:
+ p_pic->p[ Y_PLANE ].i_lines = i_height;
+ p_pic->p[ Y_PLANE ].i_pitch = i_width;
+ p_pic->p[ U_PLANE ].i_lines = i_height;
+ p_pic->p[ U_PLANE ].i_pitch = i_width;
+ p_pic->p[ V_PLANE ].i_lines = i_height;
+ p_pic->p[ V_PLANE ].i_pitch = i_width;
+ p_pic->i_planes = 3;
+ break;
+
+ case FOURCC_Y211:
+ p_pic->p->i_lines = i_height;
+ p_pic->p->i_pitch = i_width;
+ 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_pixel_bytes = 2;
+ p_pic->p->i_red_mask = 0x001f;
+ p_pic->p->i_green_mask = 0x03e0;
+ p_pic->p->i_blue_mask = 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_pixel_bytes = 2;
+ p_pic->p->i_red_mask = 0x001f;
+ p_pic->p->i_green_mask = 0x07e0;
+ p_pic->p->i_blue_mask = 0xf800;
+ p_pic->i_planes = 1;
break;
default:
- intf_ErrMsg( "vout error: unknown chroma type %d", i_chroma );
- p_picture->i_planes = 0;
+ intf_ErrMsg( "vout error: unknown chroma type %.8x", i_chroma );
+ p_pic->i_planes = 0;
return;
}
/* Calculate how big the new image should be */
- for( i_bytes = 0, i_index = 0; i_index < p_picture->i_planes; i_index++ )
+ for( i_bytes = 0, i_index = 0; i_index < p_pic->i_planes; i_index++ )
{
- i_bytes += P[ i_index ].i_bytes;
+ i_bytes += p_pic->p[ i_index ].i_lines * p_pic->p[ i_index ].i_pitch;
}
- P[ 0 ].p_data = memalign( 16, i_bytes );
+ p_pic->p_data = memalign( 16, i_bytes );
- if( P[ 0 ].p_data == NULL )
+ if( p_pic->p_data == NULL )
{
- p_picture->i_planes = 0;
+ p_pic->i_planes = 0;
return;
}
- /* Fill the p_data field for each plane */
- for( i_index = 1; i_index < p_picture->i_planes; i_index++ )
+ /* 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[ i_index ].p_data = P[ i_index-1 ].p_data + P[ i_index-1 ].i_bytes;
+ 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;
}
}