From f56fe04de3cc4cdc6b618dfe7a3506fc2ea79795 Mon Sep 17 00:00:00 2001 From: Nicolas Bertrand Date: Fri, 12 Jul 2013 23:15:43 +0200 Subject: jpeg2000: Initialize only once mqc arrays Improves decoding speed. Signed-off-by: Luca Barbato --- libavcodec/mqc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'libavcodec/mqc.c') diff --git a/libavcodec/mqc.c b/libavcodec/mqc.c index 4a8ce0356c..60d87ba1a6 100644 --- a/libavcodec/mqc.c +++ b/libavcodec/mqc.c @@ -92,14 +92,9 @@ uint16_t ff_mqc_qe [2 * 47]; uint8_t ff_mqc_nlps[2 * 47]; uint8_t ff_mqc_nmps[2 * 47]; -void ff_mqc_init_contexts(MqcState *mqc) +void ff_mqc_init_context_tables(void) { int i; - memset(mqc->cx_states, 0, sizeof(mqc->cx_states)); - mqc->cx_states[MQC_CX_UNI] = 2 * 46; - mqc->cx_states[MQC_CX_RL] = 2 * 3; - mqc->cx_states[0] = 2 * 4; - for (i = 0; i < 47; i++) { ff_mqc_qe[2 * i] = ff_mqc_qe[2 * i + 1] = cx_states[i].qe; @@ -110,3 +105,11 @@ void ff_mqc_init_contexts(MqcState *mqc) ff_mqc_nmps[2 * i + 1] = 2 * cx_states[i].nmps + 1; } } + +void ff_mqc_init_contexts(MqcState *mqc) +{ + memset(mqc->cx_states, 0, sizeof(mqc->cx_states)); + mqc->cx_states[MQC_CX_UNI] = 2 * 46; + mqc->cx_states[MQC_CX_RL] = 2 * 3; + mqc->cx_states[0] = 2 * 4; +} -- cgit v1.2.3