diff options
| author | Linfeng Zhang <linfengz@google.com> | 2018-05-01 17:57:51 -0700 |
|---|---|---|
| committer | Linfeng Zhang <linfengz@google.com> | 2018-05-01 17:57:51 -0700 |
| commit | 28c563a11c4c1b429ce464eb8076282da641e21e (patch) | |
| tree | ae3c019af960041aff3f8503e82def0f5f6db56a /vp9/encoder/vp9_firstpass.c | |
| parent | e4408a07bea94740f5fc1cd05e62aa2dda5f57ff (diff) | |
| download | libvpx-28c563a11c4c1b429ce464eb8076282da641e21e.tar libvpx-28c563a11c4c1b429ce464eb8076282da641e21e.tar.gz libvpx-28c563a11c4c1b429ce464eb8076282da641e21e.tar.bz2 libvpx-28c563a11c4c1b429ce464eb8076282da641e21e.zip | |
Clean switch cases in vp9 encoder
To save a branch.
Change-Id: Ifa2be7583e95c6991784731c654bbd4cce31e993
Diffstat (limited to 'vp9/encoder/vp9_firstpass.c')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 3302fde08..c243a13a4 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -494,11 +494,10 @@ static int scale_sse_threshold(VP9_COMMON *cm, int thresh) { switch (cm->bit_depth) { case VPX_BITS_8: ret_val = thresh; break; case VPX_BITS_10: ret_val = thresh << 4; break; - case VPX_BITS_12: ret_val = thresh << 8; break; default: - assert(0 && - "cm->bit_depth should be VPX_BITS_8, " - "VPX_BITS_10 or VPX_BITS_12"); + assert(cm->bit_depth == VPX_BITS_12); + ret_val = thresh << 8; + break; } } #else @@ -520,11 +519,10 @@ static int get_ul_intra_threshold(VP9_COMMON *cm) { switch (cm->bit_depth) { case VPX_BITS_8: ret_val = UL_INTRA_THRESH; break; case VPX_BITS_10: ret_val = UL_INTRA_THRESH << 2; break; - case VPX_BITS_12: ret_val = UL_INTRA_THRESH << 4; break; default: - assert(0 && - "cm->bit_depth should be VPX_BITS_8, " - "VPX_BITS_10 or VPX_BITS_12"); + assert(cm->bit_depth == VPX_BITS_12); + ret_val = UL_INTRA_THRESH << 4; + break; } } #else @@ -541,11 +539,10 @@ static int get_smooth_intra_threshold(VP9_COMMON *cm) { switch (cm->bit_depth) { case VPX_BITS_8: ret_val = SMOOTH_INTRA_THRESH; break; case VPX_BITS_10: ret_val = SMOOTH_INTRA_THRESH << 4; break; - case VPX_BITS_12: ret_val = SMOOTH_INTRA_THRESH << 8; break; default: - assert(0 && - "cm->bit_depth should be VPX_BITS_8, " - "VPX_BITS_10 or VPX_BITS_12"); + assert(cm->bit_depth == VPX_BITS_12); + ret_val = SMOOTH_INTRA_THRESH << 8; + break; } } #else @@ -971,12 +968,10 @@ void vp9_first_pass_encode_tile_mb_row(VP9_COMP *cpi, ThreadData *td, switch (cm->bit_depth) { case VPX_BITS_8: break; case VPX_BITS_10: this_error >>= 4; break; - case VPX_BITS_12: this_error >>= 8; break; default: - assert(0 && - "cm->bit_depth should be VPX_BITS_8, " - "VPX_BITS_10 or VPX_BITS_12"); - return; + assert(cm->bit_depth == VPX_BITS_12); + this_error >>= 8; + break; } } #endif // CONFIG_VP9_HIGHBITDEPTH @@ -3025,12 +3020,13 @@ static void configure_buffer_updates(VP9_COMP *cpi) { cpi->refresh_alt_ref_frame = 0; cpi->rc.is_src_frame_alt_ref = 1; break; - case ARF_UPDATE: + default: + assert(twopass->gf_group.update_type[twopass->gf_group.index] == + ARF_UPDATE); cpi->refresh_last_frame = 0; cpi->refresh_golden_frame = 0; cpi->refresh_alt_ref_frame = 1; break; - default: assert(0); break; } } |