virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/qtrle : improve 24bbp decoding speed

Browse Source 
benchmark on x86_64 :
mainly raw data : 20 -> 39 fps
mainly rle data : 97 -> 119fps
This commit is contained in:
Martin Vignali 2019-02-26 10:38:25 +01:00
parent 3278ea67c8
commit 88d0be1c0e
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavcodec/qtrle.c
View File

@ -297,10 +297,11 @@ static void qtrle_decode_16bpp(QtrleContext *s, int row_ptr, int lines_to_change
static void qtrle_decode_24bpp(QtrleContext *s, int row_ptr, int lines_to_change) static void qtrle_decode_24bpp(QtrleContext *s, int row_ptr, int lines_to_change)
{ {
int rle_code; int rle_code, rle_code_half;
int pixel_ptr; int pixel_ptr;
int row_inc = s->frame->linesize[0]; int row_inc = s->frame->linesize[0];
uint8_t r, g, b; uint8_t b;
uint16_t rg;
uint8_t *rgb = s->frame->data[0]; uint8_t *rgb = s->frame->data[0];
int pixel_limit = s->frame->linesize[0] * s->avctx->height; int pixel_limit = s->frame->linesize[0] * s->avctx->height;
@ -318,25 +319,31 @@ static void qtrle_decode_24bpp(QtrleContext *s, int row_ptr, int lines_to_change
} else if (rle_code < 0) { } else if (rle_code < 0) {
/* decode the run length code */ /* decode the run length code */
rle_code = -rle_code; rle_code = -rle_code;
r = bytestream2_get_byte(&s->g); rg = bytestream2_get_ne16(&s->g);
g = bytestream2_get_byte(&s->g);
b = bytestream2_get_byte(&s->g); b = bytestream2_get_byte(&s->g);
CHECK_PIXEL_PTR(rle_code * 3); CHECK_PIXEL_PTR(rle_code * 3);
while (rle_code--) { while (rle_code--) {
rgb[pixel_ptr++] = r; AV_WN16A(rgb + pixel_ptr, rg);
rgb[pixel_ptr++] = g; rgb[pixel_ptr + 2] = b;
rgb[pixel_ptr++] = b; pixel_ptr += 3;
} }
} else { } else {
CHECK_PIXEL_PTR(rle_code * 3); CHECK_PIXEL_PTR(rle_code * 3);
/* copy pixels directly to output */ rle_code_half = rle_code / 2;
while (rle_code--) {
rgb[pixel_ptr++] = bytestream2_get_byte(&s->g); while (rle_code_half--) { /* copy 2 raw rgb value at the same time */
rgb[pixel_ptr++] = bytestream2_get_byte(&s->g); AV_WN32A(rgb + pixel_ptr, bytestream2_get_ne32(&s->g)); /* rgbr */
rgb[pixel_ptr++] = bytestream2_get_byte(&s->g); AV_WN16A(rgb + pixel_ptr + 4, bytestream2_get_ne16(&s->g)); /* rgbr */
pixel_ptr += 6;
}
if (rle_code % 2 != 0){ /* not even raw value */
AV_WN16A(rgb + pixel_ptr, bytestream2_get_ne16(&s->g));
rgb[pixel_ptr + 2] = bytestream2_get_byte(&s->g);
pixel_ptr += 3;
} }
} }
} }