Merge pull request #33 from podborski/newMedia

New media, entity groups, large mdat, few bug fixes related to non-timed items, cleanups, catch2 update, etc. etc.

No-one from MPEG was able to review and during MPEG#139 we agreed to go ahead and merge it.

close #36 
close #35

Author: podborski

.github/workflows/c-cpp.yml

@@ -4,15 +4,14 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 jobs:
   linux:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: configure
-      run: mkdir build && cd build && cmake ..
+      run: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release ..
     - name: build
       run: cmake --build build
     - name: test
@@ -27,7 +26,7 @@ jobs:
     - name: build
       run: cmake --build build
     - name: test
-      run: ./bin/unit_tests --wait-for-keypress never -d yes
+      run: ./bin/unit_tests --wait-for-keypress never -d yes exclude:large_files
 
   windows:
     runs-on: windows-latest
@@ -38,4 +37,4 @@ jobs:
     - name: build
       run: cmake --build build --config Debug
     - name: test
-      run: ./bin/Debug/unit_tests --wait-for-keypress never -d yes
+      run: ./bin/Debug/unit_tests --wait-for-keypress never -d yes exclude:large_files

.gitignore

@@ -1,3 +1,5 @@
+*.mp4
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/

IsoLib/isoiff_tool/src/HEVCConfigurationAtom.c

