generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/pngdec: use memcpy instead of byte loops for P frames.

Browse Source 
Rely on the way memcpy is optimized for one's system instead of looping
on a byte buffer for buffer copies to handle P frames.

Tested-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Benoit Fouet 2014-12-03 14:31:28 +01:00 committed by Michael Niedermayer
parent a4f21a8dd9
commit 0f6931f4b6
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/pngdec.c
View File

@ -884,8 +884,7 @@ static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s,
ff_thread_await_progress(&s->previous_picture, INT_MAX, 0); ff_thread_await_progress(&s->previous_picture, INT_MAX, 0);
for (j = 0; j < s->y_offset; j++) { for (j = 0; j < s->y_offset; j++) {
for (i = 0; i < ls; i++) memcpy(pd, pd_last, ls);
pd[i] = pd_last[i];
pd += s->image_linesize; pd += s->image_linesize;
pd_last += s->image_linesize; pd_last += s->image_linesize;
} }
@ -907,8 +906,9 @@ static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s,
} }
for (j = s->y_offset; j < s->y_offset + s->cur_h; j++) { for (j = s->y_offset; j < s->y_offset + s->cur_h; j++) {
for (i = 0; i < s->x_offset * s->bpp; i++) i = s->x_offset * s->bpp;
pd[i] = pd_last[i]; if (i)
memcpy(pd, pd_last, i);
for (; i < (s->x_offset + s->cur_w) * s->bpp; i += s->bpp) { for (; i < (s->x_offset + s->cur_w) * s->bpp; i += s->bpp) {
uint8_t alpha = pd[i+ai]; uint8_t alpha = pd[i+ai];
@ -930,26 +930,27 @@ static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s,
break; break;
} }
} }
for (; i < ls; i++) if (ls - i)
pd[i] = pd_last[i]; memcpy(pd+i, pd_last+i, ls - i);
pd += s->image_linesize; pd += s->image_linesize;
pd_last += s->image_linesize; pd_last += s->image_linesize;
pd_last_region += s->image_linesize; pd_last_region += s->image_linesize;
} }
} else { } else {
for (j = s->y_offset; j < s->y_offset + s->cur_h; j++) { for (j = s->y_offset; j < s->y_offset + s->cur_h; j++) {
for (i = 0; i < s->x_offset * s->bpp; i++) int end_offset = (s->x_offset + s->cur_w) * s->bpp;
pd[i] = pd_last[i]; int end_len = ls - end_offset;
for (i = (s->x_offset + s->cur_w) * s->bpp; i < ls; i++) if (s->x_offset)
pd[i] = pd_last[i]; memcpy(pd, pd_last, s->x_offset * s->bpp);
if (end_len)
memcpy(pd+end_offset, pd_last+end_offset, end_len);
pd += s->image_linesize; pd += s->image_linesize;
pd_last += s->image_linesize; pd_last += s->image_linesize;
} }
} }
for (j = s->y_offset + s->cur_h; j < s->height; j++) { for (j = s->y_offset + s->cur_h; j < s->height; j++) {
for (i = 0; i < ls; i++) memcpy(pd, pd_last, ls);
pd[i] = pd_last[i];
pd += s->image_linesize; pd += s->image_linesize;
pd_last += s->image_linesize; pd_last += s->image_linesize;
} }