firmware/lm32/encoder: fix fps limitation and add encoder fps command

enjoy-digital · enjoy-digital · commit bdde570ee10b · 2016-01-24T10:22:52.000+01:00
diff --git a/firmware/lm32/ci.c b/firmware/lm32/ci.c
@@ -71,6 +71,7 @@ static void help_encoder(void)
 	puts("encoder on                     - enable encoder");
 	puts("encoder off                    - disable encoder");
 	puts("encoder quality <quality>      - select quality");
+	puts("encoder fps <fps>              - configure target fps");
 }
 #endif
 
@@ -375,6 +376,11 @@ static void encoder_configure_quality(int quality)
 	encoder_set_quality(quality);
 }
 
+static void encoder_configure_fps(int fps)
+{
+	printf("Setting encoder fps to %d\r\n", fps);
+	encoder_set_fps(fps);
+}
 
 static void encoder_off(void)
 {
@@ -593,6 +599,8 @@ void ci_service(void)
 			encoder_off();
 		else if(strcmp(token, "quality") == 0)
 			encoder_configure_quality(atoi(get_token(&str)));
+		else if(strcmp(token, "fps") == 0)
+			encoder_configure_fps(atoi(get_token(&str)));
 		else
 			help_encoder();
 	}
diff --git a/firmware/lm32/encoder.c b/firmware/lm32/encoder.c
@@ -160,21 +160,35 @@ int encoder_set_quality(int quality) {
 	return 1;
 }
 
+int encoder_set_fps(int fps) {
+	if(encoder_target_fps > 0 && encoder_target_fps <= 60) {
+		encoder_target_fps = fps;
+		return 0;
+	}
+	else {
+		encoder_target_fps = 30;
+		return 1;
+	}
+}
+
 void encoder_service(void) {
 
 	static int last_event;
 	static int last_fps_event;
 	static int frame_cnt;
+	static int can_start;
 
 	if(encoder_enabled) {
-		if(elapsed(&last_event, identifier_frequency_read()/30)) {
-			if (encoder_done() == 1) {
+		if(elapsed(&last_event, identifier_frequency_read()/encoder_target_fps)) {
+			can_start = 1;
+		}
+		if(can_start & encoder_done()) {
 				encoder_init(encoder_quality);
 				encoder_start(processor_h_active, processor_v_active);
 				encoder_reader_dma_length_write(processor_h_active*processor_v_active*2);
 				encoder_reader_dma_shoot_write(1);
 				frame_cnt++;
-			}
+		}
 		}
 		if(elapsed(&last_fps_event, identifier_frequency_read())) {
 			encoder_fps = frame_cnt;
diff --git a/firmware/lm32/encoder.h b/firmware/lm32/encoder.h
@@ -23,6 +23,7 @@ const char chroma_rom_75[64];
 const char chroma_rom_50[64];
 
 char encoder_enabled;
+int encoder_target_fps;
 int encoder_fps;
 int encoder_quality;
 
@@ -33,6 +34,7 @@ void encoder_start(short resx, short resy);
 int encoder_done(void);
 void encoder_enable(char enable);
 int encoder_set_quality(int quality);
+int encoder_set_fps(int fps);
 void encoder_service(void);
 
 #endif
diff --git a/firmware/lm32/processor.c b/firmware/lm32/processor.c
@@ -371,6 +371,7 @@ void processor_init(void)
 	processor_encoder_source = VIDEO_IN_HDMI_IN0;
 #ifdef ENCODER_BASE
 		encoder_enable(0);
+		encoder_target_fps = 30;
 #endif
 }
 

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ static void help_encoder(void)`
`71`	`71`	`puts("encoder on - enable encoder");`
`72`	`72`	`puts("encoder off - disable encoder");`
`73`	`73`	`puts("encoder quality <quality> - select quality");`
	`74`	`+ puts("encoder fps <fps> - configure target fps");`
`74`	`75`	`}`
`75`	`76`	`#endif`
`76`	`77`
`@@ -375,6 +376,11 @@ static void encoder_configure_quality(int quality)`
`375`	`376`	`encoder_set_quality(quality);`
`376`	`377`	`}`
`377`	`378`
	`379`	`+static void encoder_configure_fps(int fps)`
	`380`	`+{`
	`381`	`+ printf("Setting encoder fps to %d\r\n", fps);`
	`382`	`+ encoder_set_fps(fps);`
	`383`	`+}`
`378`	`384`
`379`	`385`	`static void encoder_off(void)`
`380`	`386`	`{`
`@@ -593,6 +599,8 @@ void ci_service(void)`
`593`	`599`	`encoder_off();`
`594`	`600`	`else if(strcmp(token, "quality") == 0)`
`595`	`601`	`encoder_configure_quality(atoi(get_token(&str)));`
	`602`	`+ else if(strcmp(token, "fps") == 0)`
	`603`	`+ encoder_configure_fps(atoi(get_token(&str)));`
`596`	`604`	`else`
`597`	`605`	`help_encoder();`
`598`	`606`	`}`
Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,7 @@ void processor_init(void)`
`371`	`371`	`processor_encoder_source = VIDEO_IN_HDMI_IN0;`
`372`	`372`	`#ifdef ENCODER_BASE`
`373`	`373`	`encoder_enable(0);`
	`374`	`+ encoder_target_fps = 30;`
`374`	`375`	`#endif`
`375`	`376`	`}`
`376`	`377`