vlc | branch: master | Thomas Guillem <[email protected]> | Wed Apr 5 13:31:43 2017 +0200| [2b70b08bf849ce2b9c536a2508bc211e8608fac6] | committer: Thomas Guillem
chroma: cvpx: remove forward declaration > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b70b08bf849ce2b9c536a2508bc211e8608fac6 --- modules/video_chroma/cvpx.c | 57 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/modules/video_chroma/cvpx.c b/modules/video_chroma/cvpx.c index 9c6838e6a7..e0b19c6e87 100644 --- a/modules/video_chroma/cvpx.c +++ b/modules/video_chroma/cvpx.c @@ -37,40 +37,18 @@ struct picture_sys_t { CVPixelBufferRef pixelBuffer; }; -static int Activate(vlc_object_t * ); -static void CVPX_I420(filter_t *, picture_t *, picture_t *); -static picture_t *CVPX_I420_Filter( filter_t *, picture_t * ); +static int Activate(vlc_object_t *); vlc_module_begin () -set_description( N_("Conversions from CoreVideo buffers to I420") ) -set_capability( "video converter", 10 ) -set_callbacks( Activate, NULL ) + set_description( N_("Conversions from CoreVideo buffers to I420") ) + set_capability( "video converter", 10 ) + set_callbacks( Activate, NULL ) vlc_module_end () -static int Activate(vlc_object_t *obj) -{ - filter_t *p_filter = (filter_t *)obj; - if (p_filter->fmt_in.video.i_chroma != VLC_CODEC_CVPX_NV12) - return VLC_EGENERIC; - - if (p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height - || p_filter->fmt_in.video.i_width != p_filter->fmt_out.video.i_width) - return VLC_EGENERIC; - - if (p_filter->fmt_out.video.i_chroma != VLC_CODEC_I420) - return VLC_EGENERIC; - - p_filter->pf_video_filter = CVPX_I420_Filter; - - return VLC_SUCCESS; -} - -VIDEO_FILTER_WRAPPER( CVPX_I420 ) - -static void CVPX_I420(filter_t *p_filter, picture_t *sourcePicture, picture_t *destinationPicture) +static void CVPX_I420(filter_t *p_filter, picture_t *src, picture_t *dst) { VLC_UNUSED(p_filter); - picture_sys_t *picsys = sourcePicture->p_sys; + picture_sys_t *picsys = src->p_sys; if (picsys == NULL) return; @@ -99,9 +77,30 @@ static void CVPX_I420(filter_t *p_filter, picture_t *sourcePicture, picture_t *d if (CopyInitCache(&cache, width)) return; - CopyFromNv12ToI420(destinationPicture, pp_plane, pi_pitch, height, &cache); + CopyFromNv12ToI420(dst, pp_plane, pi_pitch, height, &cache); CopyCleanCache(&cache); CVPixelBufferUnlockBaseAddress(picsys->pixelBuffer, kCVPixelBufferLock_ReadOnly); } + +VIDEO_FILTER_WRAPPER(CVPX_I420) + +static int Activate(vlc_object_t *obj) +{ + filter_t *p_filter = (filter_t *)obj; + if (p_filter->fmt_in.video.i_chroma != VLC_CODEC_CVPX_NV12) + return VLC_EGENERIC; + + if (p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height + || p_filter->fmt_in.video.i_width != p_filter->fmt_out.video.i_width) + return VLC_EGENERIC; + + if (p_filter->fmt_out.video.i_chroma != VLC_CODEC_I420) + return VLC_EGENERIC; + + p_filter->pf_video_filter = CVPX_I420_Filter; + + return VLC_SUCCESS; +} + _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
