1.1 --- a/libavcodec/h264_ompss.c	Mon Oct 29 16:44:27 2012 +0100
     1.2 +++ b/libavcodec/h264_ompss.c	Wed Dec 19 15:40:26 2012 +0100
     1.3 @@ -591,6 +591,8 @@
     1.4  
     1.5      DecodedPicture *out;
     1.6      int frames=0;
     1.7 +    
     1.8 +    int32* taskID;
     1.9  
    1.10  #if HAVE_LIBSDL2
    1.11      pthread_t sdl_thr;
    1.12 @@ -626,13 +628,19 @@
    1.13              parse_task_args.pc = pc;
    1.14              parse_task_args.nc = nc;
    1.15              parse_task_args.sbe = &sbe[k%bufs];
    1.16 -            VSs__submit_task(&parse_taskType, &parse_task_args, animSlv);
    1.17 +            taskID = VSs__create_taskID_of_size(2,animSlv );
    1.18 +            taskID[1] = 1;
    1.19 +            taskID[2] = num_pre_ed;
    1.20 +            VSs__submit_task_with_ID(&parse_taskType, &parse_task_args, taskID, animSlv);
    1.21              
    1.22              decode_slice_entropy_taskArgs decode_slice_entropy_task_args;
    1.23              decode_slice_entropy_task_args.h = h;
    1.24              decode_slice_entropy_task_args.ec = ec[k%bufs];
    1.25              decode_slice_entropy_task_args.sbe = &sbe[k%bufs];
    1.26 -            VSs__submit_task(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args, animSlv);        
    1.27 +            taskID = VSs__create_taskID_of_size(2,animSlv );
    1.28 +            taskID[1] = 2;
    1.29 +            taskID[2] = num_pre_ed;
    1.30 +            VSs__submit_task_with_ID(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args, taskID, animSlv);        
    1.31              //#pragma omp taskwait on(*pc)
    1.32              VSs__taskwait_on(animSlv,pc);
    1.33              k++;
    1.34 @@ -644,13 +652,19 @@
    1.35              parse_task_args.pc = pc;
    1.36              parse_task_args.nc = nc;
    1.37              parse_task_args.sbe = &sbe[k%bufs];
    1.38 -            VSs__submit_task(&parse_taskType, &parse_task_args, animSlv);
    1.39 +            taskID = VSs__create_taskID_of_size(2,animSlv );
    1.40 +            taskID[1] = 3;
    1.41 +            taskID[2] = frames;
    1.42 +            VSs__submit_task_with_ID(&parse_taskType, &parse_task_args, taskID, animSlv);
    1.43              
    1.44              decode_slice_entropy_taskArgs decode_slice_entropy_task_args;
    1.45              decode_slice_entropy_task_args.h = h;
    1.46              decode_slice_entropy_task_args.ec = ec[k%bufs];
    1.47              decode_slice_entropy_task_args.sbe = &sbe[k%bufs];
    1.48 -            VSs__submit_task(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args, animSlv); 
    1.49 +            taskID = VSs__create_taskID_of_size(2,animSlv );
    1.50 +            taskID[1] = 4;
    1.51 +            taskID[2] = frames;
    1.52 +            VSs__submit_task_with_ID(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args, taskID, animSlv); 
    1.53  
    1.54              k++;
    1.55              
    1.56 @@ -659,7 +673,10 @@
    1.57              init_ref_list_and_get_dpb_task_args.d = rc[k%2];
    1.58              init_ref_list_and_get_dpb_task_args.sbe = &sbe[k%bufs];
    1.59              init_ref_list_and_get_dpb_task_args.init = &init;
    1.60 -            VSs__submit_task(&init_ref_list_and_get_dpb_taskType, &init_ref_list_and_get_dpb_task_args, animSlv); 
    1.61 +            taskID = VSs__create_taskID_of_size(2,animSlv );
    1.62 +            taskID[1] = 5;
    1.63 +            taskID[2] = frames;
    1.64 +            VSs__submit_task_with_ID(&init_ref_list_and_get_dpb_taskType, &init_ref_list_and_get_dpb_task_args, taskID, animSlv); 
    1.65  
    1.66              smbc = acquire_smbc(h);
    1.67              SuperMBTask *lastsmb= add_decode_slice_3dwave_tasks(rc[k%2], &sbe[k%bufs], smbc, animSlv);
    1.68 @@ -670,13 +687,19 @@
    1.69              release_ref_list_task_args.sbe = &sbe[k%bufs];
    1.70              release_ref_list_task_args.lastsmb = lastsmb;
    1.71              release_ref_list_task_args.release = &release;
    1.72 -            VSs__submit_task(&release_ref_list_taskType, &release_ref_list_task_args, animSlv);
    1.73 +            taskID = VSs__create_taskID_of_size(2,animSlv );
    1.74 +            taskID[1] = 6;
    1.75 +            taskID[2] = frames;
    1.76 +            VSs__submit_task_with_ID(&release_ref_list_taskType, &release_ref_list_task_args, taskID, animSlv);
    1.77  
    1.78              output_taskArgs output_task_args;
    1.79              output_task_args.h = h;
    1.80              output_task_args.oc = oc;
    1.81              output_task_args.sbe = &sbe[k%bufs];
    1.82 -            VSs__submit_task(&output_taskType, &output_task_args, animSlv);
    1.83 +            taskID = VSs__create_taskID_of_size(2,animSlv );
    1.84 +            taskID[1] = 7;
    1.85 +            taskID[2] = frames;
    1.86 +            VSs__submit_task_with_ID(&output_taskType, &output_task_args, taskID, animSlv);
    1.87              //#pragma omp taskwait on(*pc)
    1.88              VSs__taskwait_on(animSlv,pc);
    1.89          }
    1.90 @@ -688,7 +711,10 @@
    1.91              init_ref_list_and_get_dpb_task_args.d = rc[k%2];
    1.92              init_ref_list_and_get_dpb_task_args.sbe = &sbe[k%bufs];
    1.93              init_ref_list_and_get_dpb_task_args.init = &init;
    1.94 -            VSs__submit_task(&init_ref_list_and_get_dpb_taskType, &init_ref_list_and_get_dpb_task_args, animSlv); 
    1.95 +            taskID = VSs__create_taskID_of_size(2,animSlv );
    1.96 +            taskID[1] = 8;
    1.97 +            taskID[2] = i;
    1.98 +            VSs__submit_task_with_ID(&init_ref_list_and_get_dpb_taskType, &init_ref_list_and_get_dpb_task_args, taskID, animSlv); 
    1.99              smbc = acquire_smbc(h);
   1.100              SuperMBTask *lastsmb= add_decode_slice_3dwave_tasks(rc[k%2], &sbe[k%bufs], smbc, animSlv);
   1.101              release_ref_list_taskArgs release_ref_list_task_args;
   1.102 @@ -698,18 +724,24 @@
   1.103              release_ref_list_task_args.sbe = &sbe[k%bufs];
   1.104              release_ref_list_task_args.lastsmb = lastsmb;
   1.105              release_ref_list_task_args.release = &release;
   1.106 -            VSs__submit_task(&release_ref_list_taskType, &release_ref_list_task_args, animSlv); 
   1.107 +            taskID = VSs__create_taskID_of_size(2,animSlv );
   1.108 +            taskID[1] = 9;
   1.109 +            taskID[2] = frames;
   1.110 +            VSs__submit_task_with_ID(&release_ref_list_taskType, &release_ref_list_task_args, taskID, animSlv); 
   1.111  
   1.112              output_taskArgs output_task_args;
   1.113              output_task_args.h = h;
   1.114              output_task_args.oc = oc;
   1.115              output_task_args.sbe = &sbe[k%bufs];
   1.116 -            VSs__submit_task(&output_taskType, &output_task_args, animSlv);
   1.117 +            taskID = VSs__create_taskID_of_size(2,animSlv );
   1.118 +            taskID[1] = 10;
   1.119 +            taskID[2] = frames;
   1.120 +            VSs__submit_task_with_ID(&output_taskType, &output_task_args, taskID, animSlv);
   1.121          }
   1.122  
   1.123      } else {
   1.124          while(!pc->final_frame && frames++ < h->num_frames && !h->quit){
   1.125 -            int32* taskID;
   1.126 +            
   1.127              taskID = VSs__create_taskID_of_size(1,animSlv );
   1.128              taskID[1] = frames*10+1;
   1.129              parse_taskArgs parse_task_args;