Skip to content
This repository has been archived by the owner on Apr 1, 2019. It is now read-only.

Three patches for sample_multi_trancode #9

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Three patches for sample_multi_trancode #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc461b2
Remove reduplicate saving of session cmd line
xzhangxa Mar 3, 2017
b8a4077
Check vpp_comp output raw file with opaque memory
xzhangxa Mar 4, 2017
1eaa1fa
Fix -fps bug on Windows
xzhangxa Mar 21, 2017
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
6 changes: 3 additions & 3 deletions samples/sample_multi_transcode/src/pipeline_transcode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ mfxStatus CTranscodingPipeline::Decode()
break;
}

msdk_tick nFrameTime = msdk_time_get_tick() - nBeginTime;
msdk_tick nFrameTime = (msdk_time_get_tick() - nBeginTime) * 1000000 / msdk_time_get_frequency();
if (nFrameTime < m_nReqFrameTime)
{
MSDK_USLEEP((mfxU32)(m_nReqFrameTime - nFrameTime));
Expand Down Expand Up @@ -1240,7 +1240,7 @@ mfxStatus CTranscodingPipeline::Encode()
break;
}

msdk_tick nFrameTime = msdk_time_get_tick() - nBeginTime;
msdk_tick nFrameTime = (msdk_time_get_tick() - nBeginTime) * 1000000 / msdk_time_get_frequency();
if (nFrameTime < m_nReqFrameTime)
{
MSDK_USLEEP((mfxU32)(m_nReqFrameTime - nFrameTime));
Expand Down Expand Up @@ -1540,7 +1540,7 @@ mfxStatus CTranscodingPipeline::Transcode()
MSDK_CHECK_STATUS(sts, "PutBS failed");
}

msdk_tick nFrameTime = msdk_time_get_tick() - nBeginTime;
msdk_tick nFrameTime = (msdk_time_get_tick() - nBeginTime) * 1000000 / msdk_time_get_frequency();
if (nFrameTime < m_nReqFrameTime)
{
MSDK_USLEEP((mfxU32)(m_nReqFrameTime - nFrameTime));
Expand Down
7 changes: 5 additions & 2 deletions samples/sample_multi_transcode/src/transcode_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,6 @@ mfxStatus CmdProcessor::ParseParFile(FILE *parFile)
sts = TokenizeLine(pCur, currPos);
MSDK_CHECK_STATUS(sts, "TokenizeLine failed");

// save original cmd line for debug purposes
m_lines.push_back(msdk_string(pCur, currPos));
currPos = 0;
lineIndex++;
}
Expand Down Expand Up @@ -1507,6 +1505,11 @@ mfxStatus CmdProcessor::VerifyAndCorrectInputParams(TranscodingSample::sInputPar
return MFX_ERR_UNSUPPORTED;
}

if(InputParams.EncodeId == MFX_FOURCC_DUMP && InputParams.bUseOpaqueMemory)
{
InputParams.bUseOpaqueMemory = false;
}

return MFX_ERR_NONE;
} //mfxStatus CmdProcessor::VerifyAndCorrectInputParams(TranscodingSample::sInputParams &InputParams)

Expand Down