[FFmpeg-cvslog] jpeg2000: Initialize only once mqc arrays

[Nicolas Bertrand]

ffmpeg | branch: master | Nicolas Bertrand <nicoinattendu at gmail.com> | Fri Jul 12 23:15:43 2013 +0200| [f56fe04de3cc4cdc6b618dfe7a3506fc2ea79795] | committer: Luca Barbato

jpeg2000: Initialize only once mqc arrays

Improves decoding speed.

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f56fe04de3cc4cdc6b618dfe7a3506fc2ea79795
---

 libavcodec/jpeg2000dec.c |    1 +
 libavcodec/mqc.c         |   15 +++++++++------
 libavcodec/mqc.h         |    5 +++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 48fd98d..61befdf 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1459,6 +1459,7 @@ end:
 static void jpeg2000_init_static_data(AVCodec *codec)
 {
     ff_jpeg2000_init_tier1_luts();
+    ff_mqc_init_context_tables();
 }
 
 #define OFFSET(x) offsetof(Jpeg2000DecoderContext, x)
diff --git a/libavcodec/mqc.c b/libavcodec/mqc.c
index 4a8ce03..60d87ba 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;
+}
diff --git a/libavcodec/mqc.h b/libavcodec/mqc.h
index 3b849c2..a65433e 100644
--- a/libavcodec/mqc.h
+++ b/libavcodec/mqc.h
@@ -65,6 +65,11 @@ int ff_mqc_decode(MqcState *mqc, uint8_t *cxstate);
 /* common */
 
 /**
+ * MQ-coder Initialize context tables (QE, NLPS, NMPS)
+ */
+void ff_mqc_init_context_tables(void);
+
+/**
  * MQ-coder context initialisations.
  * @param mqc       MQ-coder context
  */