diff options
author | Yaowu Xu <yaowu@google.com> | 2014-09-02 16:21:57 -0700 |
---|---|---|
committer | Yaowu Xu <yaowu@google.com> | 2014-09-03 09:34:10 -0700 |
commit | c1058e5bbec4d6b5b6770f3011bca183a3948e93 (patch) | |
tree | c97e048ca542b55f14c09fee001bb0b5bdf8a619 /vp9/encoder | |
parent | 14bcbdac7610202a19eaf9d61b2dfb10f4096909 (diff) | |
download | libvpx-c1058e5bbec4d6b5b6770f3011bca183a3948e93.tar libvpx-c1058e5bbec4d6b5b6770f3011bca183a3948e93.tar.gz libvpx-c1058e5bbec4d6b5b6770f3011bca183a3948e93.tar.bz2 libvpx-c1058e5bbec4d6b5b6770f3011bca183a3948e93.zip |
select_tx_mode(): remove special case for key frame
This commit removes the special case for key frame, as transform size
decision is controlled by the appropriate speed feature for all lossy
coding modes: tx_size_search_method.
Change-Id: I9677171e3f2432ec23705f7c5ea8170dd4562fae
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 07134dc9d..72ced0529 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2603,8 +2603,6 @@ static MV_REFERENCE_FRAME get_frame_type(const VP9_COMP *cpi) { static TX_MODE select_tx_mode(const VP9_COMP *cpi) { if (cpi->mb.e_mbd.lossless) return ONLY_4X4; - if (cpi->common.frame_type == KEY_FRAME) - return TX_MODE_SELECT; if (cpi->sf.tx_size_search_method == USE_LARGESTALL) return ALLOW_32X32; else if (cpi->sf.tx_size_search_method == USE_FULL_RD|| |