valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Revert "Enhance capturing to handle unchanged screens (…)" r4329

Browse source 
This reverts commit fd11108206.
This commit is contained in:
Patryk Obara 2020-02-22 20:59:59 +01:00
parent 57bf045cc8
commit 28ebbd3bed
3 changed files with 44 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/hardware.h
View file

@ -48,7 +48,6 @@ FILE * OpenCaptureFile(const char * type,const char * ext);
void CAPTURE_AddWave(Bit32u freq, Bitu len, Bit16s * data);
#define CAPTURE_FLAG_DBLW 0x1
#define CAPTURE_FLAG_DBLH 0x2
#define CAPTURE_FLAG_DUPLICATE 0x4
void CAPTURE_AddImage(Bitu width, Bitu height, Bitu bpp, Bitu pitch, Bitu flags, float fps, const Bit8u * data, const Bit8u * pal);
void CAPTURE_AddMidi(bool sysex, Bitu len, Bit8u * data);

1
src/gui/render.cpp
View file

@ -216,7 +216,6 @@ void RENDER_EndUpdate( bool abort ) {
if (render.src.dblw) flags|=CAPTURE_FLAG_DBLW;
if (render.src.dblh) flags|=CAPTURE_FLAG_DBLH;
}
if (render.scale.outWrite==NULL) flags|=CAPTURE_FLAG_DUPLICATE;
float fps = render.src.fps;
pitch = render.scale.cachePitch;
if (render.frameskip.max)

97
src/hardware/hardware.cpp
View file

@ -291,7 +291,7 @@ private:
bool AddChunk(const AVIChunk &ck, const AVIIndexEntry &entry, const void *data, size_t length) {
long pos = ftell(handle); // in case writing fails
if (fwrite(&ck,sizeof(ck),1,handle)==1 && \
fwrite(data,1,length,handle)==length)
fwrite(data,length,1,handle)==1)
{
if (length&1) { // chunks must be aligned to 2-bytes
fseek(handle,1,SEEK_CUR);
@ -446,7 +446,6 @@ static struct {
float fps;
int bufSize;
void *buf;
int gop;
} video;
#endif
} capture;
@ -750,64 +749,56 @@ void CAPTURE_AddImage(Bitu width, Bitu height, Bitu bpp, Bitu pitch, Bitu flags,
capture.video.height = height;
capture.video.bpp = bpp;
capture.video.fps = fps;
capture.video.gop = 0;
flags &= ~CAPTURE_FLAG_DUPLICATE;
}
int codecFlags,written;
codecFlags = 0;
if (flags & CAPTURE_FLAG_DUPLICATE) written = 0;
else {
if (capture.video.gop >= 300)
capture.video.gop = 0;
if (capture.video.gop==0)
codecFlags = 1;
if (!capture.video.codec->PrepareCompressFrame( codecFlags, format, (char *)pal, capture.video.buf, capture.video.bufSize))
goto skip_video;
int codecFlags;
if (capture.video.avi_out->frames % 300 == 0)
codecFlags = 1;
else codecFlags = 0;
if (!capture.video.codec->PrepareCompressFrame( codecFlags, format, (char *)pal, capture.video.buf, capture.video.bufSize))
goto skip_video;
for (i=0;i<height;i++) {
const void *srcLine;
if (flags & CAPTURE_FLAG_DBLH)
srcLine=(data+(i >> 1)*pitch);
else
srcLine=(data+(i >> 0)*pitch);
if (flags & CAPTURE_FLAG_DBLW) {
Bitu x;
Bitu countWidth = width >> 1;
switch ( bpp) {
case 8:
for (x=0;x<countWidth;x++)
((Bit8u *)doubleRow)[x*2+0] =
((Bit8u *)doubleRow)[x*2+1] = ((Bit8u *)srcLine)[x];
break;
case 15:
case 16:
for (x=0;x<countWidth;x++)
((Bit16u *)doubleRow)[x*2+0] =
((Bit16u *)doubleRow)[x*2+1] = ((Bit16u *)srcLine)[x];
break;
case 32:
for (x=0;x<countWidth;x++)
((Bit32u *)doubleRow)[x*2+0] =
((Bit32u *)doubleRow)[x*2+1] = ((Bit32u *)srcLine)[x];
break;
}
srcLine=doubleRow;
for (i=0;i<height;i++) {
const void *srcLine;
if (flags & CAPTURE_FLAG_DBLH)
srcLine=(data+(i >> 1)*pitch);
else
srcLine=(data+(i >> 0)*pitch);
if (flags & CAPTURE_FLAG_DBLW) {
Bitu x;
Bitu countWidth = width >> 1;
switch ( bpp) {
case 8:
for (x=0;x<countWidth;x++)
((Bit8u *)doubleRow)[x*2+0] =
((Bit8u *)doubleRow)[x*2+1] = ((Bit8u *)srcLine)[x];
break;
case 15:
case 16:
for (x=0;x<countWidth;x++)
((Bit16u *)doubleRow)[x*2+0] =
((Bit16u *)doubleRow)[x*2+1] = ((Bit16u *)srcLine)[x];
break;
case 32:
for (x=0;x<countWidth;x++)
((Bit32u *)doubleRow)[x*2+0] =
((Bit32u *)doubleRow)[x*2+1] = ((Bit32u *)srcLine)[x];
break;
}
if (flags & CAPTURE_FLAG_DBLH) {
const void *rowPointer[2];
rowPointer[0]=rowPointer[1]=srcLine;
capture.video.codec->CompressLines(2, rowPointer);
i++;
} else
capture.video.codec->CompressLines(1, &srcLine);
srcLine=doubleRow;
}
written = capture.video.codec->FinishCompressFrame();
if (written < 0)
goto skip_video;
if (flags & CAPTURE_FLAG_DBLH) {
const void *rowPointer[2];
rowPointer[0]=rowPointer[1]=srcLine;
capture.video.codec->CompressLines(2, rowPointer);
i++;
} else
capture.video.codec->CompressLines(1, &srcLine);
}
int written = capture.video.codec->FinishCompressFrame();
if (written < 0)
goto skip_video;
if (capture.video.avi_out->AddVideo(capture.video.buf, written, codecFlags & 1 ? AVII_KEYFRAME : 0)) {
// LOG_MSG("Frame %d video %d audio %d",capture.video.avi_out->frames, written, capture.video.audioused *4 );
capture.video.gop++;
if (!capture.video.audioused) return;
Bitu samples = capture.video.audioused;
capture.video.audioused = 0;