]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
recorder: Enable disk
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 14 May 2010 16:32:02 +0000 (18:32 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 14 May 2010 16:32:02 +0000 (18:32 +0200)
src/frsh_forb
src/recorder/ffmpeg.c

index 3e748c831511a4b8e42cbf20292386d2c5a825cb..3c2e744f5bf18c67d96f5c2f48aad64983dbdea1 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 3e748c831511a4b8e42cbf20292386d2c5a825cb
+Subproject commit 3c2e744f5bf18c67d96f5c2f48aad64983dbdea1
index a2167e299cf11b1d5cdb0fa3a35105bb78ca8cdd..0336d7821375be0315d1ee079c1092c25f03d7e9 100644 (file)
@@ -4026,7 +4026,7 @@ void *av_encode_thread(void *arg)
 
     /* bind this thread to vres */
     thread_id = fosa_thread_self();
-    /* PXW(frsh_thread_bind(disk_vres, thread_id)); */
+    PXW(frsh_thread_bind(disk_vres, thread_id));
 
     ret = av_encode(output_files, nb_output_files,
                    input_files, nb_input_files,
@@ -4051,11 +4051,14 @@ int frsh_stuff()
     cpu_budget = fosa_msec_to_rel_time(5);
     cpu_period = fosa_msec_to_rel_time(1000/50);
 
-/* #define DISK_THROUGHPUT 20277LLU /\* units??? probably MB/s *\/ */
-/*     disk_budget = fosa_nsec_to_rel_time(1000000000LLU/\*nsec/s*\/ * 500000 /\*bytes/s*\/ */
-/*                                     / (DISK_THROUGHPUT*1000000) /\* bytes *\/); // is this correct? */
+#if 1
+#define DISK_THROUGHPUT 20277LLU /* units??? probably MB/s */
+    disk_budget = fosa_nsec_to_rel_time(1000000000LLU/*nsec/s*/ * 500000 /*bytes/s*/
+                                       / (DISK_THROUGHPUT*1000000) /* bytes */); // is this correct?
+#else
     disk_budget = fosa_msec_to_rel_time(1);
-    disk_period = fosa_msec_to_rel_time(1000/50);
+#endif
+    disk_period = fosa_msec_to_rel_time(1000/30);
     
     /* Contract negotiation for CPU */
     ret = frsh_contract_init(&cpu_contract);