Make static CDF tables source directly from rodata

Fixes #57, removes one rodata duplicate (vertical mv component is
identical to horizontal one), and removes memcpy() of rodata tables
to the source Dav1dThreadCdfContext for each frame where primary_ref
is PRIMARY_REF_NONE.

1 files changed, 8 insertions, 5 deletions

diff --git a/src/cdf.h b/src/cdf.h
index 27d0f65..40fae01 100644
--- a/src/cdf.h
+++ b/src/cdf.h
@@ -125,19 +125,22 @@ typedef struct CdfContext {
 } CdfContext;
 
 typedef struct CdfThreadContext {
-    CdfContext *cdf;
     Dav1dRef *ref; ///< allocation origin
+    union {
+        CdfContext *cdf; // if ref != NULL
+        unsigned qcat; // if ref == NULL, from static CDF tables
+    } data;
     struct thread_data *t;
     atomic_uint *progress;
 } CdfThreadContext;
 
-int dav1d_init_states(CdfThreadContext *cdf, int qidx);
-void dav1d_update_tile_cdf(const Dav1dFrameHeader *hdr, CdfContext *dst,
-                         const CdfContext *src);
-
+void dav1d_cdf_thread_init_static(CdfThreadContext *cdf, int qidx);
 int dav1d_cdf_thread_alloc(CdfThreadContext *cdf, struct thread_data *t);
+void dav1d_cdf_thread_copy(CdfContext *dst, const CdfThreadContext *src);
 void dav1d_cdf_thread_ref(CdfThreadContext *dst, CdfThreadContext *src);
 void dav1d_cdf_thread_unref(CdfThreadContext *cdf);
+void dav1d_cdf_thread_update(const Dav1dFrameHeader *hdr, CdfContext *dst,
+                             const CdfContext *src);
 
 /*
  * These are binary signals (so a signal is either "done" or "not done").