virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

jpeg2000: Initialize only once mqc arrays

Browse Source 
Increases encoding and decoding speed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Nicolas Bertrand 2013-07-12 23:01:43 +02:00 committed by Michael Niedermayer
parent 7f4a1fddd3
commit dd1382ac95
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/j2kenc.c
View File

@ -1016,7 +1016,7 @@ static av_cold int j2kenc_init(AVCodecContext *avctx)
} }
ff_jpeg2000_init_tier1_luts(); ff_jpeg2000_init_tier1_luts();
ff_mqc_init_context_tables();
init_luts(); init_luts();
init_quantization(s); init_quantization(s);

1
libavcodec/jpeg2000dec.c
View File

@ -1466,6 +1466,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)

15
libavcodec/mqc.c
View File

@ -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)
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;
}

5
libavcodec/mqc.h
View File

@ -78,6 +78,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