X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_pictures.c;h=b2f2e11c5527ac141580f3eda0c538de30d04d29;hb=0441cf8fdabffd8141a182f9ea21ccf967ae597e;hp=4625917c6ebd9835f4549fd1734ececb8553c40e;hpb=c1fc6e205ae1d86fddfa850bc10ceefec3c3f86e;p=vlc diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c index 4625917c6e..b2f2e11c55 100644 --- a/src/video_output/vout_pictures.c +++ b/src/video_output/vout_pictures.c @@ -34,459 +34,84 @@ #include #include #include -#include #include #include #include #include #include -#include "vout_pictures.h" #include "vout_internal.h" /** - * Display a picture + * It retreives a picture from the vout or NULL if no pictures are + * available yet. * - * Remove the reservation flag of a picture, which will cause it to be ready - * for display. - */ -void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic ) -{ - vlc_mutex_lock( &p_vout->picture_lock ); - - if( p_pic->i_status == RESERVED_PICTURE ) - { - p_pic->i_status = READY_PICTURE; - vlc_cond_signal( &p_vout->p->picture_wait ); - } - else - { - msg_Err( p_vout, "picture to display %p has invalid status %d", - 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 ); -} - -/** - * Allocate a picture in the video output heap. + * You MUST call vout_PutPicture or vout_ReleasePicture on it. * - * 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. + * You may use vout_HoldPicture(paired with vout_ReleasePicture) to keep a + * read-only reference. */ -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, - bool b_progressive, - bool b_top_field_first, - unsigned int i_nb_fields ) +picture_t *vout_GetPicture( vout_thread_t *p_vout ) { - 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 in the picture heap. - */ - for( i_pic = 0; i_pic < I_RENDERPICTURES; i_pic++ ) - { - p_pic = PP_RENDERPICTURE[(p_vout->render.i_last_used_pic + i_pic + 1) - % I_RENDERPICTURES]; - - 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_pic->i_status = RESERVED_PICTURE; - p_pic->i_refcount = 0; - p_pic->b_force = 0; - - p_pic->b_progressive = b_progressive; - p_pic->i_nb_fields = i_nb_fields; - p_pic->b_top_field_first = b_top_field_first; - - p_vout->i_heap_size++; - p_vout->render.i_last_used_pic = - ( p_vout->render.i_last_used_pic + i_pic + 1 ) - % I_RENDERPICTURES; - vlc_mutex_unlock( &p_vout->picture_lock ); - return( p_pic ); - - case FREE_PICTURE: - /* Picture is empty and ready for allocation */ - p_vout->render.i_last_used_pic = - ( p_vout->render.i_last_used_pic + i_pic + 1 ) - % I_RENDERPICTURES; - p_freepic = p_pic; - break; - - default: - break; - } + vlc_mutex_lock( &p_vout->p->picture_lock ); + picture_t *p_pic = picture_pool_Get(p_vout->p->decoder_pool); + if (p_pic) { + picture_Reset(p_pic); + p_pic->p_next = NULL; } + vlc_mutex_unlock( &p_vout->p->picture_lock ); - /* - * Prepare picture - */ - if( p_freepic != NULL ) - { - 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_height, - VOUT_ASPECT_FACTOR * p_vout->render.i_width); - - 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->i_nb_fields = i_nb_fields; - p_freepic->b_top_field_first = b_top_field_first; - - p_vout->i_heap_size++; - } - else - { - /* Memory allocation failed : set picture as empty */ - p_freepic->i_status = FREE_PICTURE; - p_freepic = NULL; - - msg_Err( p_vout, "picture allocation failed" ); - } - - vlc_mutex_unlock( &p_vout->picture_lock ); - - return( p_freepic ); - } - - /* No free or destroyed picture could be found, but the decoder - * will try again in a while. */ - vlc_mutex_unlock( &p_vout->picture_lock ); - - return( NULL ); -} - -/* */ -static void DestroyPicture( vout_thread_t *p_vout, picture_t *p_picture ) -{ - vlc_assert_locked( &p_vout->picture_lock ); - - p_picture->i_status = DESTROYED_PICTURE; - p_vout->i_heap_size--; - picture_CleanupQuant( p_picture ); - - vlc_cond_signal( &p_vout->p->picture_wait ); + return p_pic; } /** - * Remove a permanent or reserved picture from the heap + * It gives to the vout a picture to be displayed. * - * 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 ! + * The given picture MUST comes from vout_GetPicture. * - * TODO remove it, vout_DropPicture should be used instead + * Becareful, after vout_PutPicture is called, picture_t::p_next cannot be + * read/used. */ -void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic ) +void vout_PutPicture( vout_thread_t *p_vout, picture_t *p_pic ) { -#ifndef NDEBUG - /* Check if picture status is valid */ - vlc_mutex_lock( &p_vout->picture_lock ); - if( p_pic->i_status != RESERVED_PICTURE ) - { - msg_Err( p_vout, "picture to destroy %p has invalid status %d", - p_pic, p_pic->i_status ); - } - vlc_mutex_unlock( &p_vout->picture_lock ); -#endif + vlc_mutex_lock( &p_vout->p->picture_lock ); - vout_DropPicture( p_vout, p_pic ); -} + p_pic->p_next = NULL; + picture_fifo_Push(p_vout->p->decoder_fifo, p_pic); -/* */ -void vout_UsePictureLocked( vout_thread_t *p_vout, picture_t *p_picture ) -{ - vlc_assert_locked( &p_vout->picture_lock ); - if( p_picture->i_refcount > 0 ) - { - /* Pretend we displayed the picture, but don't destroy - * it since the decoder might still need it. */ - p_picture->i_status = DISPLAYED_PICTURE; - } - else - { - /* Destroy the picture without displaying it */ - DestroyPicture( p_vout, p_picture ); - } -} - -/* */ -void vout_DropPicture( vout_thread_t *p_vout, picture_t *p_pic ) -{ - vlc_mutex_lock( &p_vout->picture_lock ); - - if( p_pic->i_status == READY_PICTURE ) - { - /* Grr cannot destroy ready picture by myself so be sure vout won't like it */ - p_pic->date = 1; - vlc_cond_signal( &p_vout->p->picture_wait ); - } - else - { - vout_UsePictureLocked( p_vout, p_pic ); - } + vlc_mutex_unlock( &p_vout->p->picture_lock ); - vlc_mutex_unlock( &p_vout->picture_lock ); + vout_control_Wake( &p_vout->p->control); } /** - * 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. + * It releases a picture retreived by vout_GetPicture. */ -void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) +void vout_ReleasePicture( vout_thread_t *p_vout, picture_t *p_pic ) { - vlc_mutex_lock( &p_vout->picture_lock ); - p_pic->i_refcount++; - vlc_mutex_unlock( &p_vout->picture_lock ); -} - -/** - * 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 ); - - if( p_pic->i_refcount > 0 ) - p_pic->i_refcount--; - else - msg_Err( p_vout, "Invalid picture reference count (%p, %d)", - p_pic, p_pic->i_refcount ); + vlc_mutex_lock( &p_vout->p->picture_lock ); - if( p_pic->i_refcount == 0 && p_pic->i_status == DISPLAYED_PICTURE ) - DestroyPicture( p_vout, p_pic ); + picture_Release( p_pic ); - vlc_mutex_unlock( &p_vout->picture_lock ); -} - -/** - * 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, mtime_t render_date ) -{ - if( p_pic == NULL ) - return NULL; - - if( p_pic->i_type == DIRECT_PICTURE && !p_subpic ) - { - /* No subtitles, picture is in a directbuffer so - * we can display it directly (even if it is still - * in use or not). */ - return p_pic; - } + vlc_mutex_unlock( &p_vout->p->picture_lock ); - /* It is either because: - * - the picture is not a direct buffer - * - we have to render subtitles (we can never do it on the given - * picture even if not referenced). - */ - picture_t *p_render; - if( p_subpic != NULL && PP_OUTPUTPICTURE[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. */ - p_render = &p_vout->p_picture[2 * VOUT_MAX_PICTURES]; - if( p_render->i_status == FREE_PICTURE ) - { - vout_AllocatePicture( VLC_OBJECT(p_vout), - p_render, p_vout->fmt_out.i_chroma, - p_vout->fmt_out.i_width, - p_vout->fmt_out.i_height, - p_vout->fmt_out.i_sar_num, - p_vout->fmt_out.i_sar_den ); - p_render->i_type = MEMORY_PICTURE; - p_render->i_status = RESERVED_PICTURE; - } - } - else - { - /* We can directly render into a direct buffer */ - p_render = PP_OUTPUTPICTURE[0]; - } - /* Copy or convert */ - if( p_vout->p->b_direct ) - { - picture_Copy( p_render, p_pic ); - } - else - { - p_vout->p->p_chroma->p_owner = (filter_owner_sys_t *)p_render; - p_vout->p->p_chroma->pf_video_filter( p_vout->p->p_chroma, p_pic ); - } - /* Render the subtitles if present */ - if( p_subpic ) - spu_RenderSubpictures( p_vout->p_spu, - p_render, &p_vout->fmt_out, - p_subpic, &p_vout->fmt_in, render_date ); - /* Copy in case we used a temporary fast buffer */ - if( p_render != PP_OUTPUTPICTURE[0] ) - picture_Copy( PP_OUTPUTPICTURE[0], p_render ); - - return PP_OUTPUTPICTURE[0]; + vout_control_Wake( &p_vout->p->control); } /** - * Calculate image window coordinates - * - * This function will be accessed by plugins. It calculates the relative - * position of the output window and the image window. + * It increment the reference counter of a picture retreived by + * vout_GetPicture. */ -void vout_PlacePicture( const vout_thread_t *p_vout, - unsigned int i_width, unsigned int i_height, - unsigned int *restrict pi_x, - unsigned int *restrict pi_y, - unsigned int *restrict pi_width, - unsigned int *restrict pi_height ) +void vout_HoldPicture( vout_thread_t *p_vout, picture_t *p_pic ) { - if( i_width <= 0 || i_height <= 0 ) - { - *pi_width = *pi_height = *pi_x = *pi_y = 0; - return; - } - - if( p_vout->b_autoscale ) - { - *pi_width = i_width; - *pi_height = i_height; - } - else - { - int i_zoom = p_vout->i_zoom; - /* be realistic, scaling factor confined between .2 and 10. */ - if( i_zoom > 10 * ZOOM_FP_FACTOR ) i_zoom = 10 * ZOOM_FP_FACTOR; - else if( i_zoom < ZOOM_FP_FACTOR / 5 ) i_zoom = ZOOM_FP_FACTOR / 5; - - unsigned int i_original_width, i_original_height; - - if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den ) - { - i_original_width = p_vout->fmt_in.i_visible_width * - p_vout->fmt_in.i_sar_num / p_vout->fmt_in.i_sar_den; - i_original_height = p_vout->fmt_in.i_visible_height; - } - else - { - i_original_width = p_vout->fmt_in.i_visible_width; - i_original_height = p_vout->fmt_in.i_visible_height * - p_vout->fmt_in.i_sar_den / p_vout->fmt_in.i_sar_num; - } -#ifdef WIN32 - /* On windows, inner video window exceeding container leads to black screen */ - *pi_width = __MIN( i_width, i_original_width * i_zoom / ZOOM_FP_FACTOR ); - *pi_height = __MIN( i_height, i_original_height * i_zoom / ZOOM_FP_FACTOR ); -#else - *pi_width = i_original_width * i_zoom / ZOOM_FP_FACTOR ; - *pi_height = i_original_height * i_zoom / ZOOM_FP_FACTOR ; -#endif - } + vlc_mutex_lock( &p_vout->p->picture_lock ); - int64_t i_scaled_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; - int64_t i_scaled_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; + picture_Hold( p_pic ); - if( i_scaled_width <= 0 || i_scaled_height <= 0 ) - { - msg_Warn( p_vout, "ignoring broken aspect ratio" ); - i_scaled_width = *pi_width; - i_scaled_height = *pi_height; - } - - if( i_scaled_width > *pi_width ) - *pi_height = i_scaled_height; - else - *pi_width = i_scaled_width; - - switch( p_vout->i_alignment & VOUT_ALIGN_HMASK ) - { - 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; - } - - switch( p_vout->i_alignment & VOUT_ALIGN_VMASK ) - { - 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; - } + vlc_mutex_unlock( &p_vout->p->picture_lock ); } -#undef vout_AllocatePicture /** * Allocate a new picture in the heap. * @@ -494,13 +119,11 @@ void vout_PlacePicture( const vout_thread_t *p_vout, * 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_sar_num, int i_sar_den ) +static int vout_AllocatePicture( picture_t *p_pic, + vlc_fourcc_t i_chroma, + int i_width, int i_height, + int i_sar_num, int i_sar_den ) { - VLC_UNUSED(p_this); - /* Make sure the real dimensions are a multiple of 16 */ if( picture_Setup( p_pic, i_chroma, i_width, i_height, i_sar_num, i_sar_den ) != VLC_SUCCESS ) @@ -521,15 +144,15 @@ int vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic, i_bytes += p->i_pitch * p->i_lines; } - p_pic->p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes ); - if( p_pic->p_data == NULL ) + uint8_t *p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes ); + if( !p_data ) { 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; + p_pic->p[0].p_pixels = p_data; for( int i = 1; i < p_pic->i_planes; i++ ) { p_pic->p[i].p_pixels = &p_pic->p[i-1].p_pixels[ p_pic->p[i-1].i_lines * @@ -539,56 +162,6 @@ int vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic, return VLC_SUCCESS; } -/** - * 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) - */ -int vout_ChromaCmp( vlc_fourcc_t i_chroma, vlc_fourcc_t i_amorhc ) -{ - static const vlc_fourcc_t p_I420[] = { - VLC_CODEC_I420, VLC_CODEC_YV12, VLC_CODEC_J420, 0 - }; - static const vlc_fourcc_t p_I422[] = { - VLC_CODEC_I422, VLC_CODEC_J422, 0 - }; - static const vlc_fourcc_t p_I440[] = { - VLC_CODEC_I440, VLC_CODEC_J440, 0 - }; - static const vlc_fourcc_t p_I444[] = { - VLC_CODEC_I444, VLC_CODEC_J444, 0 - }; - static const vlc_fourcc_t *pp_fcc[] = { - p_I420, p_I422, p_I440, p_I444, NULL - }; - - /* */ - i_chroma = vlc_fourcc_GetCodec( VIDEO_ES, i_chroma ); - i_amorhc = vlc_fourcc_GetCodec( VIDEO_ES, i_amorhc ); - - /* If they are the same, they are the same ! */ - if( i_chroma == i_amorhc ) - return 1; - - /* Check for equivalence classes */ - for( int i = 0; pp_fcc[i] != NULL; i++ ) - { - bool b_fcc1 = false; - bool b_fcc2 = false; - for( int j = 0; pp_fcc[i][j] != 0; j++ ) - { - if( i_chroma == pp_fcc[i][j] ) - b_fcc1 = true; - if( i_amorhc == pp_fcc[i][j] ) - b_fcc2 = true; - } - if( b_fcc1 && b_fcc2 ) - return 1; - } - return 0; -} - /***************************************************************************** * *****************************************************************************/ @@ -616,72 +189,6 @@ void picture_Reset( picture_t *p_picture ) /***************************************************************************** * *****************************************************************************/ -typedef struct -{ - unsigned i_plane_count; - struct - { - struct - { - unsigned i_num; - unsigned i_den; - } w; - struct - { - unsigned i_num; - unsigned i_den; - } h; - } p[VOUT_MAX_PLANES]; - unsigned i_pixel_size; - -} chroma_description_t; - -#define PLANAR(n, w_den, h_den) \ - { n, { {{1,1}, {1,1}}, {{1,w_den}, {1,h_den}}, {{1,w_den}, {1,h_den}}, {{1,1}, {1,1}} }, 1 } -#define PACKED(size) \ - { 1, { {{1,1}, {1,1}} }, size } - -static const struct -{ - vlc_fourcc_t p_fourcc[5]; - chroma_description_t description; -} p_chromas[] = { - { { VLC_CODEC_I411, 0 }, PLANAR(3, 4, 1) }, - { { VLC_CODEC_I410, VLC_CODEC_YV9, 0 }, PLANAR(3, 4, 4) }, - { { VLC_CODEC_YV12, VLC_CODEC_I420, VLC_CODEC_J420, 0 }, PLANAR(3, 2, 2) }, - { { VLC_CODEC_I422, VLC_CODEC_J422, 0 }, PLANAR(3, 2, 1) }, - { { VLC_CODEC_I440, VLC_CODEC_J440, 0 }, PLANAR(3, 1, 2) }, - { { VLC_CODEC_I444, VLC_CODEC_J444, 0 }, PLANAR(3, 1, 1) }, - { { VLC_CODEC_YUVA, 0 }, PLANAR(4, 1, 1) }, - - { { VLC_CODEC_UYVY, VLC_CODEC_VYUY, VLC_CODEC_YUYV, VLC_CODEC_YVYU, 0 }, PACKED(2) }, - { { VLC_CODEC_RGB8, VLC_CODEC_GREY, VLC_CODEC_YUVP, VLC_CODEC_RGBP, 0 }, PACKED(1) }, - { { VLC_CODEC_RGB16, VLC_CODEC_RGB15, 0 }, PACKED(2) }, - { { VLC_CODEC_RGB24, 0 }, PACKED(3) }, - { { VLC_CODEC_RGB32, VLC_CODEC_RGBA, 0 }, PACKED(4) }, - - { { VLC_CODEC_Y211, 0 }, { 1, { {{1,4}, {1,1}} }, 4 } }, - - { {0}, { 0, {}, 0 } } -}; - -#undef PACKED -#undef PLANAR - -static const chroma_description_t *vlc_fourcc_GetChromaDescription( vlc_fourcc_t i_fourcc ) -{ - for( unsigned i = 0; p_chromas[i].p_fourcc[0]; i++ ) - { - const vlc_fourcc_t *p_fourcc = p_chromas[i].p_fourcc; - for( unsigned j = 0; p_fourcc[j]; j++ ) - { - if( p_fourcc[j] == i_fourcc ) - return &p_chromas[i].description; - } - } - return NULL; -} - static int LCM( int a, int b ) { return a * b / GCD( a, b ); @@ -710,7 +217,7 @@ int picture_Setup( picture_t *p_picture, vlc_fourcc_t i_chroma, video_format_Setup( &p_picture->format, i_chroma, i_width, i_height, i_sar_num, i_sar_den ); - const chroma_description_t *p_dsc = + const vlc_chroma_description_t *p_dsc = vlc_fourcc_GetChromaDescription( p_picture->format.i_chroma ); if( !p_dsc ) return VLC_EGENERIC; @@ -724,30 +231,30 @@ int picture_Setup( picture_t *p_picture, vlc_fourcc_t i_chroma, int i_modulo_w = 1; int i_modulo_h = 1; int i_ratio_h = 1; - for( unsigned i = 0; i < p_dsc->i_plane_count; i++ ) + for( unsigned i = 0; i < p_dsc->plane_count; i++ ) { - i_modulo_w = LCM( i_modulo_w, 16 * p_dsc->p[i].w.i_den ); - i_modulo_h = LCM( i_modulo_h, 16 * p_dsc->p[i].h.i_den ); - if( i_ratio_h < p_dsc->p[i].h.i_den ) - i_ratio_h = p_dsc->p[i].h.i_den; + i_modulo_w = LCM( i_modulo_w, 16 * p_dsc->p[i].w.den ); + i_modulo_h = LCM( i_modulo_h, 16 * p_dsc->p[i].h.den ); + if( i_ratio_h < p_dsc->p[i].h.den ) + i_ratio_h = p_dsc->p[i].h.den; } const int i_width_aligned = ( i_width + i_modulo_w - 1 ) / i_modulo_w * i_modulo_w; const int i_height_aligned = ( i_height + i_modulo_h - 1 ) / i_modulo_h * i_modulo_h; const int i_height_extra = 2 * i_ratio_h; /* This one is a hack for some ASM functions */ - for( unsigned i = 0; i < p_dsc->i_plane_count; i++ ) + for( unsigned i = 0; i < p_dsc->plane_count; i++ ) { plane_t *p = &p_picture->p[i]; - p->i_lines = (i_height_aligned + i_height_extra ) * p_dsc->p[i].h.i_num / p_dsc->p[i].h.i_den; - p->i_visible_lines = i_height * p_dsc->p[i].h.i_num / p_dsc->p[i].h.i_den; - p->i_pitch = i_width_aligned * p_dsc->p[i].w.i_num / p_dsc->p[i].w.i_den * p_dsc->i_pixel_size; - p->i_visible_pitch = i_width * p_dsc->p[i].w.i_num / p_dsc->p[i].w.i_den * p_dsc->i_pixel_size; - p->i_pixel_pitch = p_dsc->i_pixel_size; + p->i_lines = (i_height_aligned + i_height_extra ) * p_dsc->p[i].h.num / p_dsc->p[i].h.den; + p->i_visible_lines = i_height * p_dsc->p[i].h.num / p_dsc->p[i].h.den; + p->i_pitch = i_width_aligned * p_dsc->p[i].w.num / p_dsc->p[i].w.den * p_dsc->pixel_size; + p->i_visible_pitch = i_width * p_dsc->p[i].w.num / p_dsc->p[i].w.den * p_dsc->pixel_size; + p->i_pixel_pitch = p_dsc->pixel_size; assert( (p->i_pitch % 16) == 0 ); } - p_picture->i_planes = p_dsc->i_plane_count; + p_picture->i_planes = p_dsc->plane_count; return VLC_SUCCESS; } @@ -759,7 +266,7 @@ picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_r { video_format_t fmt = *p_fmt; - /* It is needed to be sure all informations are filled */ + /* It is needed to be sure all information 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 ); @@ -788,7 +295,7 @@ picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_r } else { - if( vout_AllocatePicture( (vlc_object_t *)NULL, p_picture, + if( vout_AllocatePicture( p_picture, fmt.i_chroma, fmt.i_width, fmt.i_height, fmt.i_sar_num, fmt.i_sar_den ) ) { @@ -800,7 +307,6 @@ picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_r p_picture->format = fmt; p_picture->i_refcount = 1; p_picture->pf_release = PictureReleaseCallback; - p_picture->i_status = RESERVED_PICTURE; return p_picture; } @@ -906,13 +412,13 @@ int picture_Export( vlc_object_t *p_obj, unsigned int i_original_height; if( fmt_in.i_sar_num >= fmt_in.i_sar_den ) { - i_original_width = fmt_in.i_width * fmt_in.i_sar_num / fmt_in.i_sar_den; + i_original_width = (int64_t)fmt_in.i_width * fmt_in.i_sar_num / fmt_in.i_sar_den; i_original_height = fmt_in.i_height; } else { i_original_width = fmt_in.i_width; - i_original_height = fmt_in.i_height * fmt_in.i_sar_den / fmt_in.i_sar_num; + i_original_height = (int64_t)fmt_in.i_height * fmt_in.i_sar_den / fmt_in.i_sar_num; } /* */