Delete the od_ec_enc_checkpoint/rollback functions Also delete the OD_COPY and OD_MOVE macros. These are all unused. Change-Id: I3bd9fbc1a4b592f9591eff721968df2273c9098f
diff --git a/aom_dsp/entenc.c b/aom_dsp/entenc.c index dfc1624..f8b5da9 100644 --- a/aom_dsp/entenc.c +++ b/aom_dsp/entenc.c
@@ -372,28 +372,3 @@ uint32_t od_ec_enc_tell_frac(const od_ec_enc *enc) { return od_ec_tell_frac(od_ec_enc_tell(enc), enc->rng); } - -/*Saves a entropy coder checkpoint to dst. - This allows an encoder to reverse a series of entropy coder - decisions if it decides that the information would have been - better coded some other way.*/ -void od_ec_enc_checkpoint(od_ec_enc *dst, const od_ec_enc *src) { - OD_COPY(dst, src, 1); -} - -/*Restores an entropy coder checkpoint saved by od_ec_enc_checkpoint. - This can only be used to restore from checkpoints earlier in the target - state's history: you can not switch backwards and forwards or otherwise - switch to a state which isn't a casual ancestor of the current state. - Restore is also incompatible with patching the initial bits, as the - changes will remain in the restored version.*/ -void od_ec_enc_rollback(od_ec_enc *dst, const od_ec_enc *src) { - unsigned char *buf; - uint32_t storage; - assert(dst->storage >= src->storage); - buf = dst->buf; - storage = dst->storage; - OD_COPY(dst, src, 1); - dst->buf = buf; - dst->storage = storage; -}
diff --git a/aom_dsp/entenc.h b/aom_dsp/entenc.h index d26f027..1a38aff 100644 --- a/aom_dsp/entenc.h +++ b/aom_dsp/entenc.h
@@ -74,9 +74,6 @@ OD_WARN_UNUSED_RESULT uint32_t od_ec_enc_tell_frac(const od_ec_enc *enc) OD_ARG_NONNULL(1); -void od_ec_enc_checkpoint(od_ec_enc *dst, const od_ec_enc *src); -void od_ec_enc_rollback(od_ec_enc *dst, const od_ec_enc *src); - // buf is the frame bitbuffer, offs is where carry to be added static AOM_INLINE void propagate_carry_bwd(unsigned char *buf, uint32_t offs) { uint16_t sum, carry = 1;
diff --git a/aom_dsp/odintrin.h b/aom_dsp/odintrin.h index 20a7f58..9e4ba50 100644 --- a/aom_dsp/odintrin.h +++ b/aom_dsp/odintrin.h
@@ -70,20 +70,6 @@ #define OD_ARG_NONNULL(x) #endif -/** Copy n elements of memory from src to dst. The 0* term provides - compile-time type checking */ -#if !defined(OVERRIDE_OD_COPY) -#define OD_COPY(dst, src, n) \ - (memcpy((dst), (src), sizeof(*(dst)) * (n) + 0 * ((dst) - (src)))) -#endif - -/** Copy n elements of memory from src to dst, allowing overlapping regions. - The 0* term provides compile-time type checking */ -#if !defined(OVERRIDE_OD_MOVE) -# define OD_MOVE(dst, src, n) \ - (memmove((dst), (src), sizeof(*(dst))*(n) + 0*((dst) - (src)) )) -#endif - /*All of these macros should expect floats as arguments.*/ # define OD_SIGNMASK(a) (-((a) < 0)) # define OD_FLIPSIGNI(a, b) (((a) + OD_SIGNMASK(b)) ^ OD_SIGNMASK(b))