[NORMATIVE, FILM_GRAIN_SHOWEX] Enable FILM_GRAIN_SHOWEX

Enable FILM_GRAIN_SHOWEX by default as it was provisionally
adopted at the WG meeting on 2018-Feb-23

Note: Enabling will add the "showable_frame" flag even if
FILM_GRAIN is disabled. Once FILM_GRAIN is also enabled
then the new FILM_GRAIN_SHOWEX film grain paramater
signalling will be used.

Change-Id: I77842ae70f1906969cfec0580383d5fa492333b1

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 857e000..7aea432 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2726,7 +2726,7 @@
     for (ref_frame = LAST_FRAME; ref_frame < TOTAL_REFS_PER_FRAME;
          ref_frame++) {
       ref_idx = get_ref_frame_map_idx(cpi, ref_frame);
-      assert(idx != INVALID_IDX);
+      assert(ref_idx != INVALID_IDX);
       buf_idx = cm->ref_frame_map[ref_idx];
       if (frame_bufs[buf_idx].film_grain_params_present &&
           memcmp(pars, &frame_bufs[buf_idx].film_grain_params, sizeof(*pars))) {

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index c23621e..918ed32 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -102,7 +102,7 @@
 set(CONFIG_EXT_WARPED_MOTION 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_FAST_SGR 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_FILM_GRAIN 0 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_FILM_GRAIN_SHOWEX 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_FILM_GRAIN_SHOWEX 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_FP_MB_STATS 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_FRAME_REFS_SIGNALING 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_FWD_KF 0 CACHE NUMBER "AV1 experiment flag.")