Fix compilation with FRSH

[frescor/streamer.git] / streamer.c

diff --git a/streamer.c b/streamer.c
index c046e19c4da9a3ce1ae45e509e5a447d4d724e03..bb7f091bf0c881c0fa401b58018d375aad83d7d2 100644 (file)
--- a/streamer.c
+++ b/streamer.c
@@ -24,11 +24,9 @@
 #include <ul_logreg.h>
 #endif
 
-#ifdef CONFIG_STREAMER_WITH_FRSH
+#ifdef CONFIG_FFMPEG_WITH_FRSH
 #include <frsh.h>
-#endif
 
-#ifdef CONFIG_STREAMER_WITH_FRSH
 /*temporrary solution to pass network parameters */
 extern long int udp_budget, udp_period;
 #endif /*CONFIG_STREAMER_WITH_FRSH*/
@@ -149,6 +147,7 @@ void* streamer_run(void* args)
         opkt = pkt_encode(os, f);
         if (opkt) {
           pkt_send(os, opkt);
+         printf("opkt size: %d\n", opkt->size);
         }
       }
       //rt_job_end();
@@ -184,14 +183,14 @@ int main(int argc, char *argv[])
 
   block_signals();
 
-#ifdef CONFIG_STREAMER_WITH_FRSH
+#ifdef CONFIG_FFMPEG_WITH_FRSH
   ret = frsh_init();
   if (ret) PERROR_AND_EXIT(ret, "frsh_init1");
 
   /* fill default network contract params */
   udp_budget = 50000; 
   udp_period = 500;
-#endif /*CONFIG_STREAMER_WITH_FRSH*/
+#endif /*CONFIG_FFMPEG_WITH_FRSH*/
 
   avcodec_register_all();
   av_register_all();
@@ -215,6 +214,7 @@ int main(int argc, char *argv[])
   os->streams[0]->codec->width = s->streams[0]->codec->width;
   os->streams[0]->codec->height = s->streams[0]->codec->height;
   os->streams[0]->codec->time_base = s->streams[0]->codec->time_base;
+  os->streams[0]->codec->bit_rate = 300000;
   codec_connect(s->streams[0]->codec, os->streams[0]->codec);
   out_codec_open(os);
   dump_format(os, 0, os->filename, 1);