From 1cc0fbabcb2262afeb4cf9b0216fd367ce3231c9 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Thu, 2 Jul 2020 23:33:14 -0700 Subject: load_cache: more formatting cleanups nothing functionally changed --- recordmydesktop/src/rmd_load_cache.c | 200 +++++++++++++++++------------------ 1 file changed, 100 insertions(+), 100 deletions(-) (limited to 'recordmydesktop') diff --git a/recordmydesktop/src/rmd_load_cache.c b/recordmydesktop/src/rmd_load_cache.c index 611195a..415ace8 100644 --- a/recordmydesktop/src/rmd_load_cache.c +++ b/recordmydesktop/src/rmd_load_cache.c @@ -66,92 +66,93 @@ typedef struct _CachedFrame{ }CachedFrame; -static void rmdLoadBlock(unsigned char *dest, - unsigned char *source, - int blockno, - int width, - int height, - int blockwidth) { - int j, - block_i=blockno/(width/blockwidth),//place on the grid - block_k=blockno%(width/blockwidth); - - for (j=0;jheader->Ynum>0) { + if (frame->header->Ynum > 0) { if (rmdReadZF( frame->YBlocks, index_entry_size, frame->header->Ynum, ucfp, - ifp)!=index_entry_size*frame->header->Ynum) { + ifp) != index_entry_size * frame->header->Ynum) { return -1; } } - if (frame->header->Unum>0) { + if (frame->header->Unum > 0) { if (rmdReadZF( frame->UBlocks, index_entry_size, frame->header->Unum, ucfp, - ifp)!=index_entry_size*frame->header->Unum) { + ifp) != index_entry_size * frame->header->Unum) { return -1; } } - if (frame->header->Vnum>0) { + if (frame->header->Vnum > 0) { if (rmdReadZF( frame->VBlocks, index_entry_size, frame->header->Vnum, ucfp, - ifp)!=index_entry_size*frame->header->Vnum) { + ifp) != index_entry_size * frame->header->Vnum) { return -1; } } - if (frame->header->Ynum>0) { + if (frame->header->Ynum > 0) { if (rmdReadZF( frame->YData, Y_UNIT_BYTES, frame->header->Ynum, ucfp, - ifp)!=Y_UNIT_BYTES*frame->header->Ynum) { + ifp) != Y_UNIT_BYTES * frame->header->Ynum) { return -2; } } - if (frame->header->Unum>0) { + if (frame->header->Unum > 0) { if (rmdReadZF( frame->UData, UV_UNIT_BYTES, frame->header->Unum, ucfp, - ifp)!=UV_UNIT_BYTES*frame->header->Unum) { + ifp) != UV_UNIT_BYTES * frame->header->Unum) { return -2; } } - if (frame->header->Vnum>0) { + if (frame->header->Vnum > 0) { if (rmdReadZF( frame->VData, UV_UNIT_BYTES, frame->header->Vnum, ucfp, - ifp)!=UV_UNIT_BYTES*frame->header->Vnum) { + ifp) != UV_UNIT_BYTES * frame->header->Vnum) { return -2; } } @@ -161,117 +162,116 @@ static int rmdReadFrame(CachedFrame *frame, FILE *ucfp, gzFile ifp) { void *rmdLoadCache(ProgData *pdata) { - yuv_buffer *yuv=&pdata->enc_data->yuv; - gzFile ifp=NULL; - FILE *ucfp=NULL; - FILE *afp=pdata->cache_data->afp; - FrameHeader fheader; - CachedFrame frame; - int j=0, nth_cache=1, - audio_end=0, - extra_frames=0,//total number of duplicated frames - missing_frames=0,//if this is found >0 current run will not load - //a frame but it will proccess the previous - thread_exit=0,//0 success, -1 couldn't find files,1 couldn't remove - blocknum_x=pdata->enc_data->yuv.y_width/Y_UNIT_WIDTH, - blocknum_y=pdata->enc_data->yuv.y_height/Y_UNIT_WIDTH, - blockszy=Y_UNIT_BYTES,//size of y plane block in bytes - blockszuv=UV_UNIT_BYTES;//size of u,v plane blocks in bytes - signed char *sound_data=(signed char *)malloc(pdata->periodsize* pdata->sound_framesize); - - u_int32_t YBlocks[(yuv->y_width*yuv->y_height)/Y_UNIT_BYTES], - UBlocks[(yuv->uv_width*yuv->uv_height)/UV_UNIT_BYTES], - VBlocks[(yuv->uv_width*yuv->uv_height)/UV_UNIT_BYTES]; + yuv_buffer *yuv = &pdata->enc_data->yuv; + gzFile ifp = NULL; + FILE *ucfp = NULL; + FILE *afp = pdata->cache_data->afp; + FrameHeader fheader; + CachedFrame frame; + int nth_cache = 1, + audio_end = 0, + extra_frames = 0,//total number of duplicated frames + missing_frames = 0,//if this is found >0 current run will not load + //a frame but it will proccess the previous + thread_exit = 0,//0 success, -1 couldn't find files,1 couldn't remove + blocknum_x = pdata->enc_data->yuv.y_width / Y_UNIT_WIDTH, + blocknum_y = pdata->enc_data->yuv.y_height / Y_UNIT_WIDTH, + blockszy = Y_UNIT_BYTES,//size of y plane block in bytes + blockszuv = UV_UNIT_BYTES;//size of u,v plane blocks in bytes + signed char *sound_data = (signed char *)malloc(pdata->periodsize * pdata->sound_framesize); + + u_int32_t YBlocks[(yuv->y_width * yuv->y_height) / Y_UNIT_BYTES], + UBlocks[(yuv->uv_width * yuv->uv_height) / UV_UNIT_BYTES], + VBlocks[(yuv->uv_width * yuv->uv_height) / UV_UNIT_BYTES]; // We allocate the frame that we will use - frame.header = &fheader; - frame.YBlocks = YBlocks; - frame.UBlocks = UBlocks; - frame.VBlocks = VBlocks; - frame.YData = malloc(yuv->y_width * yuv->y_height); - frame.UData = malloc(yuv->uv_width * yuv->uv_height); - frame.VData = malloc(yuv->uv_width * yuv->uv_height); + frame.header = &fheader; + frame.YBlocks = YBlocks; + frame.UBlocks = UBlocks; + frame.VBlocks = VBlocks; + frame.YData = malloc(yuv->y_width * yuv->y_height); + frame.UData = malloc(yuv->uv_width * yuv->uv_height); + frame.VData = malloc(yuv->uv_width * yuv->uv_height); //and the we open our files if (!pdata->args.zerocompression) { - ifp=gzopen(pdata->cache_data->imgdata,"rb"); - if (ifp==NULL) { - thread_exit=-1; + ifp = gzopen(pdata->cache_data->imgdata, "rb"); + if (ifp == NULL) { + thread_exit = -1; pthread_exit(&thread_exit); } } else { - ucfp=fopen(pdata->cache_data->imgdata,"rb"); - if (ucfp==NULL) { - thread_exit=-1; + ucfp = fopen(pdata->cache_data->imgdata, "rb"); + if (ucfp == NULL) { + thread_exit = -1; pthread_exit(&thread_exit); } } if (!pdata->args.nosound) { - afp=fopen(pdata->cache_data->audiodata,"rb"); - if (afp==NULL) { - thread_exit=-1; + afp = fopen(pdata->cache_data->audiodata, "rb"); + if (afp == NULL) { + thread_exit = -1; pthread_exit(&thread_exit); } } //this will be used now to define if we proccess audio or video //on any given loop. - pdata->avd=0; + pdata->avd = 0; //If sound finishes first,we go on with the video. //If video ends we will do one more run to flush audio in the ogg file while (pdata->running) { //video load and encoding - if (pdata->avd<=0 || pdata->args.nosound || audio_end) { - if (missing_frames>0) { + if (pdata->avd <= 0 || pdata->args.nosound || audio_end) { + if (missing_frames > 0) { extra_frames++; missing_frames--; rmdSyncEncodeImageBuffer(pdata); - } else if (((!pdata->args.zerocompression)&& - (gzread(ifp,frame.header,sizeof(FrameHeader))== - sizeof(FrameHeader) ))|| - ((pdata->args.zerocompression)&& - (fread(frame.header,sizeof(FrameHeader),1,ucfp)==1))) { + } else if (((!pdata->args.zerocompression) && + (gzread(ifp, frame.header, sizeof(FrameHeader)) == + sizeof(FrameHeader) )) || + ((pdata->args.zerocompression) && + (fread(frame.header, sizeof(FrameHeader), 1, ucfp) == 1))) { //sync - missing_frames+=frame.header->current_total- - (extra_frames+frame.header->frameno); + missing_frames += frame.header->current_total - + (extra_frames + frame.header->frameno); if (pdata->frames_total) { - fprintf(stdout, - "\r[%d%%] ", + fprintf(stdout, "\r[%d%%] ", ((frame.header->frameno + extra_frames) * 100) / pdata->frames_total); } else fprintf(stdout,"\r[%d frames rendered] ", - (frame.header->frameno+extra_frames)); + (frame.header->frameno + extra_frames)); fflush(stdout); - if ( (frame.header->Ynum<=blocknum_x*blocknum_y) && - (frame.header->Unum<=blocknum_x*blocknum_y) && - (frame.header->Vnum<=blocknum_x*blocknum_y) && + if ( (frame.header->Ynum <= blocknum_x * blocknum_y) && + (frame.header->Unum <= blocknum_x * blocknum_y) && + (frame.header->Vnum <= blocknum_x * blocknum_y) && (!rmdReadFrame( &frame, - ((pdata->args.zerocompression)?ucfp:NULL), - ((pdata->args.zerocompression)?NULL:ifp))) + (pdata->args.zerocompression ? ucfp : NULL), + (pdata->args.zerocompression ? NULL : ifp))) ) { //load the blocks for each buffer if (frame.header->Ynum) - for (j=0;jYnum;j++) + for (int j = 0; j < frame.header->Ynum; j++) rmdLoadBlock( yuv->y, - &frame.YData[j*blockszy], + &frame.YData[j * blockszy], frame.YBlocks[j], yuv->y_width, yuv->y_height, Y_UNIT_WIDTH); if (frame.header->Unum) - for (j=0;jUnum;j++) + for (int j = 0; j < frame.header->Unum; j++) rmdLoadBlock( yuv->u, - &frame.UData[j*blockszuv], + &frame.UData[j * blockszuv], frame.UBlocks[j], yuv->uv_width, yuv->uv_height, UV_UNIT_WIDTH); if (frame.header->Vnum) - for (j=0;jVnum;j++) + for (int j = 0; j < frame.header->Vnum; j++) rmdLoadBlock( yuv->v, - &frame.VData[j*blockszuv], + &frame.VData[j * blockszuv], frame.VBlocks[j], yuv->uv_width, yuv->uv_height, @@ -293,7 +293,7 @@ void *rmdLoadCache(ProgData *pdata) { &ucfp)) { raise(SIGINT); } else { - fprintf(stderr,"\t[Cache File %d]",nth_cache); + fprintf(stderr, "\t[Cache File %d]", nth_cache); nth_cache++; } continue; @@ -301,17 +301,17 @@ void *rmdLoadCache(ProgData *pdata) { //audio load and encoding } else { if (!audio_end) { - int nbytes=fread(sound_data,1,pdata->periodsize* - pdata->sound_framesize,afp); - if (nbytes<=0) - audio_end=1; + int nbytes = fread(sound_data, 1, pdata->periodsize* + pdata->sound_framesize, afp); + if (nbytes <= 0) + audio_end = 1; else - rmdSyncEncodeSoundBuffer(pdata,sound_data); + rmdSyncEncodeSoundBuffer(pdata, sound_data); } } } - pdata->v_encoding_clean=pdata->th_encoding_clean=1; + pdata->v_encoding_clean = pdata->th_encoding_clean = 1; pthread_mutex_lock(&pdata->theora_lib_mutex); pthread_cond_signal(&pdata->theora_lib_clean); pthread_mutex_unlock(&pdata->theora_lib_mutex); -- cgit v1.2.1