commit 39051a7787b472fb5fbf1c3683fb14c62e925d2e
author Nathan E. Egge <negge@mozilla.com> Thu Dec 22 17:07:28 2016 -0500
committer Nathan Egge <negge@mozilla.com> Mon Jan 09 17:03:21 2017 +0000
tree 67101de334b8a74f3bd8d6333c759e95d949012d
parent 140069eb75b12f7f4e06b896720c20270e86973c

Use aom_writer with od_encode_cdf_adapt().

Change the od_encode_cdf_adapt() function to take an aom_writer
 struct instead of an od_ec_enc struct.
Rename od_encode_cdf_adapt() to aom_encode_cdf_adapt().

Change-Id: I00de05b8b7428f67139c234160ab9aaf8900f967

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 9c0d3bf..5cf6244 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2116,9 +2116,9 @@
           pvq = get_pvq_block(cpi->td.mb.pvq_q);
 
           // encode block skip info
-          od_encode_cdf_adapt(&w->ec, pvq->ac_dc_coded,
-                              adapt->skip_cdf[2 * tx_size + (plane != 0)], 4,
-                              adapt->skip_increment);
+          aom_encode_cdf_adapt(w, pvq->ac_dc_coded,
+                               adapt->skip_cdf[2 * tx_size + (plane != 0)], 4,
+                               adapt->skip_increment);
 
           // AC coeffs coded?
           if (pvq->ac_dc_coded & 0x02) {
@@ -2136,8 +2136,8 @@
                     pvq->skip_rest, encode_flip, flip);
               }
               if (i == 0 && !pvq->skip_rest && pvq->bs > 0) {
-                od_encode_cdf_adapt(
-                    &w->ec, pvq->skip_dir,
+                aom_encode_cdf_adapt(
+                    w, pvq->skip_dir,
                     &adapt->pvq
                          .pvq_skip_dir_cdf[(plane != 0) + 2 * (pvq->bs - 1)][0],
                     7, adapt->pvq.pvq_skip_dir_increment);