diff options
author | James Zern <jzern@google.com> | 2016-08-08 20:12:42 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-08 20:12:42 +0000 |
commit | cfd92dab18639c7f1198393ce04613e6d2b126eb (patch) | |
tree | 3875dc00655001eba8016ac83677ea31bfc7ae5b /test/keyframe_test.cc | |
parent | 6a8d4631a8b28c2fb0be87467d38174ea3c04e95 (diff) | |
parent | 2c17d54681bf6f529fac713d37075e8060e0c72a (diff) | |
download | libvpx-cfd92dab18639c7f1198393ce04613e6d2b126eb.tar libvpx-cfd92dab18639c7f1198393ce04613e6d2b126eb.tar.gz libvpx-cfd92dab18639c7f1198393ce04613e6d2b126eb.tar.bz2 libvpx-cfd92dab18639c7f1198393ce04613e6d2b126eb.zip |
Merge changes from topic 'clang-tidy'
* changes:
*_perf_test.cc: correct DoDecode signature
test: apply clang-tidy google-readability-braces-around-statements
Diffstat (limited to 'test/keyframe_test.cc')
-rw-r--r-- | test/keyframe_test.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/keyframe_test.cc b/test/keyframe_test.cc index 03cdedc1a..38bd923b7 100644 --- a/test/keyframe_test.cc +++ b/test/keyframe_test.cc @@ -35,10 +35,12 @@ class KeyframeTest virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video, ::libvpx_test::Encoder *encoder) { - if (kf_do_force_kf_) + if (kf_do_force_kf_) { frame_flags_ = (video->frame() % 3) ? 0 : VPX_EFLAG_FORCE_KF; - if (set_cpu_used_ && video->frame() == 1) + } + if (set_cpu_used_ && video->frame() == 1) { encoder->Control(VP8E_SET_CPUUSED, set_cpu_used_); + } } virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) { |