diff options
author | hkuang <hkuang@google.com> | 2015-01-21 14:51:08 -0800 |
---|---|---|
committer | hkuang <hkuang@google.com> | 2015-01-22 18:18:53 -0800 |
commit | bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7 (patch) | |
tree | c8deba42cf8550f22b59ca5031e183a373c2c25a /vpx | |
parent | 0dccb6277c9350c157e866c243e9c93956635e6e (diff) | |
parent | d05cf10fe718ebb09394d9c183ed046d05a8e6a2 (diff) | |
download | libvpx-bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7.tar libvpx-bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7.tar.gz libvpx-bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7.tar.bz2 libvpx-bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7.zip |
Merge branch 'frame-parallel' to enable frame parallel decode in 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. VP9 frame parallel decode is >30% faster than serial
decode with tile parallel threading which will makes devices play 1080P
VP9 videos more easily.
* 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
Change-Id: Ib92eb35851c172d0624970e312ed515054e5ca64
Diffstat (limited to 'vpx')
-rw-r--r-- | vpx/vpx_frame_buffer.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vpx/vpx_frame_buffer.h b/vpx/vpx_frame_buffer.h index 41038b10d..9036459af 100644 --- a/vpx/vpx_frame_buffer.h +++ b/vpx/vpx_frame_buffer.h @@ -22,8 +22,11 @@ extern "C" { #include "./vpx_integer.h" /*!\brief The maximum number of work buffers used by libvpx. + * Support maximum 4 threads to decode video in parallel. + * Each thread will use one work buffer. + * TODO(hkuang): Add support to set number of worker threads dynamically. */ -#define VPX_MAXIMUM_WORK_BUFFERS 1 +#define VPX_MAXIMUM_WORK_BUFFERS 8 /*!\brief The maximum number of reference buffers that a VP9 encoder may use. */ |