RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavcodec/rawdec: avoid memcpy when performing 16-bit samples shift 

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Peter Ross 2014-02-26 21:03:52 +11:00 committed by Michael Niedermayer
parent baa650cc79
commit 1524b0fa68
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/rawdec.c
View File

@ -226,6 +226,17 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
linesize_align = 16;
}
buf = dst;
} else if (context->is_lt_16bpp) {
int i;
uint8_t *dst = frame->buf[0]->data;
if (desc->flags & AV_PIX_FMT_FLAG_BE) {
for (i = 0; i + 1 < buf_size; i += 2)
AV_WB16(dst + i, AV_RB16(buf + i) << (16 - avctx->bits_per_coded_sample));
} else {
for (i = 0; i + 1 < buf_size; i += 2)
AV_WL16(dst + i, AV_RL16(buf + i) << (16 - avctx->bits_per_coded_sample));
}
buf = dst;
} else if (need_copy) {
memcpy(frame->buf[0]->data, buf, buf_size);
buf = frame->buf[0]->data;
@ -242,19 +253,6 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR(EINVAL);
}
if (context->is_lt_16bpp) {
int i;
uint8_t *dst = frame->buf[0]->data;
if (desc->flags & AV_PIX_FMT_FLAG_BE) {
for (i = 0; i + 1 < buf_size; i += 2)
AV_WB16(dst + i, AV_RB16(buf + i) << (16 - avctx->bits_per_coded_sample));
} else {
for (i = 0; i + 1 < buf_size; i += 2)
AV_WL16(dst + i, AV_RL16(buf + i) << (16 - avctx->bits_per_coded_sample));
}
buf = dst;
}
if ((res = avpicture_fill(picture, buf, avctx->pix_fmt,
avctx->width, avctx->height)) < 0) {
av_buffer_unref(&frame->buf[0]);