be6aeadaf4
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 a18da9760a
.
Change-Id: I361442ffec1586d036ea2e0ee97ce4f077585f02
122 lines
4.4 KiB
C++
122 lines
4.4 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
#include "test/codec_factory.h"
|
|
#include "test/decode_test_driver.h"
|
|
#include "third_party/googletest/src/include/gtest/gtest.h"
|
|
#include "test/register_state_check.h"
|
|
#include "test/video_source.h"
|
|
|
|
namespace libvpx_test {
|
|
|
|
const char kVP8Name[] = "WebM Project VP8";
|
|
|
|
vpx_codec_err_t Decoder::PeekStream(const uint8_t *cxdata, size_t size,
|
|
vpx_codec_stream_info_t *stream_info) {
|
|
return vpx_codec_peek_stream_info(CodecInterface(),
|
|
cxdata, static_cast<unsigned int>(size),
|
|
stream_info);
|
|
}
|
|
|
|
vpx_codec_err_t Decoder::DecodeFrame(const uint8_t *cxdata, size_t size) {
|
|
return DecodeFrame(cxdata, size, NULL);
|
|
}
|
|
|
|
vpx_codec_err_t Decoder::DecodeFrame(const uint8_t *cxdata, size_t size,
|
|
void *user_priv) {
|
|
vpx_codec_err_t res_dec;
|
|
InitOnce();
|
|
API_REGISTER_STATE_CHECK(
|
|
res_dec = vpx_codec_decode(&decoder_,
|
|
cxdata, static_cast<unsigned int>(size),
|
|
user_priv, 0));
|
|
return res_dec;
|
|
}
|
|
|
|
bool Decoder::IsVP8() const {
|
|
const char *codec_name = GetDecoderName();
|
|
return strncmp(kVP8Name, codec_name, sizeof(kVP8Name) - 1) == 0;
|
|
}
|
|
|
|
void DecoderTest::HandlePeekResult(Decoder *const decoder,
|
|
CompressedVideoSource *video,
|
|
const vpx_codec_err_t res_peek) {
|
|
const bool is_vp8 = decoder->IsVP8();
|
|
if (is_vp8) {
|
|
/* Vp8's implementation of PeekStream returns an error if the frame you
|
|
* pass it is not a keyframe, so we only expect VPX_CODEC_OK on the first
|
|
* frame, which must be a keyframe. */
|
|
if (video->frame_number() == 0)
|
|
ASSERT_EQ(VPX_CODEC_OK, res_peek) << "Peek return failed: "
|
|
<< vpx_codec_err_to_string(res_peek);
|
|
} else {
|
|
/* The Vp9 implementation of PeekStream returns an error only if the
|
|
* data passed to it isn't a valid Vp9 chunk. */
|
|
ASSERT_EQ(VPX_CODEC_OK, res_peek) << "Peek return failed: "
|
|
<< vpx_codec_err_to_string(res_peek);
|
|
}
|
|
}
|
|
|
|
void DecoderTest::RunLoop(CompressedVideoSource *video,
|
|
const vpx_codec_dec_cfg_t &dec_cfg) {
|
|
Decoder* const decoder = codec_->CreateDecoder(dec_cfg, flags_, 0);
|
|
ASSERT_TRUE(decoder != NULL);
|
|
bool end_of_file = false;
|
|
|
|
// Decode frames.
|
|
for (video->Begin(); !::testing::Test::HasFailure() && !end_of_file;
|
|
video->Next()) {
|
|
PreDecodeFrameHook(*video, decoder);
|
|
|
|
vpx_codec_stream_info_t stream_info;
|
|
stream_info.sz = sizeof(stream_info);
|
|
|
|
if (video->cxdata() != NULL) {
|
|
const vpx_codec_err_t res_peek = decoder->PeekStream(video->cxdata(),
|
|
video->frame_size(),
|
|
&stream_info);
|
|
HandlePeekResult(decoder, video, res_peek);
|
|
ASSERT_FALSE(::testing::Test::HasFailure());
|
|
|
|
vpx_codec_err_t res_dec = decoder->DecodeFrame(video->cxdata(),
|
|
video->frame_size());
|
|
if (!HandleDecodeResult(res_dec, *video, decoder))
|
|
break;
|
|
} else {
|
|
// Signal end of the file to the decoder.
|
|
const vpx_codec_err_t res_dec = decoder->DecodeFrame(NULL, 0);
|
|
ASSERT_EQ(VPX_CODEC_OK, res_dec) << decoder->DecodeError();
|
|
end_of_file = true;
|
|
}
|
|
|
|
DxDataIterator dec_iter = decoder->GetDxData();
|
|
const vpx_image_t *img = NULL;
|
|
|
|
// Get decompressed data
|
|
while ((img = dec_iter.Next()))
|
|
DecompressedFrameHook(*img, video->frame_number());
|
|
}
|
|
delete decoder;
|
|
}
|
|
|
|
void DecoderTest::RunLoop(CompressedVideoSource *video) {
|
|
vpx_codec_dec_cfg_t dec_cfg = vpx_codec_dec_cfg_t();
|
|
RunLoop(video, dec_cfg);
|
|
}
|
|
|
|
void DecoderTest::set_cfg(const vpx_codec_dec_cfg_t &dec_cfg) {
|
|
memcpy(&cfg_, &dec_cfg, sizeof(cfg_));
|
|
}
|
|
|
|
void DecoderTest::set_flags(const vpx_codec_flags_t flags) {
|
|
flags_ = flags;
|
|
}
|
|
|
|
} // namespace libvpx_test
|