Skip to content

fix(decoder): reject DECODER_OPTION_NUM_OF_THREADS after initialization #3973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HeaTTap wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −0
Open

fix(decoder): reject DECODER_OPTION_NUM_OF_THREADS after initialization #3973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions codec/decoder/plus/src/welsDecoderExt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,11 @@ long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) {
threadCount = 3;
}
if (threadCount != m_iThreadCount) {
if (m_pDecThrCtx != NULL && m_pDecThrCtx[0].pCtx != NULL) {
WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
"CWelsDecoder::SetOption(): DECODER_OPTION_NUM_OF_THREADS cannot be changed after decoder is initialized.");
return cmInitParaError;
}
m_iThreadCount = threadCount;
if (m_pDecThrCtx != NULL) {
delete [] m_pDecThrCtx;
Expand Down
6 changes: 6 additions & 0 deletions test/api/decoder_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ class DecoderInitTest : public ::testing::Test, public BaseDecoderTest {

TEST_F (DecoderInitTest, JustInit) {}

TEST_F (DecoderInitTest, SetThreadCountPostInitFails) {
int iThreadCount = 2;
long rv = decoder_->SetOption (DECODER_OPTION_NUM_OF_THREADS, &iThreadCount);
EXPECT_NE (0, rv);
}

struct FileParam {
const char* fileName;
const char* hashStr;
Expand Down