From 8dddb25ad6373a9807755fff728983e182488e03 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 22 May 2010 02:12:19 +0200 Subject: [PATCH] recorder: correctly renegotiate CPU contract --- src/recorder/ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/recorder/ffmpeg.c b/src/recorder/ffmpeg.c index d5b0c7f..469fd94 100644 --- a/src/recorder/ffmpeg.c +++ b/src/recorder/ffmpeg.c @@ -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; -- 2.39.2