Measure FPS just after reading input frame (not after de/encoding)

[frescor/streamer.git] / output.c

diff --git a/output.c b/output.c
index fb3d419f212a198809be13987825cbf5dbf14fe7..59185a96410203d899a802bc2699a9a68a5bf6e3 100644 (file)
--- a/output.c
+++ b/output.c
@@ -1,7 +1,12 @@
-#include "libavformat/avformat.h"
-
-
-AVFormatContext *open_output_stream(const char *dst, int port, enum CodecType codec_type)
+/*
+ *  Copyright (c) 2008 Luca Abeni
+ *
+ *  This is free software; see GPL.txt
+ */
+#include <libavformat/avformat.h>
+#include "output.h"
+
+AVFormatContext *open_output_stream(const char *dst, int port, enum CodecType codec_type, int fps)
 {
     AVFormatContext *s;
     static AVOutputFormat *rtp_format;
@@ -38,12 +43,22 @@ AVFormatContext *open_output_stream(const char *dst, int port, enum CodecType co
     s->streams[0]->codec->pix_fmt  = PIX_FMT_YUV420P;
     s->streams[0]->codec->mb_decision = 2;
     s->streams[0]->codec->me_cmp = 2;
+/*     s->streams[0]->codec->time_base.den = fps; */
+/*     s->streams[0]->codec->time_base.num = 1; */
+/*     st->codec->time_base.den = fps; */
+/*     st->codec->time_base.num = 1; */
     //s->streams[0]->codec->me_sub_cmp = 6;
     s->streams[0]->codec->trellis = 1;
 
     return s;
 }
 
+int close_output_stream(AVFormatContext *s)
+{
+  url_fclose(s->pb);
+  return 0;
+}
+
 int pkt_send(AVFormatContext *ctx, AVPacket *pkt)
 {
   static int inited;           /* FIXME: HACK! */