From c0499fbb22b42839b7df8c7bcc8a15dfcb6c1c4e Mon Sep 17 00:00:00 2001 From: Seven Du Date: Wed, 15 Jun 2016 09:34:26 +0800 Subject: [PATCH] FS-9266 #resolve --- src/include/switch_core_video.h | 4 ++-- src/mod/applications/mod_cv/mod_cv.cpp | 2 +- src/mod/formats/mod_vlc/mod_vlc.c | 2 +- src/switch_core_video.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/include/switch_core_video.h b/src/include/switch_core_video.h index 068a138107..babe865f4e 100644 --- a/src/include/switch_core_video.h +++ b/src/include/switch_core_video.h @@ -352,10 +352,10 @@ SWITCH_DECLARE(void) switch_img_find_position(switch_img_position_t pos, int sw, * * \param[in] src The image descriptor * \param[in] dest The target memory address -* \param[in] size The size of target memory address used for bounds check +* \param[in] stride Bytes in a row for the destination. Pass 0 if the buffer has contiguous rows. Can be negative. A multiple of 16 is optimal. * \param[in] fmt The target format */ -SWITCH_DECLARE(switch_status_t) switch_img_to_raw(switch_image_t *src, void *dest, switch_size_t size, switch_img_fmt_t fmt); +SWITCH_DECLARE(switch_status_t) switch_img_to_raw(switch_image_t *src, void *dest, int stride, switch_img_fmt_t fmt); /*!\brief convert raw memory to switch_img_t * * if dest is NULL then a new img is created, user should destroy it later, diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp index 5c10b8d42b..76cf155a6e 100644 --- a/src/mod/applications/mod_cv/mod_cv.cpp +++ b/src/mod/applications/mod_cv/mod_cv.cpp @@ -720,7 +720,7 @@ static switch_status_t video_thread_callback(switch_core_session_t *session, swi switch_assert(context->rawImage->width * 3 == context->rawImage->widthStep); } - switch_img_to_raw(frame->img, context->rawImage->imageData, context->rawImage->widthStep * context->h, SWITCH_IMG_FMT_RGB24); + switch_img_to_raw(frame->img, context->rawImage->imageData, context->rawImage->widthStep, SWITCH_IMG_FMT_RGB24); detectAndDraw(context); if (context->detected.simo_count > 20) { diff --git a/src/mod/formats/mod_vlc/mod_vlc.c b/src/mod/formats/mod_vlc/mod_vlc.c index dbacf4e513..3cd8a2cebb 100644 --- a/src/mod/formats/mod_vlc/mod_vlc.c +++ b/src/mod/formats/mod_vlc/mod_vlc.c @@ -1659,7 +1659,7 @@ int vlc_write_video_imem_get_callback(void *data, const char *cookie, int64_t * } *output = context->video_frame_buffer; - switch_img_to_raw(img, *output, *size, SWITCH_IMG_FMT_YUY2); + switch_img_to_raw(img, *output, 0, SWITCH_IMG_FMT_YUY2); switch_img_free(&img); return 0; } diff --git a/src/switch_core_video.c b/src/switch_core_video.c index 4a32027fed..e4cb5f1ad3 100644 --- a/src/switch_core_video.c +++ b/src/switch_core_video.c @@ -2031,7 +2031,7 @@ static inline uint32_t switch_img_fmt2fourcc(switch_img_fmt_t fmt) } #endif -SWITCH_DECLARE(switch_status_t) switch_img_to_raw(switch_image_t *src, void *dest, switch_size_t size, switch_img_fmt_t fmt) +SWITCH_DECLARE(switch_status_t) switch_img_to_raw(switch_image_t *src, void *dest, int stride, switch_img_fmt_t fmt) { #ifdef SWITCH_HAVE_YUV uint32_t fourcc; @@ -2050,7 +2050,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_to_raw(switch_image_t *src, void *des ret = ConvertFromI420(src->planes[0], src->stride[0], src->planes[1], src->stride[1], src->planes[2], src->stride[2], - dest, size, + dest, stride, src->d_w, src->d_h, fourcc);