summaryrefslogtreecommitdiff
path: root/webmdec.h
diff options
context:
space:
mode:
authorhkuang <hkuang@google.com>2015-01-27 12:26:28 -0800
committerhkuang <hkuang@google.com>2015-01-30 21:00:13 -0800
commitbe6aeadaf49de28f13355d5dd7f64b4074dcca7c (patch)
tree9719755429ff45d0cfbba3720e3c4571f8f8c67e /webmdec.h
parentf6c2a6c5d639b1837e75c85f155b8feefdb6e07c (diff)
downloadlibvpx-be6aeadaf49de28f13355d5dd7f64b4074dcca7c.tar
libvpx-be6aeadaf49de28f13355d5dd7f64b4074dcca7c.tar.gz
libvpx-be6aeadaf49de28f13355d5dd7f64b4074dcca7c.tar.bz2
libvpx-be6aeadaf49de28f13355d5dd7f64b4074dcca7c.zip
Try again to merge branch 'frame-parallel' into master branch.
In frame parallel decode, libvpx decoder decodes several frames on all cpus in parallel fashion. If not being flushed, it will only return frame when all the cpus are busy. If getting flushed, it will return all the frames in the decoder. Compare with current serial decode mode in which libvpx decoder is idle between decode calls, libvpx decoder is busy between decode calls. Current frame parallel decode will only speed up the decoding for frame parallel encoded videos. For non frame parallel encoded videos, frame parallel decode is slower than serial decode due to lack of loopfilter worker thread. There are still some known issues that need to be addressed. For example: decode frame parallel videos with segmentation enabled is not right sometimes. * frame-parallel: Add error handling for frame parallel decode and unit test for that. Fix a bug in frame parallel decode and add a unit test for that. Add two test vectors to test frame parallel decode. Add key frame seeking to webmdec and webm_video_source. Implement frame parallel decode for VP9. Increase the thread test range to cover 5, 6, 7, 8 threads. Fix a bug in adding frame parallel unit test. Add VP9 frame-parallel unit test. Manually pick "Make the api behavior conform to api spec." from master branch. Move vp9_dec_build_inter_predictors_* to decoder folder. Add segmentation map array for current and last frame segmentation. Include the right header for VP9 worker thread. Move vp9_thread.* to common. ctrl_get_reference does not need user_priv. Seperate the frame buffers from VP9 encoder/decoder structure. Revert "Revert "Revert "Revert 3 patches from Hangyu to get Chrome to build:""" Conflicts: test/codec_factory.h test/decode_test_driver.cc test/decode_test_driver.h test/invalid_file_test.cc test/test-data.sha1 test/test.mk test/test_vectors.cc vp8/vp8_dx_iface.c vp9/common/vp9_alloccommon.c vp9/common/vp9_entropymode.c vp9/common/vp9_loopfilter_thread.c vp9/common/vp9_loopfilter_thread.h vp9/common/vp9_mvref_common.c vp9/common/vp9_onyxc_int.h vp9/common/vp9_reconinter.c vp9/decoder/vp9_decodeframe.c vp9/decoder/vp9_decodeframe.h vp9/decoder/vp9_decodemv.c vp9/decoder/vp9_decoder.c vp9/decoder/vp9_decoder.h vp9/encoder/vp9_encoder.c vp9/encoder/vp9_pickmode.c vp9/encoder/vp9_rdopt.c vp9/vp9_cx_iface.c vp9/vp9_dx_iface.c This reverts commit a18da9760a74d9ce6fb9f875706dc639c95402f5. Change-Id: I361442ffec1586d036ea2e0ee97ce4f077585f02
Diffstat (limited to 'webmdec.h')
-rw-r--r--webmdec.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/webmdec.h b/webmdec.h
index 29b815da1..1cd35d41a 100644
--- a/webmdec.h
+++ b/webmdec.h
@@ -28,6 +28,7 @@ struct WebmInputContext {
int block_frame_index;
int video_track_index;
uint64_t timestamp_ns;
+ int is_key_frame;
};
// Checks if the input is a WebM file. If so, initializes WebMInputContext so