]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
recorder: Initialize FRSH before opening of streams
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 21 May 2010 09:17:33 +0000 (11:17 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 21 May 2010 09:17:33 +0000 (11:17 +0200)
This is needed if we want to use recorder as client streamer in the case
study, where the recorder streams from file to rtp (over frsh).

src/recorder/ffmpeg.c

index ba6a68f82b7f45f71413d960c2fa11f2d3c9f102..18790dc244bf479529433f8423399d1ef611f488 100644 (file)
@@ -4043,10 +4043,8 @@ int frsh_stuff()
 
     frsh_rel_time_t disk_budget, disk_period;
 
-    int ret, terror;
+    int ret;
 
-    PXW(frsh_init());
     cpu_budget = fosa_msec_to_rel_time(5);
     cpu_period = fosa_msec_to_rel_time(1000/50);
 
@@ -4143,6 +4141,14 @@ int main(int argc, char **argv)
 
     show_banner();
 
+#if CONFIG_FFMPEG_WITH_FRSH
+    {
+       int terror;
+       PXW(frsh_init());
+       printf("FRSH initialized\n");
+    }
+#endif
+
     /* parse options */
     parse_options(argc, argv, options, opt_output_file);