merge with develop, includes MP4Reader and Utils cleanup.

gopro · Apr 12, 2021 · dff77bd · dff77bd
2 parents ed617eb + 2c14eef
commit dff77bd
Show file tree

Hide file tree

Showing 9 changed files with 658 additions and 490 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,8 @@ project (gpmf-parser)
 set(CMAKE_SUPPRESS_REGENERATION true)
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
 
-file(GLOB LIB_SOURCES "GPMF_parser.c" "demo/GPMF_mp4reader.c")
-file(GLOB SOURCES ${LIB_SOURCES} "demo/GPMF_demo.c" "demo/GPMF_print.c")
+file(GLOB LIB_SOURCES "GPMF_parser.c" "GPMF_utils.c")
+file(GLOB SOURCES ${LIB_SOURCES} "demo/GPMF_demo.c" "demo/GPMF_print.c" "demo/GPMF_mp4reader.c")
 
 add_executable(GPMF_PARSER_BIN ${SOURCES})
 set_target_properties(GPMF_PARSER_BIN PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
@@ -20,5 +20,5 @@ install(TARGETS GPMF_PARSER_BIN DESTINATION "bin")
 install(TARGETS GPMF_PARSER_LIB DESTINATION "lib")
 install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION "lib/pkgconfig")
 
-install(FILES "GPMF_parser.h" "GPMF_common.h" DESTINATION "include/gpmf-parser")
+install(FILES "GPMF_parser.h" "GPMF_common.h" "GPMF_utils.h" DESTINATION "include/gpmf-parser")
 install(FILES "demo/GPMF_mp4reader.h" DESTINATION "include/gpmf-parser/demo")
diff --git a/GPDeps b/GPDeps
@@ -0,0 +1,10 @@
+{
+    "version": "1.0.0",
+
+    "info": {
+        "type": "lib",
+        "visibility": "public",
+        "platforms": ["android", "ios", "linux", "macos", "win"]
+    }
+}
+
diff --git a/GPMF_common.h b/GPMF_common.h
@@ -1,4 +1,4 @@
-/*! @file GPMF_parser.h
+/*! @file GPMF_common.h
  * 
  *  @brief GPMF Parser library include
  * 

diff --git a/GPMF_parser.c b/GPMF_parser.c
@@ -2,7 +2,7 @@
  * 
  *  @brief GPMF Parser library
  *
- *  @version 2.1.0
+ *  @version 2.2.1
  * 
  *  (C) Copyright 2017-2020 GoPro Inc (http://gopro.com/).
  *	
@@ -75,7 +75,7 @@ GPMF_ERR GPMF_Validate(GPMF_stream *ms, GPMF_LEVELS recurse)
 {
 	if (ms)
 	{
-		GPMF_ERROR ret = GPMF_OK;
+		GPMF_ERR ret = GPMF_OK;
 		uint32_t currpos = ms->pos;
 		uint32_t nestsize = ms->nest_size[ms->nest_level];
 		if (nestsize == 0 && ms->nest_level == 0)
@@ -570,7 +570,7 @@ GPMF_ERR GPMF_SeekToSamples(GPMF_stream *ms)
 
 		if (ms->pos + 1 < ms->buffer_size_longs)
 		{
-			GPMF_ERROR ret = GPMF_OK;
+			GPMF_ERR ret = GPMF_OK;
 			uint32_t size, type = GPMF_SAMPLE_TYPE(ms->buffer[ms->pos + 1]);
 
 			memcpy(&prevstate, ms, sizeof(GPMF_stream));