Commit f56fe04d authored by Nicolas Bertrand's avatar Nicolas Bertrand Committed by Luca Barbato

jpeg2000: Initialize only once mqc arrays

Improves decoding speed.
Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent bec509db
...@@ -1459,6 +1459,7 @@ end: ...@@ -1459,6 +1459,7 @@ end:
static void jpeg2000_init_static_data(AVCodec *codec) static void jpeg2000_init_static_data(AVCodec *codec)
{ {
ff_jpeg2000_init_tier1_luts(); ff_jpeg2000_init_tier1_luts();
ff_mqc_init_context_tables();
} }
#define OFFSET(x) offsetof(Jpeg2000DecoderContext, x) #define OFFSET(x) offsetof(Jpeg2000DecoderContext, x)
......
...@@ -92,14 +92,9 @@ uint16_t ff_mqc_qe [2 * 47]; ...@@ -92,14 +92,9 @@ uint16_t ff_mqc_qe [2 * 47];
uint8_t ff_mqc_nlps[2 * 47]; uint8_t ff_mqc_nlps[2 * 47];
uint8_t ff_mqc_nmps[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; 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++) { for (i = 0; i < 47; i++) {
ff_mqc_qe[2 * i] = ff_mqc_qe[2 * i] =
ff_mqc_qe[2 * i + 1] = cx_states[i].qe; ff_mqc_qe[2 * i + 1] = cx_states[i].qe;
...@@ -110,3 +105,11 @@ void ff_mqc_init_contexts(MqcState *mqc) ...@@ -110,3 +105,11 @@ void ff_mqc_init_contexts(MqcState *mqc)
ff_mqc_nmps[2 * i + 1] = 2 * cx_states[i].nmps + 1; 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;
}
...@@ -64,6 +64,11 @@ int ff_mqc_decode(MqcState *mqc, uint8_t *cxstate); ...@@ -64,6 +64,11 @@ int ff_mqc_decode(MqcState *mqc, uint8_t *cxstate);
/* common */ /* common */
/**
* MQ-coder Initialize context tables (QE, NLPS, NMPS)
*/
void ff_mqc_init_context_tables(void);
/** /**
* MQ-coder context initialisations. * MQ-coder context initialisations.
* @param mqc MQ-coder context * @param mqc MQ-coder context
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment