hedgewars: comparison hedgewars/uVideoRec.pas

equal deleted inserted replaced

-:d5ec4e4eb2d5
+:48b79b3ca592
 type TAddFileLogRaw = procedure (s: pchar); cdecl;
 {$IFDEF WIN32}
 procedure AVWrapper_Init(
 AddLog: TAddFileLogRaw;
-filename, desc, soundFile, format, vcodec, acodec, preset: PChar;
+filename, desc, soundFile, format, vcodec, acodec: PChar;
-width, height, framerateNum, framerateDen, vquality, aquality: LongInt); cdecl; external AVWrapperLibName;
+width, height, framerateNum, framerateDen, vquality: LongInt); cdecl; external AVWrapperLibName;
 procedure AVWrapper_Close; cdecl; external AVWrapperLibName;
 procedure AVWrapper_WriteFrame( pY, pCb, pCr: PByte ); cdecl; external AVWrapperLibName;
 {$ELSE}
 procedure AVWrapper_Init(
 AddLog: TAddFileLogRaw;
-filename, desc, soundFile, format, vcodec, acodec, preset: PChar;
+filename, desc, soundFile, format, vcodec, acodec: PChar;
-width, height, framerateNum, framerateDen, vquality, aquality: LongInt); cdecl; external;
+width, height, framerateNum, framerateDen, vquality: LongInt); cdecl; external;
 procedure AVWrapper_Close; cdecl; external;
 procedure AVWrapper_WriteFrame( pY, pCb, pCr: PByte ); cdecl; external;
 {$ENDIF}
 type TFrame = record
-ticks: LongWord;
+realTicks: LongWord;
+gameTicks: LongWord;
 CamX, CamY: LongInt;
 zoom: single;
 end;
 var YCbCr_Planes: array[0..2] of PByte;
 RGB_Buffer: PByte;
 cameraFile: File of TFrame;
 audioFile: File;
 numPixels: LongWord;
-startTime, numFrames: LongWord;
+startTime, numFrames, curTime, progress, maxProgress: LongWord;
 cameraFilePath, soundFilePath: shortstring;
 thumbnailSaved : Boolean;
 function BeginVideoRecording: Boolean;
 var filename, desc: shortstring;
 begin
 AddFileLog('BeginVideoRecording');
-numPixels:= cScreenWidth*cScreenHeight;
 {$IOCHECKS OFF}
 // open file with prerecorded camera positions
 cameraFilePath:= UserPathPrefix + '/VideoTemp/' + RecPrefix + '.txtin';
 Assign(cameraFile, cameraFilePath);
 Reset(cameraFile);
+maxProgress:= FileSize(cameraFile);
 if IOResult <> 0 then
 begin
 AddFileLog('Error: Could not read from ' + cameraFilePath);
 exit(false);
 end;
 {$IOCHECKS ON}
+// store some description in output file
 desc:= '';
 if UserNick <> '' then
 desc+= 'Player: ' + UserNick + #10;
 if recordFileName <> '' then
 desc+= 'Record: ' + recordFileName + #10;
 filename:= UserPathPrefix + '/VideoTemp/' + RecPrefix + #0;
 soundFilePath:= UserPathPrefix + '/VideoTemp/' + RecPrefix + '.sw' + #0;
 cAVFormat+= #0;
 cAudioCodec+= #0;
 cVideoCodec+= #0;
-cVideoPreset+= #0;
+AVWrapper_Init(@AddFileLogRaw, @filename[1], @desc[1], @soundFilePath[1], @cAVFormat[1], @cVideoCodec[1], @cAudioCodec[1],
-AVWrapper_Init(@AddFileLogRaw, @filename[1], @desc[1], @soundFilePath[1], @cAVFormat[1], @cVideoCodec[1], @cAudioCodec[1], @cVideoPreset[1],
+cScreenWidth, cScreenHeight, cVideoFramerateNum, cVideoFramerateDen, cVideoQuality);
-cScreenWidth, cScreenHeight, cVideoFramerateNum, cVideoFramerateDen, cAudioQuality, cVideoQuality);
+numPixels:= cScreenWidth*cScreenHeight;
 YCbCr_Planes[0]:= GetMem(numPixels);
 YCbCr_Planes[1]:= GetMem(numPixels div 4);
 YCbCr_Planes[2]:= GetMem(numPixels div 4);
 if (YCbCr_Planes[0] = nil) or (YCbCr_Planes[1] = nil) or (YCbCr_Planes[2] = nil) then
 begin
 AddFileLog('Error: Could not allocate memory for video recording (RGB buffer).');
 exit(false);
 end;
+curTime:= 0;
+numFrames:= 0;
+progress:= 0;
 BeginVideoRecording:= true;
 end;
 procedure StopVideoRecording;
 begin
 FreeMem(RGB_Buffer, 4*numPixels);
 Close(cameraFile);
 AVWrapper_Close();
 DeleteFile(cameraFilePath);
 DeleteFile(soundFilePath);
