#include <frsh.h>
/*temporrary solution to pass network parameters */
-extern long int avformat_frsh_budget, avformat_frsh_period;
+extern long int frsh_rtp_budget, frsh_rtp_period_ms, frsh_rtp_deadline_ms;
#endif /*CONFIG_STREAMER_WITH_FRSH*/
static const char *sdp_file = "sdp.txt";
static const char *vdev = "/dev/video0";
static const char *dst = "127.0.0.1";
static int dport = 20000;
-static int width = 640;
-static int height = 480;
-int fps = 25;
+static int width = 320;
+static int height = 240;
+static int bitrate = 1000000;
+int fps = 30;
static const char *impform = "video4linux2";
AVFormatContext *s, *os;
printf(" -r <path> video device [%s]\n", vdev);
printf(" -m <addr> destination IP address\n");
printf(" -i <string> input video device format [%s]\n", impform);
- #ifdef CONFIG_STREAMER_WITH_FRSH
- printf(" -b <number> network budget\n");
- printf(" -p <number> network period for given budget\n");
- #endif /*CONFIG_STREAMER_WITH_FRSH*/
+ printf(" -p <port> destination port [%d]\n", dport);
+ printf(" -b <bitrate> bitrate in b/s [%d]\n", bitrate);
+ printf(" -s <sdp_file> name of output sdp file [%s]\n", sdp_file);
#ifdef CONFIG_OC_ULUT
printf(" -l <number>|<domain>=<number>,...\n");
#endif /*CONFIG_OC_ULUT*/
{
int v;
- while ((v = getopt(argc, argv, "w:h:r:d:m:i:l:b:p:")) >= 0) {
+ while ((v = getopt(argc, argv, "w:h:r:d:m:i:l:b:p:s:")) >= 0) {
switch (v) {
+ case 's':
+ sdp_file = optarg;
+ break;
+ case 'p':
+ dport = atoi(optarg);
+ break;
case 'w':
width = atoi(optarg);
break;
case 'r':
fps = atoi(optarg);
break;
+ case 'b':
+ bitrate = atoi(optarg);
+ break;
case 'd':
vdev = optarg;
break;
else if(!strcmp(impform, "v4l2"))
impform = "video4linux2";
break;
- #ifdef CONFIG_STREAMER_WITH_FRSH
- case 'b':
- udp_budget = atol(optarg);
- break;
- case 'p':
- udp_period = atol(optarg);
- break;
- #endif /*CONFIG_STREAMER_WITH_FRSH*/
-
#ifdef CONFIG_OC_ULUT
case 'l':
ul_log_domain_arg2levels(optarg);
static unsigned max_size = 0, min_size = -1;
static double avg_size = 0;
clock_gettime(CLOCK_MONOTONIC, &start);
+ start.tv_sec--; /* Avoid division by zero */
done = 0;
while (!(done = streamer_run_done_rq)) {
AVPacket *pkt;
pkt = read_input_packet(s);
+
+ clock_gettime(CLOCK_MONOTONIC, &end);
+ timespec_subtract(&d, &end, &start);
+ start = end;
+ int fps_now = (1000<<16)/(d.tv_sec*1000+d.tv_nsec/1000000);
+ fps_avg += (fps_now - fps_avg) >> 4;
+
if (pkt == NULL) {
done = 1;
} else {
//rt_job_start(pkt->pts);
f = pkt_decode(s, pkt);
if (f) {
+ int keyframe;
opkt = pkt_encode(os, f);
+ keyframe = os->streams[0]->codec->coded_frame->key_frame;
if (opkt) {
pkt_send(os, opkt);
- clock_gettime(CLOCK_MONOTONIC, &end);
- timespec_subtract(&d, &end, &start);
- int fps_now = (1000<<8)/(d.tv_sec*1000+d.tv_nsec/1000000);
- start = end;
- fps_avg += (fps_now - fps_avg) >> 3;
-
if (opkt->size > max_size)
max_size = opkt->size;
if (opkt->size < min_size)
min_size = opkt->size;
avg_size = avg_size*frame/(frame+1) + (double)opkt->size/(frame+1);
- printf("%5d: %2d fps opkt size: %5d b max=%5u b min=%5u b avg=%5.0f\n",
- frame,
- fps_avg>>8,
+ printf("%5d%c: %2d (%4.1f) fps opkt size: %5d b max=%5u b min=%5u b avg=%5.0f\n",
+ frame, keyframe ? '*':' ',
+ fps_avg>>16, 1000.0/(d.tv_sec*1000+d.tv_nsec/1000000),
opkt->size, max_size, min_size, avg_size);
if (frame % 100 == 0) max_size=0;
frame++;// = (frame + 1) % fps;
if (ret) PERROR_AND_EXIT(ret, "frsh_init1");
/* fill default network contract params */
- avformat_frsh_budget = 50000;
- avformat_frsh_period = 500;
+ frsh_rtp_budget = 100*bitrate/8/100;
+ frsh_rtp_period_ms = 1000;
+ frsh_rtp_deadline_ms = 1000/fps;
#endif /*CONFIG_FFMPEG_WITH_FRSH*/
avcodec_register_all();
return -1;
}
codec_open(s);
- os = open_output_stream(dst, dport, CODEC_TYPE_VIDEO);
+ os = open_output_stream(dst, dport, CODEC_TYPE_VIDEO, fps);
if (os == NULL) {
fprintf(stderr, "Cannot open output stream\n");
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 = 1000000;
+ os->streams[0]->codec->bit_rate = bitrate;
codec_connect(s->streams[0]->codec, os->streams[0]->codec);
out_codec_open(os);
dump_format(os, 0, os->filename, 1);
sdp_print(os, sdp_file);
-#if CONFIG_STREAMER_WITH_FRSH && CONFIG_AQUOSA
+#if CONFIG_FFMPEG_WITH_FRSH
frsh_thread_attr_t frsh_attr;
frsh_thread_id_t thread;
frsh_vres_id_t cpu_vres;
frsh_contract_t cpu_contract;
frsh_rel_time_t cpu_budget, cpu_period;
- cpu_budget = fosa_msec_to_rel_time(50);
- cpu_period = fosa_msec_to_rel_time(100);
+ cpu_budget = fosa_msec_to_rel_time(5);
+ cpu_period = fosa_msec_to_rel_time(1000/fps);
/* Contract negotiation for CPU */
ret = frsh_contract_init(&cpu_contract);
if (ret) PERROR_AND_EXIT(ret, "CPU:frsh_contract_init");
FRSH_CT_REGULAR);
if (ret) PERROR_AND_EXIT(ret, "frsh_contract_set_basic_params");
ret = frsh_contract_set_resource_and_label(&cpu_contract,
- FRSH_RT_PROCESSOR, FRSH_CPU_ID_DEFAULT, "aqcpu_cont");
+ FRSH_RT_PROCESSOR, FRSH_CPU_ID_DEFAULT, "camera_ctrl");
if (ret) PERROR_AND_EXIT(ret, "frsh_contract_set_resource_and_label");
ret = frsh_contract_negotiate(&cpu_contract, &cpu_vres);
projects / frescor / streamer.git / blobdiff