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

Jump to bottom

DV: DVRescue related fixes and updates #2109

Merged
merged 3 commits into from
Sep 8, 2024
Merged

DV: DVRescue related fixes and updates #2109

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
c22df9c
x DV: fix potential crash during DVRescue analysis
JeromeMartinez Sep 8, 2024
450ac95
x DV: fix potential wrong detection as DV in case of DVRescue analysi…
JeromeMartinez Sep 8, 2024
799376a
+ DV: DVREscue MoreData list as enum
JeromeMartinez Sep 8, 2024
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 Source/MediaInfo/MediaInfo_Events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,11 @@ struct MediaInfo_Event_DvDif_Analysis_Frame_1
MediaInfo_int32u MoreFlags;
const MediaInfo_int8u* MoreData;
};
enum MediaInfo_Event_Analysis_Frame_Enums {
MediaInfo_Event_Analysis_Frame_None,
MediaInfo_Event_Analysis_Frame_AudioErrorValues,
MediaInfo_Event_Analysis_Frame_DirectionSpeed,
};

/*-------------------------------------------------------------------------*/
/* Change in the stream config */
Expand Down
19 changes: 13 additions & 6 deletions Source/MediaInfo/Multiple/File_DvDif_Analysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ void File_DvDif::Read_Buffer_Continue()
if (!Analyze_Activated)
return;

if (!Synchro_Manage()) // TODO: Synchro_Manage() should be called before Read_Buffer_Continue() in File__Analyze
return; //Wait for more data

#if MEDIAINFO_DEMUX
if (Demux_UnpacketizeContainer && !Synchro_Manage()) // We need to manage manually synchronization in case of demux
{
Expand Down Expand Up @@ -587,6 +590,8 @@ void File_DvDif::Read_Buffer_Continue()
}

//Audio errors
auto BlockStatus_Pos=(File_Offset+Buffer_Offset-Speed_FrameCount_StartOffset)/80;
if (BlockStatus_Pos<BlockStatus_MaxSize)
{
bool Contains_8000=true; // Note: standards indicate these values so old code was using only theses values, now checking all values (except 0 or -1 as it is for silent audio)
bool Contains_800800=true;
Expand Down Expand Up @@ -631,13 +636,13 @@ void File_DvDif::Read_Buffer_Continue()
Audio_Errors[Channel].resize(Dseq_Count);
Audio_Errors[Channel][Dseq].Count++;
Audio_Errors[Channel][Dseq].Values.insert(Value);
BlockStatus[(File_Offset+Buffer_Offset-Speed_FrameCount_StartOffset)/80]=BlockStatus_NOK;
BlockStatus[BlockStatus_Pos]=BlockStatus_NOK;
}
else
BlockStatus[(File_Offset+Buffer_Offset-Speed_FrameCount_StartOffset)/80]=BlockStatus_OK;
BlockStatus[BlockStatus_Pos]=BlockStatus_OK;
}
else
BlockStatus[(File_Offset+Buffer_Offset-Speed_FrameCount_StartOffset)/80]=BlockStatus_OK;
BlockStatus[BlockStatus_Pos]=BlockStatus_OK;
}
}
break;
Expand Down Expand Up @@ -684,7 +689,9 @@ void File_DvDif::Read_Buffer_Continue()
Video_STA_Errors_ByDseq[(Dseq<<4)|STA_Error]++;
}
}
BlockStatus[(File_Offset+Buffer_Offset-Speed_FrameCount_StartOffset)/80]=STA_Error?BlockStatus_NOK:BlockStatus_OK;
auto BlockStatus_Pos=(File_Offset+Buffer_Offset-Speed_FrameCount_StartOffset)/80;
if (BlockStatus_Pos<BlockStatus_MaxSize)
BlockStatus[BlockStatus_Pos]=STA_Error?BlockStatus_NOK:BlockStatus_OK;
}
break;
}
Expand Down Expand Up @@ -1840,7 +1847,7 @@ void File_DvDif::Errors_Stats_Update()
if (!MoreData)
MoreData=new int8u[4096] + sizeof(size_t); // TODO: more dynamic allocation
MoreData[MoreData_Offset++]=2+Audio_Errors[ChannelGroup][Dseq].Values.size()*2; // Size of the block
MoreData[MoreData_Offset++]=1; // Audio error value par channel group per Dseq
MoreData[MoreData_Offset++]=MediaInfo_Event_Analysis_Frame_AudioErrorValues; // Audio error value par channel group per Dseq
MoreData[MoreData_Offset++]=ChannelGroup;
MoreData[MoreData_Offset++]=Dseq;
for (std::set<int16u>::iterator Value=Audio_Errors[ChannelGroup][Dseq].Values.begin(); Value!=Audio_Errors[ChannelGroup][Dseq].Values.end(); ++Value)
Expand All @@ -1860,7 +1867,7 @@ void File_DvDif::Errors_Stats_Update()
if (!MoreData)
MoreData=new int8u[4096]+sizeof(size_t); // TODO: more dynamic allocation
MoreData[MoreData_Offset++]=DirectionSpeed.size();
MoreData[MoreData_Offset++]=2; // DirectionSpeed values
MoreData[MoreData_Offset++]=MediaInfo_Event_Analysis_Frame_DirectionSpeed; // DirectionSpeed values
for (std::vector<int8u>::iterator DirectionSpeed_Item=DirectionSpeed.begin(); DirectionSpeed_Item!=DirectionSpeed.end(); ++DirectionSpeed_Item)
{
MoreData[MoreData_Offset++]=*DirectionSpeed_Item;
Expand Down
Loading