# HG changeset patch # User Nina Engelhardt # Date 1362576939 -3600 # Node ID 55fb61482128d051b5f47020f572063e9348482d # Parent 808fe898c011a582d33ec1717cf0730dfa201133 VSs working diff -r 808fe898c011 -r 55fb61482128 libavcodec/h264_misc.c --- a/libavcodec/h264_misc.c Fri Feb 01 17:11:39 2013 +0100 +++ b/libavcodec/h264_misc.c Wed Mar 06 14:35:39 2013 +0100 @@ -266,18 +266,18 @@ } if (verbose){ - //fprintf(stderr, "frame=%5d avgfps=%3d curfps=%3d\r", frame_number, (int)(frame_number/t+0.5), (int)((frame_number - last_frame_number)/t2+0.5) ); - //fflush(stderr); + fprintf(stderr, "frame=%5d avgfps=%3d curfps=%3d\r", frame_number, (int)(frame_number/t+0.5), (int)((frame_number - last_frame_number)/t2+0.5) ); + fflush(stderr); } last_frame_number = frame_number; last_time = cur_time; if (is_last_report){ t = (av_gettime()-timer_start) / 1000000.0; - //fprintf(stderr, "%c[2Kframe=%5d avgfps=%3d\r", 27, frame_number, (int)(frame_number/t+0.5)); - //fprintf(stderr, "\n"); - //fprintf(stderr, "video:%1.0fkB\n", video_size/1024.0); - //fflush(stderr); + fprintf(stderr, "%c[2Kframe=%5d avgfps=%3d\r", 27, frame_number, (int)(frame_number/t+0.5)); + fprintf(stderr, "\n"); + fprintf(stderr, "video:%1.0fkB\n", video_size/1024.0); + fflush(stderr); } } diff -r 808fe898c011 -r 55fb61482128 libavcodec/h264_ompss.c --- a/libavcodec/h264_ompss.c Fri Feb 01 17:11:39 2013 +0100 +++ b/libavcodec/h264_ompss.c Wed Mar 06 14:35:39 2013 +0100 @@ -213,6 +213,7 @@ H264Slice *s = &sbe->slice; for (int i=line*smbc->smb_height; i< (line+1)*smbc->smb_height && i< d->mb_height; i++) draw_edges(d, s, i); + VMS_App__free(args->line); VSs__end_task( animatingSlv ); } VSsTaskType draw_edges_taskType = { @@ -576,7 +577,7 @@ release_dpb_entry(h, out, 1); VSs__end_critical(animatingSlv,0); } - print_report(oc->frame_number, oc->video_size, 0, h->verbose); + //print_report(oc->frame_number, oc->video_size, 0, h->verbose); VSs__end_task( animatingSlv ); } @@ -697,7 +698,7 @@ VSs__submit_task_with_ID(&init_ref_list_and_get_dpb_taskType, &init_ref_list_and_get_dpb_task_args, taskID, animSlv); smbc = acquire_smbc(h); - SuperMBTask *lastsmb= add_decode_slice_3dwave_tasks(rc[k%2], &sbe[k%bufs], smbc, k, animSlv); + SuperMBTask *lastsmb= add_decode_slice_3dwave_tasks(rc[k%2], &sbe[k%bufs], smbc, k, animSlv); release_ref_list_taskArgs release_ref_list_task_args; release_ref_list_task_args.h = h; release_ref_list_task_args.smbc = smbc; @@ -802,7 +803,7 @@ while ((out=output_frame(h, oc, NULL, h->ofile, h->frame_width, h->frame_height))) ; - print_report(oc->frame_number, oc->video_size, 1, h->verbose); + //print_report(oc->frame_number, oc->video_size, 1, h->verbose); h->num_frames = oc->frame_number; /* finished ! */