id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 07:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Align frame logic for Cinematic decoders (ffmpeg, Bink, RoQ), use correct shaders, fix bugs in RoQ looping and testVideo cmd

Browse source
This commit is contained in:
Stephen Saunders 2022-03-02 20:49:26 -05:00
parent 69be2f1e05
commit bd3c82c930
7 changed files with 88 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
neo/renderer/Cinematic.cpp
View file

@ -787,7 +787,7 @@ bool idCinematicLocal::InitFromFFMPEGFile( const char* qpath, bool amilooping )
}
animationLength = durationSec * 1000;
frameRate = av_q2d( fmt_ctx->streams[video_stream_index]->avg_frame_rate );
common->Printf( "Loaded FFMPEG file: '%s', looping=%d, %dx%d, %f FPS, %f sec\n", qpath, looping, CIN_WIDTH, CIN_HEIGHT, frameRate, durationSec );
common->Printf( "Loaded FFMPEG file: '%s', looping=%d, %dx%d, %3.2f FPS, %4.1f sec\n", qpath, looping, CIN_WIDTH, CIN_HEIGHT, frameRate, durationSec );
// SRS - Get number of image bytes needed by querying with NULL first, then allocate image and fill with correct parameters
int img_bytes = av_image_fill_arrays( frame2->data, frame2->linesize, NULL, AV_PIX_FMT_BGR32, CIN_WIDTH, CIN_HEIGHT, 1 );
@ -795,7 +795,6 @@ bool idCinematicLocal::InitFromFFMPEGFile( const char* qpath, bool amilooping )
av_image_fill_arrays( frame2->data, frame2->linesize, image, AV_PIX_FMT_BGR32, CIN_WIDTH, CIN_HEIGHT, 1 ); //GK: Straight out of the FFMPEG source code
img_convert_ctx = sws_getContext( dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt, CIN_WIDTH, CIN_HEIGHT, AV_PIX_FMT_BGR32, SWS_BICUBIC, NULL, NULL, NULL );
buf = NULL;
status = FMV_PLAY;
hasFrame = false;
framePos = -1;
@ -834,12 +833,13 @@ void idCinematicLocal::FFMPEGReset()
}
}
if( av_seek_frame( fmt_ctx, video_stream_index, 0, 0 ) >= 0 )
// SRS - For non-RoQ (i.e. bik) files, use standard frame seek to rewind the stream
if( dec_ctx->codec_id != AV_CODEC_ID_ROQ && av_seek_frame( fmt_ctx, video_stream_index, 0, 0 ) >= 0 )
{
status = FMV_LOOPED;
}
// SRS - Special handling for RoQ files: only frame byte seek works and ffmpeg RoQ decoder needs reset
else if( av_seek_frame( fmt_ctx, video_stream_index, 0, AVSEEK_FLAG_BYTE ) >= 0 && dec_ctx->codec_id == AV_CODEC_ID_ROQ )
// SRS - Special handling for RoQ files: only byte seek works and ffmpeg RoQ decoder needs reset
else if( dec_ctx->codec_id == AV_CODEC_ID_ROQ && av_seek_frame( fmt_ctx, video_stream_index, 0, AVSEEK_FLAG_BYTE ) >= 0 )
{
// Close and reopen the ffmpeg RoQ codec without clearing the context - this seems to reset the decoder properly
avcodec_close( dec_ctx );
@ -918,11 +918,10 @@ bool idCinematicLocal::InitFromBinkDecFile( const char* qpath, bool amilooping )
numFrames = Bink_GetNumFrames( binkHandle );
float durationSec = numFrames / frameRate; // SRS - fixed Bink durationSec calculation
animationLength = durationSec * 1000; // SRS - animationLength is in milliseconds
common->Printf( "Loaded BinkDec file: '%s', looping=%d, %dx%d, %f FPS, %f sec\n", qpath, looping, CIN_WIDTH, CIN_HEIGHT, frameRate, durationSec );
common->Printf( "Loaded BinkDec file: '%s', looping=%d, %dx%d, %3.2f FPS, %4.1f sec\n", qpath, looping, CIN_WIDTH, CIN_HEIGHT, frameRate, durationSec );
memset( yuvBuffer, 0, sizeof( yuvBuffer ) );
buf = NULL;
status = FMV_PLAY;
hasFrame = false; // SRS - Implemented hasFrame for BinkDec behaviour consistency with FFMPEG
framePos = -1;
@ -1043,6 +1042,7 @@ bool idCinematicLocal::InitFromFile( const char* qpath, bool amilooping )
RoQ_init();
status = FMV_PLAY;
ImageForTime( 0 );
common->Printf( "Loaded RoQ file: '%s', looping=%d, %dx%d, %3.2f FPS\n", qpath, looping, CIN_WIDTH, CIN_HEIGHT, frameRate );
status = ( looping ) ? FMV_PLAY : FMV_IDLE;
return true;
}
@ -1111,8 +1111,7 @@ void idCinematicLocal::Close()
}
status = FMV_EOF;
}
#endif
#ifdef USE_BINKDEC
#elif defined(USE_BINKDEC)
else //if( !isRoQ )
{
if( binkHandle.isValid )
@ -1178,8 +1177,7 @@ cinData_t idCinematicLocal::ImageForTime( int thisTime )
{
return ImageForTimeFFMPEG( thisTime );
}
#endif
#ifdef USE_BINKDEC // DG: libbinkdec support
#elif defined(USE_BINKDEC) // DG: libbinkdec support
if( !isRoQ )
{
return ImageForTimeBinkDec( thisTime );
@ -1189,15 +1187,16 @@ cinData_t idCinematicLocal::ImageForTime( int thisTime )
// Carl: Handle original Doom 3 RoQ video files
cinData_t cinData;
if( thisTime == 0 )
// SRS - Changed from == 0 to <= 0 to match behaviour of FFMPEG and BinkDec decoders
if( thisTime <= 0 )
{
thisTime = Sys_Milliseconds();
}
if( thisTime < 0 )
{
thisTime = 0;
}
//if( thisTime < 0 )
//{
// thisTime = 0;
//}
memset( &cinData, 0, sizeof( cinData ) );
@ -1234,7 +1233,8 @@ cinData_t idCinematicLocal::ImageForTime( int thisTime )
tfps = 0;
}
if( tfps < numQuads )
// SRS - Need to use numQuads - 1 for frame position (otherwise get into reset loop at start)
if( tfps < numQuads - 1 )
{
RoQReset();
buf = NULL;
@ -1243,6 +1243,7 @@ cinData_t idCinematicLocal::ImageForTime( int thisTime )
if( buf == NULL )
{
// SRS - This frame init loop is not really necessary, but leaving in to avoid breakage
while( buf == NULL )
{
RoQInterrupt();
@ -1250,32 +1251,31 @@ cinData_t idCinematicLocal::ImageForTime( int thisTime )
}
else
{
while( ( tfps != numQuads && status == FMV_PLAY ) )
// SRS - This frame loop is really all we need and could handle the above case as well
while( ( numQuads - 1 < tfps && status == FMV_PLAY ) )
{
RoQInterrupt();
}
}
if( status == FMV_LOOPED )
{
status = FMV_PLAY;
while( buf == NULL && status == FMV_PLAY )
{
RoQInterrupt();
}
startTime = thisTime;
}
// SRS - This is redundant code, virtually identical logic correctly handles looping below
//if( status == FMV_LOOPED )
//{
// status = FMV_PLAY;
// while( buf == NULL && status == FMV_PLAY )
// {
// RoQInterrupt();
// }
// startTime = thisTime;
//}
if( status == FMV_EOF )
if( status == FMV_LOOPED || status == FMV_EOF )
{
if( looping )
{
RoQReset();
//RoQReset(); // SRS - RoQReset() already called by RoQInterrupt() when looping
buf = NULL;
if( status == FMV_LOOPED )
{
status = FMV_PLAY;
}
status = FMV_PLAY;
while( buf == NULL && status == FMV_PLAY )
{
RoQInterrupt();
@ -1284,9 +1284,10 @@ cinData_t idCinematicLocal::ImageForTime( int thisTime )
}
else
{
buf = NULL;
status = FMV_IDLE;
// SRS - When status == FMV_IDLE this is a no-op, disable since shutdown not needed here anyways
//RoQShutdown();
//RoQShutdown(); //SRS - RoQShutdown() not needed on EOF, return null data instead
return cinData;
}
}
@ -1346,6 +1347,8 @@ cinData_t idCinematicLocal::ImageForTimeFFMPEG( int thisTime )
if( desiredFrame < framePos )
{
FFMPEGReset();
hasFrame = false;
status = FMV_PLAY;
}
if( hasFrame && desiredFrame == framePos )
@ -1378,6 +1381,7 @@ cinData_t idCinematicLocal::ImageForTimeFFMPEG( int thisTime )
{
desiredFrame = 0;
FFMPEGReset();
hasFrame = false;
startTime = thisTime;
if( av_read_frame( fmt_ctx, &packet ) < 0 )
{
@ -1388,6 +1392,7 @@ cinData_t idCinematicLocal::ImageForTimeFFMPEG( int thisTime )
}
else
{
hasFrame = false;
status = FMV_IDLE;
return cinData;
}
@ -1538,27 +1543,12 @@ cinData_t idCinematicLocal::ImageForTimeBinkDec( int thisTime )
desiredFrame = 0;
}
if( desiredFrame >= numFrames )
{
status = FMV_EOF;
if( looping )
{
desiredFrame = 0;
BinkDecReset();
startTime = thisTime;
status = FMV_PLAY;
}
else
{
status = FMV_IDLE;
return cinData;
}
}
// SRS - Enable video replay within PDAs
if( desiredFrame < framePos )
{
BinkDecReset();
hasFrame = false;
status = FMV_PLAY;
}
// SRS end
@ -1574,6 +1564,25 @@ cinData_t idCinematicLocal::ImageForTimeBinkDec( int thisTime )
return cinData;
}
if( desiredFrame >= numFrames )
{
status = FMV_EOF;
if( looping )
{
desiredFrame = 0;
BinkDecReset();
hasFrame = false;
startTime = thisTime;
status = FMV_PLAY;
}
else
{
hasFrame = false;
status = FMV_IDLE;
return cinData;
}
}
// Bink_GotoFrame(binkHandle, desiredFrame);
// apparently Bink_GotoFrame() doesn't work super well, so skip frames
// (if necessary) by calling Bink_GetNextFrame()
@ -3130,7 +3139,7 @@ redump:
//
// read in next frame data
//
if( RoQPlayed >= ROQSize )
if( RoQPlayed >= ROQSize || status == FMV_EOF ) // SRS - handle FMV_EOF case
{
if( looping )
{

8
neo/renderer/OpenGL/RenderDebug_GL.cpp
View file

@ -3256,7 +3256,9 @@ void idRenderBackend::DBG_TestImage()
{
cinData_t cin;
cin = tr.testVideo->ImageForTime( viewDef->renderView.time[1] - tr.testVideoStartTime );
// SRS - Don't need calibrated time for testing cinematics, so just call ImageForTime( 0 ) for current system time
// This simplification allows cinematic test playback to work over both 2D and 3D background scenes
cin = tr.testVideo->ImageForTime( 0 /*viewDef->renderView.time[1] - tr.testVideoStartTime*/ );
if( cin.imageY != NULL )
{
image = cin.imageY;
@ -3345,7 +3347,9 @@ void idRenderBackend::DBG_TestImage()
imageCr->Bind();
GL_SelectTexture( 2 );
imageCb->Bind();
renderProgManager.BindShader_Bink();
// SRS - Use Bink shader without sRGB to linear conversion, otherwise cinematic colours may be wrong
// BindShader_BinkGUI() does not seem to work here - perhaps due to vertex shader input dependencies?
renderProgManager.BindShader_Bink_sRGB();
}
else
{

5
neo/renderer/RenderBackend.cpp
View file

@ -602,8 +602,8 @@ void idRenderBackend::BindVariableStageImage( const textureStage_t* texture, con
GL_SelectTexture( 0 );
cin.image->Bind();
/*
if( backEnd.viewDef->is2Dgui )
// SRS - Reenable shaders so ffmpeg and RoQ decoder cinematics are rendered with correct colour
if( viewDef->is2Dgui )
{
renderProgManager.BindShader_TextureVertexColor_sRGB();
}
@ -611,7 +611,6 @@ void idRenderBackend::BindVariableStageImage( const textureStage_t* texture, con
{
renderProgManager.BindShader_TextureVertexColor();
}
*/
}
else
{

3
neo/renderer/RenderProgs.cpp
View file

@ -213,6 +213,9 @@ void idRenderProgManager::Init()
{ BUILTIN_STEREO_DEGHOST, "builtin/VR/stereoDeGhost", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT },
{ BUILTIN_STEREO_WARP, "builtin/VR/stereoWarp", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT },
{ BUILTIN_BINK, "builtin/video/bink", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT },
// SRS - Added Bink shader without sRGB to linear conversion for testVideo cmd
{ BUILTIN_BINK_SRGB, "builtin/video/bink", "_sRGB", BIT( USE_SRGB ), false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT },
// SRS end
{ BUILTIN_BINK_GUI, "builtin/video/bink_gui", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT },
{ BUILTIN_STEREO_INTERLACE, "builtin/VR/stereoInterlace", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT },
{ BUILTIN_MOTION_BLUR, "builtin/post/motionBlur", "", 0, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT },

7
neo/renderer/RenderProgs.h
View file

@ -693,6 +693,12 @@ public:
BindShader_Builtin( BUILTIN_BINK );
}
// SRS - Added Bink shader without sRGB to linear conversion for testVideo cmd
void BindShader_Bink_sRGB()
{
BindShader_Builtin( BUILTIN_BINK_SRGB );
}
void BindShader_BinkGUI()
{
BindShader_Builtin( BUILTIN_BINK_GUI );
@ -854,6 +860,7 @@ private:
BUILTIN_STEREO_DEGHOST,
BUILTIN_STEREO_WARP,
BUILTIN_BINK,
BUILTIN_BINK_SRGB, // SRS - Added Bink shader without sRGB to linear conversion for testVideo cmd
BUILTIN_BINK_GUI,
BUILTIN_STEREO_INTERLACE,
BUILTIN_MOTION_BLUR,

3
neo/renderer/RenderSystem_init.cpp
View file

@ -631,7 +631,8 @@ void R_TestVideo_f( const idCmdArgs& args )
int len = tr.testVideo->AnimationLength();
common->Printf( "%5.1f seconds of video\n", len * 0.001 );
tr.testVideoStartTime = tr.primaryRenderView.time[1];
// SRS - Not needed or used since InitFromFile() sets the correct start time automatically
//tr.testVideoStartTime = tr.primaryRenderView.time[1];
// try to play the matching wav file
idStr wavString = args.Argv( ( args.Argc() == 2 ) ? 1 : 2 );

8
neo/renderer/Vulkan/RenderDebug_VK.cpp
View file

@ -563,7 +563,9 @@ void idRenderBackend::DBG_TestImage()
{
cinData_t cin;
cin = tr.testVideo->ImageForTime( viewDef->renderView.time[1] - tr.testVideoStartTime );
// SRS - Don't need calibrated time for testing cinematics, so just call ImageForTime( 0 ) for current system time
// This simplification allows cinematic test playback to work over both 2D and 3D background scenes
cin = tr.testVideo->ImageForTime( 0 /*viewDef->renderView.time[1] - tr.testVideoStartTime*/ );
if( cin.imageY != NULL )
{
image = cin.imageY;
@ -651,7 +653,9 @@ void idRenderBackend::DBG_TestImage()
GL_SelectTexture( 2 );
imageCb->Bind();
renderProgManager.BindShader_Bink();
// SRS - Use Bink shader with no sRGB to linear conversion, otherwise cinematic colours may be wrong
// BindShader_BinkGUI() does not seem to work here - perhaps due to vertex shader input dependencies?
renderProgManager.BindShader_Bink_sRGB();
}
else
{