X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/616f2547428a38aee9e0c8a59d71a0583e86e9aa..b95ab30429f14f984777d919f4dfdcdcfea62cbe:/contrib/performance/0001-Instrument-code-with-fps-meter.patch

diff --git a/contrib/performance/0001-Instrument-code-with-fps-meter.patch b/contrib/performance/0001-Instrument-code-with-fps-meter.patch
index 5c133ee..1a74b76 100644
--- a/contrib/performance/0001-Instrument-code-with-fps-meter.patch
+++ b/contrib/performance/0001-Instrument-code-with-fps-meter.patch
@@ -1,6 +1,6 @@
-From dc6b216ffea1e80fd3f43d6144eb679a193f5666 Mon Sep 17 00:00:00 2001
-From: Antonio Ospite <ospite@studenti.unina.it>
-Date: Sun, 28 Jul 2013 01:06:41 +0200
+From bf1163a19667377a1861b38fa64a8cf7ee2d0e40 Mon Sep 17 00:00:00 2001
+From: Antonio Ospite <ao2@ao2.it>
+Date: Tue, 17 Nov 2015 16:28:03 +0100
 Subject: [PATCH] Instrument code with fps-meter
 X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
  ;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
@@ -9,50 +9,39 @@ X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
 Instrument code with fps-meter:
 http://git.ao2.it/experiments/fps-meter.git/
 ---
- examples/CMakeLists.txt | 2 +-
- examples/am7xxx-play.c  | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ examples/am7xxx-play.c | 5 +++++
+ 1 file changed, 5 insertions(+)
 
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index c77a812..23af8a9 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -1,5 +1,5 @@
- include(CheckSymbolExists)
--add_definitions("-D_POSIX_C_SOURCE=2") # for getopt()
-+add_definitions("-D_POSIX_C_SOURCE=200112L") # for getopt()
- add_definitions("-D_POSIX_SOURCE") # for sigaction
- add_definitions("-D_BSD_SOURCE") # for strdup
- 
 diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
-index 3230e67..17228bf 100644
+index 81aff84..4828a9d 100644
 --- a/examples/am7xxx-play.c
 +++ b/examples/am7xxx-play.c
-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@
  #include <libswscale/swscale.h>
  
  #include <am7xxx.h>
 +#include "fps-meter.h"
  
- /* On some systems ENOTSUP is not defined, fallback to its value on
-  * linux which is equal to EOPNOTSUPP which is 95
-@@ -292,6 +293,7 @@ static int am7xxx_play(const char *input_format_string,
- 	int got_picture;
+ static unsigned int run = 1;
+ 
+@@ -342,6 +343,7 @@ static int am7xxx_play(const char *input_format_string,
+ 	int got_frame;
  	int got_packet;
  	int ret;
 +	struct fps_meter_stats stats;
  
  	ret = video_input_init(&input_ctx, input_format_string, input_path, input_options);
  	if (ret < 0) {
-@@ -354,6 +356,7 @@ static int am7xxx_play(const char *input_format_string,
+@@ -410,6 +412,8 @@ static int am7xxx_play(const char *input_format_string,
  		goto cleanup_out_buf;
  	}
  
 +	fps_meter_init(&stats);
++
+ 	got_packet = 0;
  	while (run) {
  		/* read packet */
- 		ret = av_read_frame(input_ctx.format_ctx, &in_packet);
-@@ -438,6 +441,7 @@ static int am7xxx_play(const char *input_format_string,
+@@ -503,6 +507,7 @@ static int am7xxx_play(const char *input_format_string,
  				run = 0;
  				goto end_while;
  			}
@@ -61,5 +50,5 @@ index 3230e67..17228bf 100644
  end_while:
  		if (!output_ctx.raw_output && got_packet)
 -- 
-1.8.3.2
+2.16.2