-SendIPC(_S'v');
+SendIPC(_S'v'); // inform frontend that we finished
 end;
 function pixel(x, y, color: LongInt): LongInt;
 begin
 pixel:= RGB_Buffer[(cScreenHeight-y-1)*cScreenWidth*4 + x*4 + color];
 end;
 procedure EncodeFrame;
 var x, y, r, g, b: LongInt;
+s: shortstring;
 begin
 // read pixels from OpenGL
 glReadPixels(0, 0, cScreenWidth, cScreenHeight, GL_RGBA, GL_UNSIGNED_BYTE, RGB_Buffer);
 // convert to YCbCr 4:2:0 format
 YCbCr_Planes[2][y*(cScreenWidth div 2) + x]:= Byte(128 + (( 7196*r - 6026*g - 1170*b) shr 16));
 end;
 AVWrapper_WriteFrame(YCbCr_Planes[0], YCbCr_Planes[1], YCbCr_Planes[2]);
-// inform frontend that we have encoded new frame (p for progress)
+// inform frontend that we have encoded new frame
-SendIPC(_S'p');
+s[0]:= #3;
+s[1]:= 'p'; // p for progress
+SDLNet_Write16(progress*10000 div maxProgress, @s[2]);
+SendIPC(s);
+inc(numFrames);
 end;
 // returns new game ticks
 function LoadNextCameraPosition: LongInt;
 var frame: TFrame;
 begin
-{$IOCHECKS OFF}
+LoadNextCameraPosition:= GameTicks;
-if eof(cameraFile) then
+// we need to skip or duplicate frames to match target framerate
-exit(-1);
+while Int64(curTime)*cVideoFramerateNum < Int64(numFrames)*cVideoFramerateDen*1000 do
-BlockRead(cameraFile, frame, 1);
+begin
-{$IOCHECKS ON}
+{$IOCHECKS OFF}
-WorldDx:= frame.CamX;
+if eof(cameraFile) then
-WorldDy:= frame.CamY + cScreenHeight div 2;
+exit(-1);
-zoom:= frame.zoom*cScreenWidth;
+BlockRead(cameraFile, frame, 1);
-ZoomValue:= zoom;
+{$IOCHECKS ON}
-LoadNextCameraPosition:= frame.ticks;
+curTime:= frame.realTicks;
+WorldDx:= frame.CamX;
+WorldDy:= frame.CamY + cScreenHeight div 2;
+zoom:= frame.zoom*cScreenWidth;
+ZoomValue:= zoom;
+inc(progress);
+LoadNextCameraPosition:= frame.gameTicks;
+end;
 end;
 // Callback which records sound.
 // This procedure may be called from different thread.
 procedure RecordPostMix(udata: pointer; stream: PByte; len: LongInt); cdecl;
 filename: shortstring;
 frequency, channels: LongInt;
 begin
 AddFileLog('BeginPreRecording');
-numFrames:= 0;
 thumbnailSaved:= false;
-RecPrefix:= FormatDateTime('YYYY-MM-DD_HH-mm-ss', Now());
+RecPrefix:= FormatDateTime('YYYY-MM-DD_HH-mm-ss', Now()) + inttostr(GameTicks);
 Mix_QuerySpec(@frequency, @format, @channels);
 AddFileLog('sound: frequency = ' + IntToStr(frequency) + ', format = ' + IntToStr(format) + ', channels = ' + IntToStr(channels));
 if format <> $8010 then
 begin
 if not thumbnailSaved then
 SaveThumbnail();
 end;
 procedure SaveCameraPosition;
-var curTime: LongInt;
+var frame: TFrame;
-frame: TFrame;
 begin
 if (not thumbnailSaved) and (ScreenFade = sfNone) then
 SaveThumbnail();
-curTime:= SDL_GetTicks();
+frame.realTicks:= SDL_GetTicks() - startTime;
-while Int64(curTime - startTime)*cVideoFramerateNum > Int64(numFrames)*cVideoFramerateDen*1000 do
+frame.gameTicks:= GameTicks;
-begin
+frame.CamX:= WorldDx;
-frame.ticks:= GameTicks;
+frame.CamY:= WorldDy - cScreenHeight div 2;
-frame.CamX:= WorldDx;
+frame.zoom:= zoom/cScreenWidth;
-frame.CamY:= WorldDy - cScreenHeight div 2;
+BlockWrite(cameraFile, frame, 1);
-frame.zoom:= zoom/cScreenWidth;
-BlockWrite(cameraFile, frame, 1);
-inc(numFrames);
-end;
 end;
 procedure freeModule;
 begin
 if flagPrerecording then

changeset 7376	48b79b3ca592
parent 7369	46921fbe76d3
child 7379	aa29a2f16cc7