@@ -1,24 +1,15 @@
-/*
- This software module was originally developed by Apple Computer, Inc.
- in the course of development of MPEG-4.
- This software module is an implementation of a part of one or
- more MPEG-4 tools as specified by MPEG-4.
- ISO/IEC gives users of MPEG-4 free license to this
- software module or modifications thereof for use in hardware
- or software products claiming conformance to MPEG-4.
- Those intending to use this software module in hardware or software
- products are advised that its use may infringe existing patents.
- The original developer of this software module and his/her company,
- the subsequent editors and their companies, and ISO/IEC have no
- liability for use of this software module or modifications thereof
- in an implementation.
- Copyright is not released for non MPEG-4 conforming
- products. Apple Computer, Inc. retains full right to use the code for its own
- purpose, assign or donate the code to a third party and to
- inhibit third parties from using the code for non
- MPEG-4 conforming products.
- This copyright notice must be included in all copies or
- derivative works. Copyright (c) 1999.
+/* This software module was originally developed by Apple Computer, Inc. in the course of
+ * development of MPEG-4. This software module is an implementation of a part of one or more MPEG-4
+ * tools as specified by MPEG-4. ISO/IEC gives users of MPEG-4 free license to this software module
+ * or modifications thereof for use in hardware or software products claiming conformance to MPEG-4.
+ * Those intending to use this software module in hardware or software products are advised that its
+ * use may infringe existing patents. The original developer of this software module and his/her
+ * company, the subsequent editors and their companies, and ISO/IEC have no liability for use of
+ * this software module or modifications thereof in an implementation. Copyright is not released for
+ * non MPEG-4 conforming products. Apple Computer, Inc. retains full right to use the code for its
+ * own purpose, assign or donate the code to a third party and to inhibit third parties from using
+ * the code for non MPEG-4 conforming products. This copyright notice must be included in all copies
+ * or derivative works. Copyright (c) 1999.
  */
 /*
  $Id: HEVCConfigurationAtom.c,v 1.1.1.1 2016/09/14 armin Exp $
@@ -29,108 +20,117 @@
 #include <stdlib.h>
 #include <string.h>
 
-static void destroy( MP4AtomPtr s )
+static void destroy(MP4AtomPtr s)
 {
-	MP4Err err;
-	ISOIFF_HEVCConfigurationAtomPtr self = (ISOIFF_HEVCConfigurationAtomPtr) s;
-    err = MP4NoErr;
-    
-	if ( self == NULL )
-		BAILWITHERROR( MP4BadParamErr )
-        
-        if ( self->super )
-            self->super->destroy( s );
+  MP4Err err;
+  ISOIFF_HEVCConfigurationAtomPtr self = (ISOIFF_HEVCConfigurationAtomPtr)s;
+  err                                  = MP4NoErr;
+
+  if(self == NULL) BAILWITHERROR(MP4BadParamErr)
+
+  if(self->super) self->super->destroy(s);
 bail:
-	TEST_RETURN( err );
-    
-	return;
+  TEST_RETURN(err);
+
+  return;
 }
 
-static MP4Err serialize( struct MP4Atom* s, char* buffer )
+static MP4Err serialize(struct MP4Atom *s, char *buffer)
 {
-	MP4Err err;
-	u32    configSize;
-	ISOIFF_HEVCConfigurationAtomPtr self = (ISOIFF_HEVCConfigurationAtomPtr) s;
-	err = MP4NoErr;
-	
-	err = MP4SerializeCommonBaseAtomFields( (MP4AtomPtr) s, buffer ); if (err) goto bail;
-	buffer += self->bytesWritten;
-
-	err = MP4GetHandleSize(self->configRecordHandle, &configSize); if (err) goto bail;
-
-	PUTBYTES(*self->configRecordHandle, configSize);
-    
-	assert( self->bytesWritten == self->size );
+  MP4Err err;
+  u32 configSize;
+  ISOIFF_HEVCConfigurationAtomPtr self = (ISOIFF_HEVCConfigurationAtomPtr)s;
+  err                                  = MP4NoErr;
+
+  err = MP4SerializeCommonBaseAtomFields((MP4AtomPtr)s, buffer);
+  if(err) goto bail;
+  buffer += self->bytesWritten;
+
+  err = MP4GetHandleSize(self->configRecordHandle, &configSize);
+  if(err) goto bail;
+
+  PUTBYTES(*self->configRecordHandle, configSize);
+
+  assert(self->bytesWritten == self->size);
 bail:
-	TEST_RETURN( err );
-    
-	return err;
+  TEST_RETURN(err);
+
+  return err;
 }
 
-static MP4Err calculateSize( struct MP4Atom* s )
+static MP4Err calculateSize(struct MP4Atom *s)
 {
-	MP4Err err;
-	u32    configSize;
-	ISOIFF_HEVCConfigurationAtomPtr self = (ISOIFF_HEVCConfigurationAtomPtr) s;
-	err = MP4NoErr;
-	
-	err = MP4CalculateBaseAtomFieldSize( (MP4AtomPtr) s ); if (err) goto bail;
+  MP4Err err;
+  u32 configSize;
+  ISOIFF_HEVCConfigurationAtomPtr self = (ISOIFF_HEVCConfigurationAtomPtr)s;
+  err                                  = MP4NoErr;
 
-	err = MP4GetHandleSize(self->configRecordHandle, &configSize); if (err) goto bail;
-	self->size += configSize;
+  err = MP4CalculateBaseAtomFieldSize((MP4AtomPtr)s);
+  if(err) goto bail;
+
+  err = MP4GetHandleSize(self->configRecordHandle, &configSize);
+  if(err) goto bail;
+  self->size += configSize;
 
 bail:
-	TEST_RETURN( err );
-    
-	return err;
+  TEST_RETURN(err);
+
+  return err;
 }
 
-static MP4Err createFromInputStream( MP4AtomPtr s, MP4AtomPtr proto, MP4InputStreamPtr inputStream )
+static MP4Err createFromInputStream(MP4AtomPtr s, MP4AtomPtr proto, MP4InputStreamPtr inputStream)
 {
-	MP4Err err;
-	long bytesToRead;
-	ISOIFF_HEVCConfigurationAtomPtr self = (ISOIFF_HEVCConfigurationAtomPtr)s;
+  MP4Err err;
+  long bytesToRead;
+  ISOIFF_HEVCConfigurationAtomPtr self = (ISOIFF_HEVCConfigurationAtomPtr)s;
 
-	err = MP4NoErr;
-	if (self == NULL)	BAILWITHERROR(MP4BadParamErr)
-		err = self->super->createFromInputStream(s, proto, (char*)inputStream); if (err) goto bail;
+  err = MP4NoErr;
+  if(self == NULL) BAILWITHERROR(MP4BadParamErr)
+  err = self->super->createFromInputStream(s, proto, (char *)inputStream);
+  if(err) goto bail;
 
-	bytesToRead = s->size - s->bytesRead;
-	err = MP4NewHandle(bytesToRead, &self->configRecordHandle); if (err) goto bail;
-	GETBYTES_V(bytesToRead, *self->configRecordHandle);
+  bytesToRead = s->size - s->bytesRead;
+  err         = MP4NewHandle(bytesToRead, &self->configRecordHandle);
+  if(err) goto bail;
+  GETBYTES_V(bytesToRead, *self->configRecordHandle);
 
-	err = ISOIFF_CreateHEVCDecConfRecFromHandle(self->configRecordHandle, &self->configRecord); if (err) goto bail;
+  err = ISOIFF_CreateHEVCDecConfRecFromHandle(self->configRecordHandle, &self->configRecord);
+  if(err) goto bail;
 
 bail:
-	TEST_RETURN(err);
+  TEST_RETURN(err);
 
-	return err;
+  return err;
 }
 
-MP4Err ISOIFF_CreateHEVCConfigurationAtom( ISOIFF_HEVCConfigurationAtomPtr *outAtom, ISOIFF_HEVCDecoderConfigRecord configRecord)
+MP4Err ISOIFF_CreateHEVCConfigurationAtom(ISOIFF_HEVCConfigurationAtomPtr *outAtom,
+                                          ISOIFF_HEVCDecoderConfigRecord configRecord)
 {
-	MP4Err err;
-	ISOIFF_HEVCConfigurationAtomPtr self;
-	
-	self = (ISOIFF_HEVCConfigurationAtomPtr) calloc( 1, sizeof(ISOIFF_HEVCConfigurationAtom) );
-	TESTMALLOC( self );
-    
-	err = MP4CreateBaseAtom( (MP4AtomPtr) self ); if ( err ) goto bail;
-
-	self->type                  = ISOIFF_4CC_hvcC;
-	self->name                  = "HEVC Configuration";
-	self->createFromInputStream = (cisfunc) createFromInputStream;
-	self->destroy               = destroy;
-	self->calculateSize         = calculateSize;
-	self->serialize             = serialize;
-	self->configRecord			= configRecord;
-
-	err = MP4NewHandle(0, &self->configRecordHandle); if (err) goto bail;
-	err = ISOIFF_PutHEVCDecConfRecordIntoHandle(configRecord, self->configRecordHandle); if (err) goto bail;
-
-	*outAtom = self;
+  MP4Err err;
+  ISOIFF_HEVCConfigurationAtomPtr self;
+
+  self = (ISOIFF_HEVCConfigurationAtomPtr)calloc(1, sizeof(ISOIFF_HEVCConfigurationAtom));
+  TESTMALLOC(self);
+
+  err = MP4CreateBaseAtom((MP4AtomPtr)self);
+  if(err) goto bail;
+
+  self->type                  = ISOIFF_4CC_hvcC;
+  self->name                  = "HEVC Configuration";
+  self->createFromInputStream = (cisfunc)createFromInputStream;
+  self->destroy               = destroy;
+  self->calculateSize         = calculateSize;
+  self->serialize             = serialize;
+  self->configRecord          = configRecord;
+
+  err = MP4NewHandle(0, &self->configRecordHandle);
+  if(err) goto bail;
+  err = ISOIFF_PutHEVCDecConfRecordIntoHandle(configRecord, self->configRecordHandle);
+  if(err) goto bail;
+
+  *outAtom = self;
 bail:
-	TEST_RETURN( err );
-    
-	return err;
+  TEST_RETURN(err);
+
+  return err;
 }