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

huffyuvdec: trick for plane decoding <= 14bits

Browse Source 
Refactor the code to minimize code duplication.

Before:
130870 decicycles in g, 1048139 runs, 437 skips
10bits:  9.048
12bits: 10.733

After:
126960 decicycles in g, 1048136 runs, 440 skips
10bits:  8.642
12bits:  9.656

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Christophe Gisquet 2014-06-05 23:37:00 +02:00 committed by Michael Niedermayer
parent c80181352c
commit 7eb5b20a87
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libavcodec/huffyuvdec.c
View File

@ -586,15 +586,14 @@ static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
#define GET_VLC_DUAL(dst0, dst1, name, gb, dtable, table1, table2, \ #define GET_VLC_DUAL(dst0, dst1, name, gb, dtable, table1, table2, \
bits, max_depth) \ bits, max_depth, OP) \
do { \ do { \
unsigned int index = SHOW_UBITS(name, gb, bits); \ unsigned int index = SHOW_UBITS(name, gb, bits); \
int code, n = dtable[index][1]; \ int code, n = dtable[index][1]; \
\ \
if (n>0) { \ if (n>0) { \
code = dtable[index][0]; \ code = dtable[index][0]; \
dst0 = code>>8; \ OP(dst0, dst1, code); \
dst1 = code; \
LAST_SKIP_BITS(name, gb, n); \ LAST_SKIP_BITS(name, gb, n); \
} else { \ } else { \
int nb_bits; \ int nb_bits; \
@ -606,10 +605,12 @@ static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
} \ } \
} while (0) } while (0)
#define OP8bits(dst0, dst1, code) dst0 = code>>8; dst1 = code
#define READ_2PIX(dst0, dst1, plane1)\ #define READ_2PIX(dst0, dst1, plane1)\
UPDATE_CACHE(re, &s->gb); \ UPDATE_CACHE(re, &s->gb); \
GET_VLC_DUAL(dst0, dst1, re, &s->gb, s->vlc[4+plane1].table, \ GET_VLC_DUAL(dst0, dst1, re, &s->gb, s->vlc[4+plane1].table, \
s->vlc[0].table, s->vlc[plane1].table, VLC_BITS, 3) s->vlc[0].table, s->vlc[plane1].table, VLC_BITS, 3, OP8bits)
static void decode_422_bitstream(HYuvContext *s, int count) static void decode_422_bitstream(HYuvContext *s, int count)
{ {
@ -634,24 +635,15 @@ static void decode_422_bitstream(HYuvContext *s, int count)
CLOSE_READER(re, &s->gb); CLOSE_READER(re, &s->gb);
} }
/* TODO instead of restarting the read when the code isn't in the first level #define READ_2PIX_PLANE(dst0, dst1, plane, OP) \
* of the joint table, jump into the 2nd level of the individual table. */
#define READ_2PIX_PLANE(dst0, dst1, plane) \
UPDATE_CACHE(re, &s->gb); \ UPDATE_CACHE(re, &s->gb); \
GET_VLC_DUAL(dst0, dst1, re, &s->gb, s->vlc[4+plane].table, \ GET_VLC_DUAL(dst0, dst1, re, &s->gb, s->vlc[4+plane].table, \
s->vlc[plane].table, s->vlc[plane].table, VLC_BITS, 3) s->vlc[plane].table, s->vlc[plane].table, VLC_BITS, 3, OP)
#define READ_2PIX_PLANE14(dst0, dst1, plane){\ #define OP14bits(dst0, dst1, code) dst0 = code>>8; dst1 = sign_extend(code, 8)
int16_t code = get_vlc2(&s->gb, s->vlc[4+plane].table, VLC_BITS, 1);\
if(code != (int16_t)0xffff){\
dst0 = code>>8;\
dst1 = sign_extend(code, 8);\
}else{\
dst0 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3);\
dst1 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3);\
}\
}
/* TODO instead of restarting the read when the code isn't in the first level
* of the joint table, jump into the 2nd level of the individual table. */
#define READ_2PIX_PLANE16(dst0, dst1, plane){\ #define READ_2PIX_PLANE16(dst0, dst1, plane){\
dst0 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3)<<2;\ dst0 = get_vlc2(&s->gb, s->vlc[plane].table, VLC_BITS, 3)<<2;\
dst0 += get_bits(&s->gb, 2);\ dst0 += get_bits(&s->gb, 2);\
@ -668,24 +660,26 @@ static void decode_plane_bitstream(HYuvContext *s, int count, int plane)
OPEN_READER(re, &s->gb); OPEN_READER(re, &s->gb);
if (count >= (get_bits_left(&s->gb)) / (31 * 2)) { if (count >= (get_bits_left(&s->gb)) / (31 * 2)) {
for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) { for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {
READ_2PIX_PLANE(s->temp[0][2 * i], s->temp[0][2 * i + 1], plane); READ_2PIX_PLANE(s->temp[0][2 * i], s->temp[0][2 * i + 1], plane, OP8bits);
} }
} else { } else {
for(i=0; i<count; i++){ for(i=0; i<count; i++){
READ_2PIX_PLANE(s->temp[0][2 * i], s->temp[0][2 * i + 1], plane); READ_2PIX_PLANE(s->temp[0][2 * i], s->temp[0][2 * i + 1], plane, OP8bits);
} }
} }
CLOSE_READER(re, &s->gb); CLOSE_READER(re, &s->gb);
} else if (s->bps <= 14) { } else if (s->bps <= 14) {
OPEN_READER(re, &s->gb);
if (count >= (get_bits_left(&s->gb)) / (31 * 2)) { if (count >= (get_bits_left(&s->gb)) / (31 * 2)) {
for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) { for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {
READ_2PIX_PLANE14(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane); READ_2PIX_PLANE(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane, OP14bits);
} }
} else { } else {
for(i=0; i<count; i++){ for(i=0; i<count; i++){
READ_2PIX_PLANE14(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane); READ_2PIX_PLANE(s->temp16[0][2 * i], s->temp16[0][2 * i + 1], plane, OP14bits);
} }
} }
CLOSE_READER(re, &s->gb);
} else { } else {
if (count >= (get_bits_left(&s->gb)) / (31 * 2)) { if (count >= (get_bits_left(&s->gb)) / (31 * 2)) {
for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) { for (i = 0; i < count && get_bits_left(&s->gb) > 0; i++) {