LineageOS/android_external_libvpx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
test/webm_video_source.h
View File

@@ -69,18 +69,6 @@ class WebMVideoSource : public CompressedVideoSource {
}
}
void SeekToNextKeyFrame() {
ASSERT_TRUE(vpx_ctx_->file != NULL);
do {
const int status = webm_read_frame(webm_ctx_, &buf_, &buf_sz_, &buf_sz_);
ASSERT_GE(status, 0) << "webm_read_frame failed";
++frame_;
if (status == 1) {
end_of_file_ = true;
}
} while (!webm_ctx_->is_key_frame && !end_of_file_);
}
virtual const uint8_t *cxdata() const {
return end_of_file_ ? NULL : buf_;
}