From: Doyoun Kang Date: Wed, 4 Nov 2020 11:51:00 +0000 (+0900) Subject: Revert "video_buffer: Do not call memcpy() with the size greater than dest." X-Git-Tag: submit/tizen/20201105.050753~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F246841%2F1;p=platform%2Fupstream%2Fenlightenment.git Revert "video_buffer: Do not call memcpy() with the size greater than dest." This reverts commit a31a94ee5394230d1d0902a30ff299a6dec919ec. Change-Id: I4cd67474dc9dd73243d8aaf53b5309ba37c23dec --- diff --git a/src/bin/video/e_comp_wl_video_buffer.c b/src/bin/video/e_comp_wl_video_buffer.c index 812a38d0d1..c3ecbf5800 100644 --- a/src/bin/video/e_comp_wl_video_buffer.c +++ b/src/bin/video/e_comp_wl_video_buffer.c @@ -768,7 +768,6 @@ e_comp_wl_video_buffer_copy(E_Comp_Wl_Video_Buf *srcbuf, E_Comp_Wl_Video_Buf *ds { int i, j, c_height; unsigned char *s, *d; - uint pitch; EINA_SAFETY_ON_FALSE_RETURN_VAL(VBUF_IS_VALID(srcbuf), EINA_FALSE); EINA_SAFETY_ON_FALSE_RETURN_VAL(VBUF_IS_VALID(dstbuf), EINA_FALSE); @@ -789,10 +788,9 @@ e_comp_wl_video_buffer_copy(E_Comp_Wl_Video_Buf *srcbuf, E_Comp_Wl_Video_Buf *ds case TBM_FORMAT_YVU422: s = (unsigned char*)srcbuf->ptrs[0]; d = (unsigned char*)dstbuf->ptrs[0]; - pitch = MIN(srcbuf->pitches[0], dstbuf->pitches[0]); for (i = 0; i < srcbuf->height; i++) { - memcpy(d, s, pitch); + memcpy(d, s, srcbuf->pitches[0]); s += srcbuf->pitches[0]; d += dstbuf->pitches[0]; } @@ -803,11 +801,10 @@ e_comp_wl_video_buffer_copy(E_Comp_Wl_Video_Buf *srcbuf, E_Comp_Wl_Video_Buf *ds { s = (unsigned char*)srcbuf->ptrs[i] + srcbuf->offsets[i]; d = (unsigned char*)dstbuf->ptrs[i] + dstbuf->offsets[i]; - pitch = MIN(srcbuf->pitches[i], dstbuf->pitches[i]); c_height = (i == 0) ? srcbuf->height : srcbuf->height / 2; for (j = 0; j < c_height; j++) { - memcpy(d, s, pitch); + memcpy(d, s, srcbuf->pitches[i]); s += srcbuf->pitches[i]; d += dstbuf->pitches[i]; } @@ -819,11 +816,10 @@ e_comp_wl_video_buffer_copy(E_Comp_Wl_Video_Buf *srcbuf, E_Comp_Wl_Video_Buf *ds { s = (unsigned char*)srcbuf->ptrs[i] + srcbuf->offsets[i]; d = (unsigned char*)dstbuf->ptrs[i] + dstbuf->offsets[i]; - pitch = MIN(srcbuf->pitches[i], dstbuf->pitches[i]); c_height = (i == 0) ? srcbuf->height : srcbuf->height / 2; for (j = 0; j < c_height; j++) { - memcpy(d, s, pitch); + memcpy(d, s, srcbuf->pitches[i]); s += srcbuf->pitches[i]; d += dstbuf->pitches[i]; }