Stop clobbering CFLAGS

FN_DEBUG: lost packets per frame (lppf)

Signed-off-by: Benn Snyder <[email protected]>

Author: piedar

CMakeLists.txt

@@ -100,15 +100,18 @@ SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 SET(DOC_OUTPUT_PATH ${CMAKE_BINARY_DIR}/doc)
 
-# let CFLAGS env override this
-if(CMAKE_C_FLAGS STREQUAL "")
-  set(CMAKE_C_FLAGS "-O2")
-endif()
-SET(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG=1")
-SET(CMAKE_C_FLAGS_RELEASE "-O2")
-SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
-
-add_definitions(-Wall)
+if    (MSVC)
+  set(C_FLAGS_WARNING "-W4")
+else  ()
+  set(C_FLAGS_WARNING "-Wall")
+endif (MSVC)
+
+# These defaults can be overriden by environment CFLAGS
+set(CMAKE_C_FLAGS "-O2 ${C_FLAGS_WARNING} ${CMAKE_C_FLAGS}")
+# Configurations
+SET(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS} -g -DDEBUG=1")
+SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS}")
+SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g")
 
 # Pretty much everyone is going to need the main includes
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)

examples/CMakeLists.txt

@@ -2,8 +2,6 @@
 # Packages needed for examples
 ######################################################################################
 
-set(CMAKE_C_FLAGS "-Wall")
-
 if (WIN32)
   set_source_files_properties(glview.c PROPERTIES LANGUAGE CXX)
   set_source_files_properties(regview.c PROPERTIES LANGUAGE CXX)

src/CMakeLists.txt

@@ -4,8 +4,6 @@
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 
-set(CMAKE_C_FLAGS "-Wall")
-
 include_directories(${LIBUSB_1_INCLUDE_DIRS})
 LIST(APPEND SRC core.c tilt.c cameras.c flags.c usb_libusb10.c registration.c keep_alive.c)
 IF(WIN32)

src/cameras.c

@@ -129,7 +129,12 @@ static int stream_process(freenect_context *ctx, packet_stream *strm, uint8_t *p
 	// handle lost packets
 	if (strm->seq != hdr->seq) {
 		uint8_t lost = hdr->seq - strm->seq;
+		strm->lost_pkts += lost;
 		FN_LOG(l_info, "[Stream %02x] Lost %d packets\n", strm->flag, lost);
+
+		FN_DEBUG("[Stream %02x] Lost %d total packets in %d frames (%f lppf)\n",
+			strm->flag, strm->lost_pkts, strm->valid_frames, (float)strm->lost_pkts / strm->valid_frames);
+
 		if (lost > 5 || strm->variable_length) {
 			FN_LOG(l_notice, "[Stream %02x] Lost too many packets, resyncing...\n", strm->flag);
 			strm->synced = 0;
@@ -219,6 +224,7 @@ static int stream_process(freenect_context *ctx, packet_stream *strm, uint8_t *p
 		strm->timestamp = strm->last_timestamp;
 		strm->valid_frames++;
 	}
+
 	return got_frame_size;
 }
 

src/freenect_internal.h

@@ -159,6 +159,7 @@ typedef struct {
 	int frame_size;
 	int last_pkt_size;
 	int valid_pkts;
+	uint lost_pkts;
 	int valid_frames;
 	int variable_length;
 	uint32_t last_timestamp;

wrappers/cpp/CMakeLists.txt

@@ -3,8 +3,6 @@ INSTALL(FILES libfreenect.hpp
 
 IF(BUILD_EXAMPLES)
 
-set(CMAKE_C_FLAGS "-Wall")
-
 if (WIN32)
   set(THREADS_USE_PTHREADS_WIN32 true)
   find_package(Threads REQUIRED)