Revert "Merge branch 'frame-parallel' to enable frame parallel decode in master branch."

This reverts commit bde04ce503

Change-Id: I053dae04c761b04a36dc239558503905a14d2470
This commit is contained in:
Johann
2015-01-23 08:42:02 -08:00
committed by Gerrit Code Review
parent bde04ce503
commit a18da9760a
36 changed files with 601 additions and 1967 deletions

View File

@@ -163,9 +163,7 @@ class Vp9EncoderParmsGetToDecoder
EncodeParameters encode_parms;
};
// TODO(hkuang): This test conflicts with frame parallel decode. So disable it
// for now until fix.
TEST_P(Vp9EncoderParmsGetToDecoder, DISABLED_BitstreamParms) {
TEST_P(Vp9EncoderParmsGetToDecoder, BitstreamParms) {
init_flags_ = VPX_CODEC_USE_PSNR;
libvpx_test::VideoSource *video;