Merge commit 'f9b214042e9a867ba3d234014a3616b78ed775c8'

* commit 'f9b214042e9a867ba3d234014a3616b78ed775c8':
  ignore xcode file
  fix gcc warnings
  add docker file
  bump version
  works with python3

Author: barbibulle

.gitignore

@@ -30,7 +30,8 @@ Build/Targets/universal-apple-macosx/build
 Build/Targets/universal-apple-macosx/Bento4.xcodeproj/xcuserdata
 Build/Targets/universal-apple-Build/Targets/arm-android-linux
 Build/Targets/universal-apple-macosx/cov-int
-macosx/Bento4.xcodeproj/project.xcworkspace/xcuserdata
+Build/Targets/universal-apple-macosx/Bento4.xcodeproj/xcshareddata
+Build/Targets/universal-apple-macosx/Bento4.xcodeproj/project.xcworkspace/xcuserdata
 .svn
 .sconsign.dblite
 Bento4.xccheckout
@@ -49,3 +50,6 @@ third_party
 IDEWorkspaceChecks.plist
 .scannerwork
 Test/Output
+.coverage
+coverage_html
+Test/Output

Build/Docker/Dockerfile

@@ -0,0 +1,36 @@
+FROM alpine:latest
+
+# Setup environment variables
+ENV BENTO4_VERSION 1.5.1-629
+
+# Install Dependencies
+RUN apk update && apk add --no-cache ca-certificates bash python3 make cmake gcc g++ git
+
+# Copy Sources
+COPY ./ /tmp/bento4
+
+# Build
+RUN rm -rf /tmp/bento4/cmakebuild && mkdir -p /tmp/bento4/cmakebuild && cd /tmp/bento4/cmakebuild && cmake -DCMAKE_BUILD_TYPE=Release .. && make
+
+# Install
+RUN cd /tmp/bento4 && python3 Scripts/SdkPackager.py x86_64-unknown-linux . cmake && mkdir /opt/bento4 && mv /tmp/bento4/SDK/Bento4-SDK-*.x86_64-unknown-linux/* /opt/bento4
+
+# === Second Stage ===
+FROM alpine:latest
+ARG BENTO4_VERSION
+LABEL "com.example.vendor"="Axiomatic Systems, LLC."
+LABEL version=$BENTO4_VERSION
+LABEL maintainer="[email protected]"
+
+# Setup environment variables
+ENV PATH=/opt/bento4/bin:${PATH}
+
+# Install Dependencies
+RUN apk --no-cache add ca-certificates bash python3 libstdc++
+
+# Copy Binaries
+COPY --from=0 /opt/bento4 /opt/bento4
+
+WORKDIR /opt/bento4
+
+CMD ["bash"]

Build/Targets/universal-apple-macosx/Bento4.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>

CMakeLists.txt

@@ -12,7 +12,7 @@ set(SOURCE_METADATA ${SOURCE_ROOT}/MetaData)
 set(SOURCE_SYSTEM ${SOURCE_ROOT}/System)
 
 # Compiler warning and optimization flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-class-memaccess")
 
 if (EMSCRIPTEN)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-warn-absolute-paths")

Documents/Doxygen/Doxyfile

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python3
 
 import sys
 import os
@@ -12,22 +12,22 @@ def GetSdkRevision():
     cmd = 'git status --porcelain -b'
     lines = os.popen(cmd).readlines()
     if not lines[0].startswith('## master'):
-        print 'ERROR: not on master branch'
+        print('ERROR: not on master branch')
         return None
     if len(lines) > 1:
-        print 'ERROR: git status not empty'
-        print ''.join(lines)
+        print('ERROR: git status not empty')
+        print(''.join(lines))
         return None
 
     cmd = 'git tag --contains HEAD'
     tags = os.popen(cmd).readlines()
     if len(tags) != 1:
-        print 'ERROR: expected exactly one tag for HEAD, found', len(tags), ':', tags
+        print('ERROR: expected exactly one tag for HEAD, found', len(tags), ':', tags)
         return None
     version = tags[0].strip()
     sep = version.find('-')
     if sep < 0:
-        print 'ERROR: unrecognized version string format:', version
+        print('ERROR: unrecognized version string format:', version)
     return version[sep+1:]
 
 #############################################################
@@ -53,14 +53,14 @@ def GetVersion():
 SDK_REVISION = GetSdkRevision()
 if SDK_REVISION is None:
     sys.exit(1)
-print "Exporting Revision", SDK_REVISION
+print("Exporting Revision", SDK_REVISION)
 
 # compute paths
 SDK_NAME='Bento4-SRC-'+BENTO4_VERSION+'-'+SDK_REVISION
 SDK_OUTPUT_ROOT=BENTO4_HOME+'/SDK'
 SDK_ROOT=SDK_OUTPUT_ROOT+'/'+SDK_NAME
 
-print SDK_NAME
+print(SDK_NAME)
 
 # remove any previous SDK directory
 if os.path.exists(SDK_ROOT):
@@ -72,6 +72,6 @@ def GetVersion():
 
 ### export
 cmd = 'git archive --format=zip HEAD -o '+SDK_ROOT+'.zip'
-print cmd
+print(cmd)
 #cmd = 'svn export -r'+SDK_REVISION+' https://zebulon.bok.net/svn/Bento4/trunk '+SDK_NAME
 os.system(cmd)

Scripts/ExportSourceTree.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python3
 
 ########################################################################
 #
@@ -39,22 +39,22 @@ def GetSdkRevision():
     lines = os.popen(cmd).readlines()
     branch = ''
     if not lines[0].startswith('## master'):
-        print 'WARNING: not on master branch'
+        print('WARNING: not on master branch')
         branch = '+' + lines[0][3:].strip()
     if len(lines) > 1:
-        print 'ERROR: git status not empty'
-        print ''.join(lines)
+        print('ERROR: git status not empty')
+        print(''.join(lines))
         return None
 
     cmd = 'git tag --contains HEAD'
     tags = os.popen(cmd).readlines()
     if len(tags) != 1:
-        print 'ERROR: expected exactly one tag for HEAD, found', len(tags), ':', tags
+        print('ERROR: expected exactly one tag for HEAD, found', len(tags), ':', tags)
         return None
     version = tags[0].strip()
     sep = version.find('-')
     if sep < 0:
-        print 'ERROR: unrecognized version string format:', version
+        print('ERROR: unrecognized version string format:', version)
     return version[sep+1:] + branch
 
 #############################################################
@@ -70,11 +70,11 @@ def CopyFiles(file_patterns, configs=[''], rename_map={}):
                 if not os.path.exists(dest_dir):
                     os.makedirs(dest_dir)
                 filename = os.path.basename(file)
-                if rename_map.has_key(filename):
+                if filename in rename_map:
                     dest_name = dest_dir+'/'+rename_map[filename]
                 else:
                     dest_name = dest_dir
-                print 'COPY: '+file+' -> '+dest_name
+                print('COPY: '+file+' -> '+dest_name)
                 shutil.copy2(file, dest_name)
 
 #############################################################
@@ -95,7 +95,7 @@ def ZipDir(top, archive, dir) :
 def ZipIt(basename, dir) :
     path = basename+'/'+dir
     zip_filename = path+'.zip'
-    print 'ZIP: '+path+' -> '+zip_filename
+    print('ZIP: '+path+' -> '+zip_filename)
 
     if os.path.exists(zip_filename):
         os.remove(zip_filename)
@@ -117,17 +117,25 @@ def ZipIt(basename, dir) :
     SDK_TARGET = None
 
 if len(sys.argv) > 2:
-    BENTO4_HOME = sys.argv[1]
+    BENTO4_HOME = sys.argv[2]
 else:
     script_dir  = os.path.abspath(os.path.dirname(__file__))
     BENTO4_HOME = os.path.join(script_dir,'..')
 
+CMAKE_BUILD = False
+if len(sys.argv) > 3:
+    if sys.argv[3] == 'cmake':
+        CMAKE_BUILD = True
+    else:
+        print('ERROR: unknown build type')
+        sys.exit(1)
+
 # ensure that BENTO4_HOME has been set and exists
 if not os.path.exists(BENTO4_HOME) :
-    print 'ERROR: BENTO4_HOME ('+BENTO4_HOME+') does not exist'
+    print('ERROR: BENTO4_HOME ('+BENTO4_HOME+') does not exist')
     sys.exit(1)
 else :
-    print 'BENTO4_HOME = ' + BENTO4_HOME
+    print('BENTO4_HOME = ' + BENTO4_HOME)
 
 # compute the target if it is not specified
 if SDK_TARGET is None:
@@ -154,13 +162,13 @@ def ZipIt(basename, dir) :
         'darwin'      : 'universal-apple-macosx'
     }
 
-    if platform_to_target_map.has_key(platform_id):
+    if platform_id in platform_to_target_map:
         SDK_TARGET = platform_to_target_map[platform_id]
     else:
-        print 'ERROR: SDK_TARGET is not set and cannot be detected'
+        print('ERROR: SDK_TARGET is not set and cannot be detected')
         sys.exit(1)
 
-print "TARGET = " + SDK_TARGET
+print("TARGET = " + SDK_TARGET)
 
 BENTO4_VERSION = GetVersion()
 
@@ -174,11 +182,16 @@ def ZipIt(basename, dir) :
 SDK_TARGET_DIR='Build/Targets/'+SDK_TARGET
 SDK_TARGET_ROOT=BENTO4_HOME+'/'+SDK_TARGET_DIR
 
-# special case for Xcode builds
-if SDK_TARGET == 'universal-apple-macosx':
-    SDK_TARGET_DIR='Build/Targets/universal-apple-macosx/build'
+if CMAKE_BUILD:
+    SDK_BUILD_OUTPUT_DIR = 'cmakebuild'
+else:
+    # special case for Xcode builds
+    if SDK_TARGET == 'universal-apple-macosx':
+        SDK_BUILD_OUTPUT_DIR='Build/Targets/universal-apple-macosx/Build/Products/Release'
+    else:
+        SDK_BUILD_OUTPUT_DIR = SDK_TARGET_DIR + '/Release'
 
-print SDK_NAME
+print(SDK_NAME)
 
 # remove any previous SDK directory
 if os.path.exists(SDK_ROOT):
@@ -213,7 +226,7 @@ def ZipIt(basename, dir) :
     script_bin_dir = None
 
 # binaries
-bin_in = SDK_TARGET_DIR+'/Release'
+bin_in = SDK_BUILD_OUTPUT_DIR
 bin_files = [
     (bin_in,'mp4*.exe','bin'),
     (bin_in,'aac2mp4.exe','bin'),

Scripts/SdkPackager.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python3
 
 ########################################################################
 #
@@ -18,7 +18,7 @@
 #############################################################
 # parse the command line
 if len(sys.argv) < 2:
-    print 'ERROR: SDK revision # expected as first argument'
+    print('ERROR: SDK revision # expected as first argument')
     sys.exit(1)
 
 SDK_REVISION = sys.argv[1]
@@ -31,14 +31,14 @@
 
 # ensure that BENTO4_HOME has been set and exists
 if not os.path.exists(BENTO4_HOME) :
-    print 'ERROR: BENTO4_HOME ('+BENTO4_HOME+') does not exist'
+    print('ERROR: BENTO4_HOME ('+BENTO4_HOME+') does not exist')
     sys.exit(1)
 else :
-    print 'BENTO4_HOME = ' + BENTO4_HOME
+    print('BENTO4_HOME = ' + BENTO4_HOME)
 
 # patch files
 filename = os.path.join(BENTO4_HOME, "Source", "Python", "utils", "mp4-dash.py")
-print "Patching", filename
+print("Patching", filename)
 file_lines = open(filename).readlines()
 file_out = open(filename, "wb")
 for line in file_lines:
@@ -47,7 +47,7 @@
     file_out.write(line)
 
 filename = os.path.join(BENTO4_HOME, "Source", "Python", "utils", "mp4-hls.py")
-print "Patching", filename
+print("Patching", filename)
 file_lines = open(filename).readlines()
 file_out = open(filename, "wb")
 for line in file_lines:

Scripts/SdkPrepForRelease.py

@@ -561,9 +561,11 @@ ShowSampleDescription_Text(AP4_SampleDescription& description, bool verbose)
                 printf(" (%s)", nalu_type_name);
             }
             printf("\n");
+            const char* sep = "";
             for (unsigned int j=0; j<seq.m_Nalus.ItemCount(); j++) {
-                printf("        ");
+                printf("%s        ", sep);
                 ShowData(seq.m_Nalus[j]);
+                sep = "\n";
             }
             printf("\n      }\n");
         }

Source/C++/Apps/Mp4Info/Mp4Info.cpp

@@ -263,7 +263,7 @@ AP4_TrunAtom::InspectFields(AP4_AtomInspector& inspector)
                 AP4_FormatString(v3, sizeof(v3), "%sc:%u", sep, m_Entries[i].sample_composition_time_offset);
                 s3 = v3;
             }
-            char value[128];
+            char value[256];
             AP4_FormatString(value, sizeof(value), "%s%s%s%s", s0, s1, s2, s3);
             inspector.AddField(header, value);
         }
@@ -300,7 +300,7 @@ AP4_TrunAtom::InspectFields(AP4_AtomInspector& inspector)
                 AP4_FormatString(v3, sizeof(v3), "%ssample_composition_time_offset:%u", sep, m_Entries[i].sample_composition_time_offset);
                 s3 = v3;
             }
-            char value[128];
+            char value[256];
             AP4_FormatString(value, sizeof(value), "%s%s%s%s", s0, s1, s2, s3);
             inspector.AddField(header, value);
         }