]> rtime.felk.cvut.cz Git - frescor/streamer.git/commitdiff
Proper CPU contracts in streamer demo
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 22 May 2010 00:54:20 +0000 (02:54 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 22 May 2010 00:54:20 +0000 (02:54 +0200)
streamer.c

index ff58d467921f086447da831f66afb45445fbacd8..33df5bcf4a7d1c7a59d6924cfa86a649a8d87712 100644 (file)
@@ -274,14 +274,14 @@ int main(int argc, char *argv[])
   dump_format(os, 0, os->filename, 1);
   sdp_print(os, sdp_file);
 
-#if CONFIG_FFMPEG_WITH_FRSH && CONFIG_AQUOSA
+#if CONFIG_FFMPEG_WITH_FRSH
   frsh_thread_attr_t frsh_attr;
   frsh_thread_id_t thread;
   frsh_vres_id_t cpu_vres;
   frsh_contract_t cpu_contract;
   frsh_rel_time_t cpu_budget, cpu_period;
  
-  cpu_budget = fosa_msec_to_rel_time(10);
+  cpu_budget = fosa_msec_to_rel_time(5);
   cpu_period = fosa_msec_to_rel_time(1000/fps);
   /* Contract negotiation for CPU */
   ret = frsh_contract_init(&cpu_contract);
@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
                                             FRSH_CT_REGULAR);
        if (ret) PERROR_AND_EXIT(ret, "frsh_contract_set_basic_params");
        ret = frsh_contract_set_resource_and_label(&cpu_contract, 
-                       FRSH_RT_PROCESSOR, FRSH_CPU_ID_DEFAULT, "aqcpu_cont");
+                       FRSH_RT_PROCESSOR, FRSH_CPU_ID_DEFAULT, "camera_ctrl");
        if (ret) PERROR_AND_EXIT(ret, "frsh_contract_set_resource_and_label");
 
        ret = frsh_contract_negotiate(&cpu_contract, &cpu_vres);