summaryrefslogtreecommitdiffstats
path: root/remoting/codec
diff options
context:
space:
mode:
authoraconverse <aconverse@chromium.org>2015-03-04 17:07:32 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-05 01:08:10 +0000
commit6d0e2690d8a1352f48daea52574aba0d1c0f51bd (patch)
tree6cae3314ba12d677394d9be70cd8835d4107ee95 /remoting/codec
parentc9e732f0fa4e56c44da31601f3ed09388bd7ba98 (diff)
downloadchromium_src-6d0e2690d8a1352f48daea52574aba0d1c0f51bd.zip
chromium_src-6d0e2690d8a1352f48daea52574aba0d1c0f51bd.tar.gz
chromium_src-6d0e2690d8a1352f48daea52574aba0d1c0f51bd.tar.bz2
Revert of Use tiles when encoding with VP9. (patchset #1 id:1 of https://codereview.chromium.org/977663004/)
Reason for revert: Breaks linux valgrind, needs libvpx side fixes and roll, http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28valgrind%29%283%29/builds/44420 Original issue's description: > Use tiles when encoding with VP9. > > VP9's tile encoding feature allows for multithreaded parallelism on both the > encoder and decoder side. > > TEST=Run remoting_perftests under VTune and see that two logical CPUs are used > BUG=134202 > > Committed: https://crrev.com/e67fefbf4f5a5a83ca8d487f422b09664dc4c8fe > Cr-Commit-Position: refs/heads/master@{#319167} TBR=wez@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=134202 Review URL: https://codereview.chromium.org/978133002 Cr-Commit-Position: refs/heads/master@{#319185}
Diffstat (limited to 'remoting/codec')
-rw-r--r--remoting/codec/video_encoder_vpx.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/remoting/codec/video_encoder_vpx.cc b/remoting/codec/video_encoder_vpx.cc
index d9f5bf7..73e8ee8 100644
--- a/remoting/codec/video_encoder_vpx.cc
+++ b/remoting/codec/video_encoder_vpx.cc
@@ -133,10 +133,6 @@ void SetVp9CodecOptions(vpx_codec_ctx_t* codec, bool lossless_encode) {
ret = vpx_codec_control(
codec, VP9E_SET_TUNE_CONTENT, VP9E_CONTENT_SCREEN);
DCHECK_EQ(VPX_CODEC_OK, ret) << "Failed to set screen content mode";
-
- // VP9 tiles allow for parallelism on both encode and decode
- ret = vpx_codec_control(codec, VP9E_SET_TILE_COLUMNS, 1);
- DCHECK_EQ(VPX_CODEC_OK, ret) << "Failed to set tile columns";
}
void CreateImage(bool use_i444,