commit cf772765f995adc42d3774e8281eff28f3a433b1
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Fri Nov 03 16:41:07 2017 +0000
committer Debargha Mukherjee <debargha@google.com> Fri Nov 03 20:14:02 2017 +0000
tree 130b8841d84f9867d92fd0eb8fe5ed5e014e81c3
parent d418f68e210be3736d870aac794f7b0eece08329

Avoid some mismatched braces in bitstream.c

These play havoc with editors' "jump to start of function"
commands. There should be no change to generated code.

Change-Id: Ib6961bb952da02081a675d0a4fa01eea2c1ff6d1

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 8540a74..128aa76 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -165,12 +165,12 @@
 
   assert(mbmi->ref_mv_idx < 3);
 
+  const int new_mv =
 #if CONFIG_COMPOUND_SINGLEREF
-  if (mbmi->mode == NEWMV || mbmi->mode == NEW_NEWMV ||
-      mbmi->mode == SR_NEW_NEWMV) {
-#else   // !CONFIG_COMPOUND_SINGLEREF
-  if (mbmi->mode == NEWMV || mbmi->mode == NEW_NEWMV) {
-#endif  // CONFIG_COMPOUND_SINGLEREF
+      mbmi->mode == SR_NEW_NEWMV ||
+#endif
+      mbmi->mode == NEWMV || mbmi->mode == NEW_NEWMV;
+  if (new_mv) {
     int idx;
     for (idx = 0; idx < 2; ++idx) {
       if (mbmi_ext->ref_mv_count[ref_frame_type] > idx + 1) {
@@ -262,12 +262,14 @@
     return;
   }
 
+  const int write_txfm_partition =
 #if CONFIG_RECT_TX_EXT
-  if (tx_size == mbmi->inter_tx_size[tx_row][tx_col] ||
-      mbmi->tx_size == quarter_txsize_lookup[mbmi->sb_type]) {
+      tx_size == mbmi->inter_tx_size[tx_row][tx_col] ||
+      mbmi->tx_size == quarter_txsize_lookup[mbmi->sb_type];
 #else
-  if (tx_size == mbmi->inter_tx_size[tx_row][tx_col]) {
+      tx_size == mbmi->inter_tx_size[tx_row][tx_col];
 #endif
+  if (write_txfm_partition) {
 #if CONFIG_NEW_MULTISYMBOL
     aom_write_symbol(w, 0, ec_ctx->txfm_partition_cdf[ctx], 2);
 #else
@@ -401,30 +403,29 @@
 
   MOTION_MODE last_motion_mode_allowed =
       motion_mode_allowed(0, cm->global_motion, xd, mi);
-  if (last_motion_mode_allowed == SIMPLE_TRANSLATION) return;
+  switch (last_motion_mode_allowed) {
+    case SIMPLE_TRANSLATION: break;
 #if CONFIG_NCOBMC_ADAPT_WEIGHT
-  if (last_motion_mode_allowed == NCOBMC_ADAPT_WEIGHT) {
-    aom_write_symbol(w, mbmi->motion_mode,
-                     xd->tile_ctx->ncobmc_cdf[mbmi->sb_type],
-                     OBMC_FAMILY_MODES);
-  } else if (last_motion_mode_allowed == OBMC_CAUSAL) {
-    aom_write_symbol(w, mbmi->motion_mode == OBMC_CAUSAL,
-                     xd->tile_ctx->obmc_cdf[mbmi->sb_type], 2);
-  } else {
-#else
-  if (last_motion_mode_allowed == OBMC_CAUSAL) {
-#if CONFIG_NEW_MULTISYMBOL
-    aom_write_symbol(w, mbmi->motion_mode == OBMC_CAUSAL,
-                     xd->tile_ctx->obmc_cdf[mbmi->sb_type], 2);
-#else
-    aom_write(w, mbmi->motion_mode == OBMC_CAUSAL,
-              cm->fc->obmc_prob[mbmi->sb_type]);
+    case NCOBMC_ADAPT_WEIGHT:
+      aom_write_symbol(w, mbmi->motion_mode,
+                       xd->tile_ctx->ncobmc_cdf[mbmi->sb_type],
+                       OBMC_FAMILY_MODES);
+      break;
 #endif
-  } else {
-#endif  // CONFIG_NCOBMC_ADAPT_WEIGHT
-    aom_write_symbol(w, mbmi->motion_mode,
-                     xd->tile_ctx->motion_mode_cdf[mbmi->sb_type],
-                     MOTION_MODES);
+    case OBMC_CAUSAL:
+#if CONFIG_NEW_MULTISYMBOL
+      aom_write_symbol(w, mbmi->motion_mode == OBMC_CAUSAL,
+                       xd->tile_ctx->obmc_cdf[mbmi->sb_type], 2);
+#else
+      aom_write(w, mbmi->motion_mode == OBMC_CAUSAL,
+                cm->fc->obmc_prob[mbmi->sb_type]);
+#endif
+      break;
+
+    default:
+      aom_write_symbol(w, mbmi->motion_mode,
+                       xd->tile_ctx->motion_mode_cdf[mbmi->sb_type],
+                       MOTION_MODES);
   }
 }