diff options
| author | angiebird <angiebird@google.com> | 2019-12-12 15:43:48 -0800 |
|---|---|---|
| committer | angiebird <angiebird@google.com> | 2019-12-13 11:15:12 -0800 |
| commit | bfa9d015b0dc00cb70af55bb16c7eb3feef218c5 (patch) | |
| tree | 1c63856de207ec29036e2a862059000353db73fd /vp9/encoder/vp9_encoder.c | |
| parent | b4a8ac3c46dfcc46ecb30c8730d3312d07419533 (diff) | |
| download | libvpx-bfa9d015b0dc00cb70af55bb16c7eb3feef218c5.tar libvpx-bfa9d015b0dc00cb70af55bb16c7eb3feef218c5.tar.gz libvpx-bfa9d015b0dc00cb70af55bb16c7eb3feef218c5.tar.bz2 libvpx-bfa9d015b0dc00cb70af55bb16c7eb3feef218c5.zip | |
Move psnr/sse computation under RATE_CTRL flag
in update_encode_frame_result()
Change-Id: Ie86d11f66744ef95dd224c7daf325750a5e5458b
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 4a37816e2..d532acb1e 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -7107,17 +7107,24 @@ static void update_encode_frame_result(ENCODE_FRAME_RESULT *encode_frame_result, const YV12_BUFFER_CONFIG *coded_frame, int quantize_index, uint32_t bit_depth, uint32_t input_bit_depth) { +#if CONFIG_RATE_CTRL PSNR_STATS psnr; #if CONFIG_VP9_HIGHBITDEPTH vpx_calc_highbd_psnr(source_frame, coded_frame, &psnr, bit_depth, input_bit_depth); -#else +#else // CONFIG_VP9_HIGHBITDEPTH (void)bit_depth; (void)input_bit_depth; vpx_calc_psnr(source_frame, coded_frame, &psnr); -#endif +#endif // CONFIG_VP9_HIGHBITDEPTH encode_frame_result->psnr = psnr.psnr[0]; encode_frame_result->sse = psnr.sse[0]; +#else // CONFIG_RATE_CTRL + (void)bit_depth; + (void)input_bit_depth; + (void)source_frame; + (void)coded_frame; +#endif // CONFIG_RATE_CTRL encode_frame_result->show_idx = show_idx; encode_frame_result->update_type = update_type; encode_frame_result->quantize_index = quantize_index; |