Skip to content
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

mkclean: use a local error to check remuxing error #185

Merged
merged 1 commit into from
Dec 30, 2024
Merged

mkclean: use a local error to check remuxing error #185

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
34 changes: 17 additions & 17 deletions mkclean/mkclean.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2187,7 +2187,7 @@ int main(int argc, const char *argv[])
array TrackBlocks; // array of block_info
matroska_frame FrameData;
block_info BlockInfo,*pBlockInfo;
err_t Result;
err_t RemuxErr;

if (!Quiet) TextWrite(StdErr,T("Remuxing...\r\n"));
// count the number of useful tracks
Expand Down Expand Up @@ -2451,7 +2451,7 @@ int main(int argc, const char *argv[])
if (MATROSKA_BlockReadData(pBlockInfo->Block,Input,SrcProfile)==ERR_NONE)
{
bool_t HasDuration = MATROSKA_BlockProcessFrameDurations(pBlockInfo->Block,Input,SrcProfile)==ERR_NONE;
Result = ERR_NONE;
RemuxErr = ERR_NONE;
if (EBML_ElementIsType((ebml_element*)pBlockInfo->Block, MATROSKA_getContextSimpleBlock()))
{
// This block needs to be split
Expand All @@ -2474,7 +2474,7 @@ int main(int argc, const char *argv[])
else
{
if (MATROSKA_BlockGetFrameCount(Block1))
Result = EBML_MasterAppend((ebml_master*)ClusterW,(ebml_element*)Block1);
RemuxErr = EBML_MasterAppend((ebml_master*)ClusterW,(ebml_element*)Block1);
else
NodeDelete((node*)Block1);
}
Expand Down Expand Up @@ -2504,16 +2504,16 @@ int main(int argc, const char *argv[])
else
{
if (MATROSKA_BlockGetFrameCount(Block1))
Result = EBML_MasterAppend((ebml_master*)ClusterW,Elt);
RemuxErr = EBML_MasterAppend((ebml_master*)ClusterW,Elt);
else
NodeDelete((node*)Elt);
}
break; // next track
}

if (Result != ERR_NONE)
if (RemuxErr != ERR_NONE)
{
if (Result==ERR_INVALID_DATA)
if (RemuxErr==ERR_INVALID_DATA)
TextPrintf(StdErr,T("Impossible to remux, the TimestampScale may be too low, try --timecodescale 1000000\r\n"));
else
TextPrintf(StdErr,T("Impossible to remux, error appending a block\r\n"));
Expand Down Expand Up @@ -2542,16 +2542,16 @@ int main(int argc, const char *argv[])
}
else
{
Result = MATROSKA_BlockReadData(prevBlock->Block,Input,SrcProfile);
RemuxErr = MATROSKA_BlockReadData(prevBlock->Block,Input,SrcProfile);
}
}

if (prevBlock)
{
// add the first frame into the previous Block
if (Result==ERR_NONE)
if (RemuxErr==ERR_NONE)
{
Result = MATROSKA_BlockReadData(pBlockInfo->Block,Input,SrcProfile);
RemuxErr = MATROSKA_BlockReadData(pBlockInfo->Block,Input,SrcProfile);
if (EBML_ElementIsType((ebml_element*)pBlockInfo->Block, MATROSKA_getContextSimpleBlock()))
{
Block1 = (matroska_block*)pBlockInfo->Block;
Expand All @@ -2572,22 +2572,22 @@ int main(int argc, const char *argv[])
{
if (EBML_ElementIsType((ebml_element*)pBlockInfo->Block, MATROSKA_getContextSimpleBlock()))
{
Result = MATROSKA_LinkBlockWriteSegmentInfo(pBlockInfo->Block,WSegmentInfo);
if (Result == ERR_NONE)
Result = EBML_MasterAppend((ebml_master*)ClusterW,(ebml_element*)pBlockInfo->Block);
RemuxErr = MATROSKA_LinkBlockWriteSegmentInfo(pBlockInfo->Block,WSegmentInfo);
if (RemuxErr == ERR_NONE)
RemuxErr = EBML_MasterAppend((ebml_master*)ClusterW,(ebml_element*)pBlockInfo->Block);
}
else
{
assert(EBML_ElementIsType((ebml_element*)pBlockInfo->Block, MATROSKA_getContextBlock()));
Result = MATROSKA_LinkBlockWriteSegmentInfo(pBlockInfo->Block,WSegmentInfo);
if (Result == ERR_NONE)
Result = EBML_MasterAppend((ebml_master*)ClusterW,EBML_ElementParent((ebml_element*)pBlockInfo->Block));
RemuxErr = MATROSKA_LinkBlockWriteSegmentInfo(pBlockInfo->Block,WSegmentInfo);
if (RemuxErr == ERR_NONE)
RemuxErr = EBML_MasterAppend((ebml_master*)ClusterW,EBML_ElementParent((ebml_element*)pBlockInfo->Block));
}
}

if (Result != ERR_NONE)
if (RemuxErr != ERR_NONE)
{
if (Result==ERR_INVALID_DATA)
if (RemuxErr==ERR_INVALID_DATA)
TextPrintf(StdErr,T("Impossible to remux, the TimestampScale may be too low, try --timecodescale 1000000\r\n"));
else
TextPrintf(StdErr,T("Impossible to remux, error appending a block\r\n"));
Expand Down
Loading