From be71fdbc86ac4ad86c48c083df3552a2ddce91e2 Mon Sep 17 00:00:00 2001
From: cxp2249 <moritz.pirk@tuhh.de>
Date: Wed, 31 Jan 2018 22:58:03 +0100
Subject: render.c with fitting header build:

	+ untestet therefore result open.
	+ ffmpeg-3.4.1.tar.bz2 for source files
	+ https://trac.ffmpeg.org/wiki/CompilationGuide for executing
	configure script. Required vor avconfig
---
 src/creator.c    | 39 +++++++++++++++------------------------
 src/creator.h    | 37 +++++++++++--------------------------
 src/render_cpu.h |  1 +
 3 files changed, 27 insertions(+), 50 deletions(-)

(limited to 'src')

diff --git a/src/creator.c b/src/creator.c
index 5e8ca08..d8bd008 100644
--- a/src/creator.c
+++ b/src/creator.c
@@ -24,32 +24,22 @@ static void encode(AVCodecContext *enc_ctx, AVFrame *frame, AVPacket *pkt,
         av_packet_unref(pkt);
     }
 }
-int generateVideo(filename, int length, int width, int height, int fps, int bitRate, Config *config, u32 (*sfunc) (long double, long double, u32))
+int generateVideo(filename, int width, int height, int fps, int bitRate)
 {
-    const AVCodec *codec;
-    AVCodecContext *c= NULL;
-    int i, ret, x, y;
-    FILE *f;
-    AVFrame *picture;
-    AVPacket *pkt;
-    uint8_t endcode[] = { 0, 0, 1, 0xb7 };
-    if (argc <= 1) {
-        fprintf(stderr, "Usage: %s <output file>\n", argv[0]);
-        exit(0);
-    }
-    filename = argv[1];
     avcodec_register_all();
+
     /* find the mpeg1video encoder */
-    codec = avcodec_find_encoder(AV_CODEC_ID_MPEG1VIDEO);
-    if (!codec) {
-        fprintf(stderr, "codec not found\n");
-        exit(1);
-    }
-    c = avcodec_alloc_context3(codec);
-    picture = av_frame_alloc();
-    pkt = av_packet_alloc();
-    if (!pkt)
-        exit(1);
+	codec = avcodec_find_encoder(AV_CODEC_ID_MPEG1VIDEO);
+	if (!codec) {
+		fprintf(stderr, "codec not found\n");
+		exit(1);
+	}
+	c = avcodec_alloc_context3(codec);
+
+	picture = av_frame_alloc();
+	pkt = av_packet_alloc();
+	if (!pkt)
+		exit(1);
 
     /* put sample parameters */
     c->bit_rate = bitRate;
@@ -120,7 +110,8 @@ void addFrame(int *frame)
 }
 
 void endFile(void){
-    /* flush the encoder */
+	uint8_t endcode[] = { 0, 0, 1, 0xb7 };
+	/* flush the encoder */
     encode(c, NULL, pkt, f);
     /* add sequence end code to have a real MPEG file */
     fwrite(endcode, 1, sizeof(endcode), f);
diff --git a/src/creator.h b/src/creator.h
index 7606d4e..b89b16c 100644
--- a/src/creator.h
+++ b/src/creator.h
@@ -18,36 +18,21 @@
 #include <libavutil/frame.h>
 #include <libavutil/imgutils.h>
 
-typedef struct config {
-	u32 iterations;
-	u8 threads;
-	u32 colorFrom;
-	u32 colorTo;
-	long double to_x;
-	long double to_y;
-	long double speed;
-	u8 video;
-	u8 filetype;
-	u16 width;
-	u16 height;
-	u8 renderFPS;
-	u8 videoFPS;
-	u32 bitrate;
-	const char *path;
-	// TODO: key mapping als option in die struct
-} Config;
-
-Config *_config;
-u32 (*_sfunc) (long double, long double, u32);
-u32 *s_arr;
-long double x_min, x_max, y_min, y_max;
-long double x_min_s, x_max_s, y_min_s, y_max_s;
-int delta;
-long double dt, ft;
+
+AVFrame *picture;
+AVPacket *pkt;
+
+FILE *f;
+
+
+const AVCodec *codec;
+AVCodecContext *c= NULL;
+int i, ret, x, y;
 
 static void encode(AVCodecContext *enc_ctx, AVFrame *frame, AVPacket *pkt, FILE *outfile);
 
 int generateVideo(filename, int width, int height, int fps, int bitRate, Config *config, u32 (*sfunc) (long double, long double, u32));
 
+void addFrame(int *frame);
 
 #endif /* RENDER_H_ */
diff --git a/src/render_cpu.h b/src/render_cpu.h
index 7abbdc4..5d32661 100644
--- a/src/render_cpu.h
+++ b/src/render_cpu.h
@@ -11,6 +11,7 @@
 #include "defs.h"
 #include <stdlib.h>
 #include <GL/glut.h>
+#define HAVE_STRUCT_TIMESPEC
 #include <pthread.h>
 #include <time.h>
 #include <math.h>
-- 
cgit v1.2.1