#include <vlc_image.h>
#include <vlc_block.h>
#include <vlc_picture_fifo.h>
+#include <vlc_picture_pool.h>
#include "vout_pictures.h"
#include "vout_internal.h"
p_pic, p_pic->i_status );
}
p_vout->p->i_picture_qtype = p_pic->i_qtype;
+ p_vout->p->b_picture_interlaced = !p_pic->b_progressive;
vlc_mutex_unlock( &p_vout->picture_lock );
}
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_aspect );
+ p_vout->render.i_aspect * p_vout->render.i_height,
+ VOUT_ASPECT_FACTOR * p_vout->render.i_width);
if( p_freepic->i_planes )
{
* 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, bool b_paused )
+ subpicture_t *p_subpic, mtime_t render_date )
{
if( p_pic == NULL )
return NULL;
spu_RenderSubpictures( p_vout->p_spu,
PP_OUTPUTPICTURE[0], &p_vout->fmt_out,
- p_subpic, &p_vout->fmt_in, b_paused );
+ p_subpic, &p_vout->fmt_in, render_date );
vout_UnlockPicture( p_vout, PP_OUTPUTPICTURE[0] );
picture_Copy( PP_OUTPUTPICTURE[0], p_pic );
spu_RenderSubpictures( p_vout->p_spu,
PP_OUTPUTPICTURE[0], &p_vout->fmt_out,
- p_subpic, &p_vout->fmt_in, b_paused );
+ p_subpic, &p_vout->fmt_in, render_date );
vout_UnlockPicture( p_vout, PP_OUTPUTPICTURE[0] );
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_vout->fmt_out.i_sar_num,
+ p_vout->fmt_out.i_sar_den );
p_tmp_pic->i_type = MEMORY_PICTURE;
p_tmp_pic->i_status = RESERVED_PICTURE;
}
/* Render subpictures on the first direct buffer */
spu_RenderSubpictures( p_vout->p_spu,
p_tmp_pic, &p_vout->fmt_out,
- p_subpic, &p_vout->fmt_in, b_paused );
+ p_subpic, &p_vout->fmt_in, render_date );
if( vout_LockPicture( p_vout, &p_vout->p_picture[0] ) )
return NULL;
/* Render subpictures on the first direct buffer */
spu_RenderSubpictures( p_vout->p_spu,
&p_vout->p_picture[0], &p_vout->fmt_out,
- p_subpic, &p_vout->fmt_in, b_paused );
+ p_subpic, &p_vout->fmt_in, render_date );
}
vout_UnlockPicture( p_vout, &p_vout->p_picture[0] );
}
}
+#undef vout_AllocatePicture
/**
* Allocate a new picture in the heap.
*
* used exactly like a video buffer. The video output thread then manages
* how it gets displayed.
*/
-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 vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic,
+ vlc_fourcc_t i_chroma,
+ int i_width, int i_height,
+ int i_sar_num, int i_sar_den )
{
- int i_bytes, i_index, i_width_aligned, i_height_aligned;
+ VLC_UNUSED(p_this);
+ int 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( picture_Setup( p_pic, i_chroma,
- i_width, i_height, i_aspect ) != VLC_SUCCESS )
+ if( picture_Setup( p_pic, i_chroma, i_width, i_height,
+ i_sar_num, i_sar_den ) != 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;
+
+ /*
+ * bytes = width_aligned * height_aligned * bpp / 8
+ * We need to check for an integer overflow at each multiplication since
+ * height & width (and bpp?) could be arbitrary large
+ */
+
+ size_t i_bytes = 0;
+ /* i_width_aligned is a multiple of 16, so we can divide by 8 now */
+ size_t i_width_aligned_divided = i_width_aligned / 8;
+ if( i_width_aligned_divided <= (SIZE_MAX/i_height_aligned) )
+ {
+ size_t i_pixels_divided = i_width_aligned_divided * i_height_aligned;
+ size_t i_bpp = p_pic->format.i_bits_per_pixel;
+ if( i_pixels_divided <= (SIZE_MAX/i_bpp) )
+ {
+ i_bytes = i_pixels_divided * i_bpp;
+ }
+ }
+
+ if( i_bytes == 0 )
+ {
+ p_pic->i_planes = 0;
+ return VLC_ENOMEM;
+ }
p_pic->p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes );
/*****************************************************************************
*
*****************************************************************************/
-int picture_Setup( picture_t *p_picture, vlc_fourcc_t i_chroma, int i_width, int i_height, int i_aspect )
+int picture_Setup( picture_t *p_picture, vlc_fourcc_t i_chroma,
+ int i_width, int i_height, int i_sar_num, int i_sar_den )
{
int i_index, i_width_aligned, i_height_aligned;
p_picture->i_qstride = 0;
p_picture->p_q = NULL;
- video_format_Setup( &p_picture->format, i_chroma, i_width, i_height, i_aspect );
+ video_format_Setup( &p_picture->format, i_chroma, i_width, i_height,
+ i_sar_num, i_sar_den );
/* Make sure the real dimensions are a multiple of 16 */
i_width_aligned = (i_width + 15) >> 4 << 4;
p_picture->i_planes = 3;
break;
+ case VLC_CODEC_YV9:
case VLC_CODEC_I410:
p_picture->p[ Y_PLANE ].i_lines = i_height_aligned;
p_picture->p[ Y_PLANE ].i_visible_lines = i_height;
p_picture->p->i_visible_lines = i_height;
p_picture->p->i_pitch = i_width_aligned;
p_picture->p->i_visible_pitch = i_width;
- p_picture->p->i_pixel_pitch = 8;
+ p_picture->p->i_pixel_pitch = 1;
p_picture->i_planes = 1;
break;
p_picture->p->i_visible_lines = i_height;
p_picture->p->i_pitch = i_width_aligned * 2;
p_picture->p->i_visible_pitch = i_width * 2;
- p_picture->p->i_pixel_pitch = 4;
+ p_picture->p->i_pixel_pitch = 2;
p_picture->i_planes = 1;
break;
/*****************************************************************************
*
*****************************************************************************/
-picture_t *picture_New( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_aspect )
+picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_resource_t *p_resource )
{
+ video_format_t fmt = *p_fmt;
+
+ /* It is needed to be sure all informations are filled */
+ video_format_Setup( &fmt, p_fmt->i_chroma,
+ p_fmt->i_width, p_fmt->i_height,
+ p_fmt->i_sar_num, p_fmt->i_sar_den );
+
+ /* */
picture_t *p_picture = calloc( 1, sizeof(*p_picture) );
if( !p_picture )
return NULL;
- if( __vout_AllocatePicture( NULL, p_picture,
- i_chroma, i_width, i_height, i_aspect ) )
+ if( p_resource )
{
- free( p_picture );
- return NULL;
- }
+ if( picture_Setup( p_picture, fmt.i_chroma, fmt.i_width, fmt.i_height,
+ fmt.i_sar_num, fmt.i_sar_den ) )
+ {
+ free( p_picture );
+ return NULL;
+ }
+ p_picture->p_sys = p_resource->p_sys;
+ for( int i = 0; i < p_picture->i_planes; i++ )
+ {
+ p_picture->p[i].p_pixels = p_resource->p[i].p_pixels;
+ p_picture->p[i].i_lines = p_resource->p[i].i_lines;
+ p_picture->p[i].i_pitch = p_resource->p[i].i_pitch;
+ }
+ }
+ else
+ {
+ if( vout_AllocatePicture( (vlc_object_t *)NULL, p_picture,
+ fmt.i_chroma, fmt.i_width, fmt.i_height,
+ fmt.i_sar_num, fmt.i_sar_den ) )
+ {
+ free( p_picture );
+ return NULL;
+ }
+ }
+ /* */
+ p_picture->format = fmt;
p_picture->i_refcount = 1;
p_picture->pf_release = PictureReleaseCallback;
p_picture->i_status = RESERVED_PICTURE;
return p_picture;
}
+picture_t *picture_NewFromFormat( const video_format_t *p_fmt )
+{
+ return picture_NewFromResource( p_fmt, NULL );
+}
+picture_t *picture_New( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den )
+{
+ video_format_t fmt;
+
+ memset( &fmt, 0, sizeof(fmt) );
+ video_format_Setup( &fmt, i_chroma, i_width, i_height,
+ i_sar_num, i_sar_den );
+
+ return picture_NewFromFormat( &fmt );
+}
/*****************************************************************************
*
return VLC_SUCCESS;
}
-/*****************************************************************************
- *
- *****************************************************************************/
-struct picture_fifo_t
-{
- vlc_mutex_t lock;
- picture_t *p_first;
- picture_t **pp_last;
-};
-
-static void PictureFifoReset( picture_fifo_t *p_fifo )
-{
- p_fifo->p_first = NULL;
- p_fifo->pp_last = &p_fifo->p_first;
-}
-static void PictureFifoPush( picture_fifo_t *p_fifo, picture_t *p_picture )
-{
- assert( !p_picture->p_next );
- *p_fifo->pp_last = p_picture;
- p_fifo->pp_last = &p_picture->p_next;
-}
-static picture_t *PictureFifoPop( picture_fifo_t *p_fifo )
-{
- picture_t *p_picture = p_fifo->p_first;
-
- if( p_picture )
- {
- p_fifo->p_first = p_picture->p_next;
- if( !p_fifo->p_first )
- p_fifo->pp_last = &p_fifo->p_first;
- }
- return p_picture;
-}
-
-picture_fifo_t *picture_fifo_New(void)
-{
- picture_fifo_t *p_fifo = malloc( sizeof(*p_fifo) );
- if( !p_fifo )
- return NULL;
-
- vlc_mutex_init( &p_fifo->lock );
- PictureFifoReset( p_fifo );
- return p_fifo;
-}
-
-void picture_fifo_Push( picture_fifo_t *p_fifo, picture_t *p_picture )
-{
- vlc_mutex_lock( &p_fifo->lock );
- PictureFifoPush( p_fifo, p_picture );
- vlc_mutex_unlock( &p_fifo->lock );
-}
-picture_t *picture_fifo_Pop( picture_fifo_t *p_fifo )
-{
- vlc_mutex_lock( &p_fifo->lock );
- picture_t *p_picture = PictureFifoPop( p_fifo );
- vlc_mutex_unlock( &p_fifo->lock );
-
- return p_picture;
-}
-picture_t *picture_fifo_Peek( picture_fifo_t *p_fifo )
-{
- vlc_mutex_lock( &p_fifo->lock );
- picture_t *p_picture = p_fifo->p_first;
- if( p_picture )
- picture_Hold( p_picture );
- vlc_mutex_unlock( &p_fifo->lock );
-
- return p_picture;
-}
-void picture_fifo_Flush( picture_fifo_t *p_fifo, mtime_t i_date, bool b_below )
-{
- picture_t *p_picture;
-
- vlc_mutex_lock( &p_fifo->lock );
-
- p_picture = p_fifo->p_first;
- PictureFifoReset( p_fifo );
-
- picture_fifo_t tmp;
- PictureFifoReset( &tmp );
-
- while( p_picture )
- {
- picture_t *p_next = p_picture->p_next;
-
- p_picture->p_next = NULL;
- if( ( b_below && p_picture->date <= i_date ) ||
- ( !b_below && p_picture->date >= i_date ) )
- PictureFifoPush( &tmp, p_picture );
- else
- PictureFifoPush( p_fifo, p_picture );
- p_picture = p_next;
- }
- vlc_mutex_unlock( &p_fifo->lock );
-
- for( ;; )
- {
- picture_t *p_picture = PictureFifoPop( &tmp );
- if( !p_picture )
- break;
- picture_Release( p_picture );
- }
-}
-void picture_fifo_OffsetDate( picture_fifo_t *p_fifo, mtime_t i_delta )
-{
- vlc_mutex_lock( &p_fifo->lock );
- for( picture_t *p_picture = p_fifo->p_first; p_picture != NULL; )
- {
- p_picture->date += i_delta;
- p_picture = p_picture->p_next;
- }
- vlc_mutex_unlock( &p_fifo->lock );
-}
-void picture_fifo_Delete( picture_fifo_t *p_fifo )
-{
- picture_fifo_Flush( p_fifo, INT64_MAX, true );
- vlc_mutex_destroy( &p_fifo->lock );
-}
-
projects / vlc / blobdiff