# HG changeset patch
# User Nina Engelhardt <nengel@mailbox.tu-berlin.de>
# Date 1355928026 -3600
# Node ID 96e628866d41dae5ca9bbfbe0aeb20951f9a9d52
# Parent  0b056460c67de39a266072cd72e3fa671ca2b08b
naming some tasks to help debugging

diff -r 0b056460c67d -r 96e628866d41 libavcodec/h264_ompss.c
--- a/libavcodec/h264_ompss.c	Mon Oct 29 16:44:27 2012 +0100
+++ b/libavcodec/h264_ompss.c	Wed Dec 19 15:40:26 2012 +0100
@@ -591,6 +591,8 @@
 
     DecodedPicture *out;
     int frames=0;
+    
+    int32* taskID;
 
 #if HAVE_LIBSDL2
     pthread_t sdl_thr;
@@ -626,13 +628,19 @@
             parse_task_args.pc = pc;
             parse_task_args.nc = nc;
             parse_task_args.sbe = &sbe[k%bufs];
-            VSs__submit_task(&parse_taskType, &parse_task_args, animSlv);
+            taskID = VSs__create_taskID_of_size(2,animSlv );
+            taskID[1] = 1;
+            taskID[2] = num_pre_ed;
+            VSs__submit_task_with_ID(&parse_taskType, &parse_task_args, taskID, animSlv);
             
             decode_slice_entropy_taskArgs decode_slice_entropy_task_args;
             decode_slice_entropy_task_args.h = h;
             decode_slice_entropy_task_args.ec = ec[k%bufs];
             decode_slice_entropy_task_args.sbe = &sbe[k%bufs];
-            VSs__submit_task(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args, animSlv);        
+            taskID = VSs__create_taskID_of_size(2,animSlv );
+            taskID[1] = 2;
+            taskID[2] = num_pre_ed;
+            VSs__submit_task_with_ID(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args, taskID, animSlv);        
             //#pragma omp taskwait on(*pc)
             VSs__taskwait_on(animSlv,pc);
             k++;
@@ -644,13 +652,19 @@
             parse_task_args.pc = pc;
             parse_task_args.nc = nc;
             parse_task_args.sbe = &sbe[k%bufs];
-            VSs__submit_task(&parse_taskType, &parse_task_args, animSlv);
+            taskID = VSs__create_taskID_of_size(2,animSlv );
+            taskID[1] = 3;
+            taskID[2] = frames;
+            VSs__submit_task_with_ID(&parse_taskType, &parse_task_args, taskID, animSlv);
             
             decode_slice_entropy_taskArgs decode_slice_entropy_task_args;
             decode_slice_entropy_task_args.h = h;
             decode_slice_entropy_task_args.ec = ec[k%bufs];
             decode_slice_entropy_task_args.sbe = &sbe[k%bufs];
-            VSs__submit_task(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args, animSlv); 
+            taskID = VSs__create_taskID_of_size(2,animSlv );
+            taskID[1] = 4;
+            taskID[2] = frames;
+            VSs__submit_task_with_ID(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args, taskID, animSlv); 
 
             k++;
             
@@ -659,7 +673,10 @@
             init_ref_list_and_get_dpb_task_args.d = rc[k%2];
             init_ref_list_and_get_dpb_task_args.sbe = &sbe[k%bufs];
             init_ref_list_and_get_dpb_task_args.init = &init;
-            VSs__submit_task(&init_ref_list_and_get_dpb_taskType, &init_ref_list_and_get_dpb_task_args, animSlv); 
+            taskID = VSs__create_taskID_of_size(2,animSlv );
+            taskID[1] = 5;
+            taskID[2] = frames;
+            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, animSlv);
@@ -670,13 +687,19 @@
             release_ref_list_task_args.sbe = &sbe[k%bufs];
             release_ref_list_task_args.lastsmb = lastsmb;
             release_ref_list_task_args.release = &release;
-            VSs__submit_task(&release_ref_list_taskType, &release_ref_list_task_args, animSlv);
+            taskID = VSs__create_taskID_of_size(2,animSlv );
+            taskID[1] = 6;
+            taskID[2] = frames;
+            VSs__submit_task_with_ID(&release_ref_list_taskType, &release_ref_list_task_args, taskID, animSlv);
 
             output_taskArgs output_task_args;
             output_task_args.h = h;
             output_task_args.oc = oc;
             output_task_args.sbe = &sbe[k%bufs];
-            VSs__submit_task(&output_taskType, &output_task_args, animSlv);
+            taskID = VSs__create_taskID_of_size(2,animSlv );
+            taskID[1] = 7;
+            taskID[2] = frames;
+            VSs__submit_task_with_ID(&output_taskType, &output_task_args, taskID, animSlv);
             //#pragma omp taskwait on(*pc)
             VSs__taskwait_on(animSlv,pc);
         }
@@ -688,7 +711,10 @@
             init_ref_list_and_get_dpb_task_args.d = rc[k%2];
             init_ref_list_and_get_dpb_task_args.sbe = &sbe[k%bufs];
             init_ref_list_and_get_dpb_task_args.init = &init;
-            VSs__submit_task(&init_ref_list_and_get_dpb_taskType, &init_ref_list_and_get_dpb_task_args, animSlv); 
+            taskID = VSs__create_taskID_of_size(2,animSlv );
+            taskID[1] = 8;
+            taskID[2] = i;
+            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, animSlv);
             release_ref_list_taskArgs release_ref_list_task_args;
@@ -698,18 +724,24 @@
             release_ref_list_task_args.sbe = &sbe[k%bufs];
             release_ref_list_task_args.lastsmb = lastsmb;
             release_ref_list_task_args.release = &release;
-            VSs__submit_task(&release_ref_list_taskType, &release_ref_list_task_args, animSlv); 
+            taskID = VSs__create_taskID_of_size(2,animSlv );
+            taskID[1] = 9;
+            taskID[2] = frames;
+            VSs__submit_task_with_ID(&release_ref_list_taskType, &release_ref_list_task_args, taskID, animSlv); 
 
             output_taskArgs output_task_args;
             output_task_args.h = h;
             output_task_args.oc = oc;
             output_task_args.sbe = &sbe[k%bufs];
-            VSs__submit_task(&output_taskType, &output_task_args, animSlv);
+            taskID = VSs__create_taskID_of_size(2,animSlv );
+            taskID[1] = 10;
+            taskID[2] = frames;
+            VSs__submit_task_with_ID(&output_taskType, &output_task_args, taskID, animSlv);
         }
 
     } else {
         while(!pc->final_frame && frames++ < h->num_frames && !h->quit){
-            int32* taskID;
+            
             taskID = VSs__create_taskID_of_size(1,animSlv );
             taskID[1] = frames*10+1;
             parse_taskArgs parse_task_args;