changeset 6:55fb61482128

VSs working
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Wed, 06 Mar 2013 14:35:39 +0100
parents 808fe898c011
children c8259123d224
files libavcodec/h264_misc.c libavcodec/h264_ompss.c
diffstat 2 files changed, 10 insertions(+), 9 deletions(-) [+]
line diff
     1.1 --- a/libavcodec/h264_misc.c	Fri Feb 01 17:11:39 2013 +0100
     1.2 +++ b/libavcodec/h264_misc.c	Wed Mar 06 14:35:39 2013 +0100
     1.3 @@ -266,18 +266,18 @@
     1.4      }
     1.5  
     1.6      if (verbose){
     1.7 -        //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) );
     1.8 -        //fflush(stderr);
     1.9 +        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) );
    1.10 +        fflush(stderr);
    1.11      }
    1.12      last_frame_number = frame_number;
    1.13      last_time = cur_time;
    1.14  
    1.15      if (is_last_report){
    1.16          t = (av_gettime()-timer_start) / 1000000.0;
    1.17 -        //fprintf(stderr, "%c[2Kframe=%5d avgfps=%3d\r", 27, frame_number, (int)(frame_number/t+0.5));
    1.18 -        //fprintf(stderr, "\n");
    1.19 -        //fprintf(stderr, "video:%1.0fkB\n", video_size/1024.0);
    1.20 -        //fflush(stderr);
    1.21 +        fprintf(stderr, "%c[2Kframe=%5d avgfps=%3d\r", 27, frame_number, (int)(frame_number/t+0.5));
    1.22 +        fprintf(stderr, "\n");
    1.23 +        fprintf(stderr, "video:%1.0fkB\n", video_size/1024.0);
    1.24 +        fflush(stderr);
    1.25      }
    1.26  }
    1.27  
     2.1 --- a/libavcodec/h264_ompss.c	Fri Feb 01 17:11:39 2013 +0100
     2.2 +++ b/libavcodec/h264_ompss.c	Wed Mar 06 14:35:39 2013 +0100
     2.3 @@ -213,6 +213,7 @@
     2.4      H264Slice *s = &sbe->slice;
     2.5      for (int i=line*smbc->smb_height; i< (line+1)*smbc->smb_height && i< d->mb_height; i++)
     2.6          draw_edges(d, s, i);
     2.7 +    VMS_App__free(args->line);
     2.8      VSs__end_task( animatingSlv );
     2.9  }
    2.10  VSsTaskType draw_edges_taskType = {
    2.11 @@ -576,7 +577,7 @@
    2.12          release_dpb_entry(h, out, 1);
    2.13          VSs__end_critical(animatingSlv,0);
    2.14      }
    2.15 -    print_report(oc->frame_number, oc->video_size, 0, h->verbose);
    2.16 +    //print_report(oc->frame_number, oc->video_size, 0, h->verbose);
    2.17      
    2.18      VSs__end_task( animatingSlv );
    2.19  }
    2.20 @@ -697,7 +698,7 @@
    2.21              VSs__submit_task_with_ID(&init_ref_list_and_get_dpb_taskType, &init_ref_list_and_get_dpb_task_args, taskID, animSlv); 
    2.22  
    2.23              smbc = acquire_smbc(h);
    2.24 -            SuperMBTask *lastsmb= add_decode_slice_3dwave_tasks(rc[k%2], &sbe[k%bufs], smbc, k, animSlv);
    2.25 +            SuperMBTask *lastsmb= add_decode_slice_3dwave_tasks(rc[k%2], &sbe[k%bufs], smbc, k, animSlv);            
    2.26              release_ref_list_taskArgs release_ref_list_task_args;
    2.27              release_ref_list_task_args.h = h;
    2.28              release_ref_list_task_args.smbc = smbc;
    2.29 @@ -802,7 +803,7 @@
    2.30      
    2.31      while ((out=output_frame(h, oc, NULL, h->ofile, h->frame_width, h->frame_height))) ;
    2.32  
    2.33 -    print_report(oc->frame_number, oc->video_size, 1, h->verbose);
    2.34 +    //print_report(oc->frame_number, oc->video_size, 1, h->verbose);
    2.35      h->num_frames = oc->frame_number;
    2.36      /* finished ! */
    2.37