]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
recorder: correctly renegotiate CPU contract
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 22 May 2010 00:12:19 +0000 (02:12 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 22 May 2010 00:12:19 +0000 (02:12 +0200)
src/recorder/ffmpeg.c

index d5b0c7f2d9793be5fd38e4b852e6b39ae248fd1f..469fd94b4ac88720af6fcf2236411ec0b833efdd 100644 (file)
@@ -1591,6 +1591,7 @@ timespec_subtract (struct timespec *result,
 
 #ifdef CONFIG_FFMPEG_WITH_FRSH
 frsh_vres_id_t disk_vres;
+frsh_vres_id_t cpu_vres;
 frsh_contract_t cpu_contract;
 frsh_contract_t disk_contract;
 #endif
@@ -1617,7 +1618,7 @@ print_timing(void)
 
 #ifdef CONFIG_FFMPEG_WITH_FRSH
        if (renegotiate == f) {
-               frsh_contract_renegotiate_sync(&disk_contract, disk_vres);
+               frsh_contract_renegotiate_sync(&cpu_contract, cpu_vres);
                frsh_contract_renegotiate_sync(&disk_contract, disk_vres);
        }
 #endif
@@ -4047,7 +4048,6 @@ int frsh_stuff()
 {
     frsh_thread_attr_t frsh_attr;
     frsh_thread_id_t thread;
-    frsh_vres_id_t cpu_vres;
     frsh_rel_time_t cpu_budget, cpu_period;
 
     frsh_rel_time_t disk_budget, disk_period;