Add T.35 metadata tool and SMPTE ST 2094-50 support

.github/workflows/c-cpp.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: configure
-      run: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release ..
+      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
     - name: build
       run: cmake --build build
     - name: test
@@ -22,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: configure
-      run: mkdir build && cd build && cmake ..
+      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
     - name: build
       run: cmake --build build
     - name: test
@@ -33,7 +33,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: configure
-      run: mkdir build && cd build && cmake ..
+      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
     - name: build
       run: cmake --build build --config Debug
     - name: test

.github/workflows/clang-format.yml

@@ -6,9 +6,21 @@ jobs:
     name: Formatting Check
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Run clang-format style check for C/C++ programs.
-      uses: jidicula/clang-format-action@v4.11.0
-      with:
-        clang-format-version: '15'
-        check-path: 'IsoLib/libisomediafile'
+    - uses: actions/checkout@v4
+
+    - name: Install clang-format
+      run: |
+        wget https://apt.llvm.org/llvm.sh
+        chmod +x llvm.sh
+        sudo ./llvm.sh 18
+        sudo apt-get install -y clang-format-18
+
+    - name: Run clang-format check on IsoLib/libisomediafile
+      run: |
+        find IsoLib/libisomediafile \( -name "*.h" -o -name "*.cpp" -o -name "*.c" \) | \
+          xargs clang-format-18 --dry-run --Werror -style=file
+
+    - name: Run clang-format check on IsoLib/t35_tool
+      run: |
+        find IsoLib/t35_tool \( -name "*.h" -o -name "*.cpp" -o -name "*.c" \) | \
+          xargs clang-format-18 --dry-run --Werror -style=file

.gitignore

@@ -82,3 +82,7 @@ doc/
 *.code-workspace
 # Local History for Visual Studio Code
 .history/
+
+# T35 Tool Test Output
+TestData/t35_tool/output_all_modes/
+TestData/t35_tool/output_smpte/

CMakeLists.txt

@@ -50,5 +50,6 @@ if(NOT ISOBMFF_BUILD_LIB_ONLY)
   add_subdirectory(IsoLib/isoiff_tool)
   add_subdirectory(IsoLib/pcm_audio_example)
   add_subdirectory(IsoLib/vvc_base)
+  add_subdirectory(IsoLib/t35_tool)
   add_subdirectory(test)
 endif()

IsoLib/favs_example/src/hevc.c

@@ -756,7 +756,7 @@ u8* stripNALEmulation(u8* buffer, u32* bufferLen) {
 	return outBuffer;
 }
 
-int parseHEVCNal(FILE* input, u8** data, int* data_len) {
+u32 parseHEVCNal(FILE* input, u8** data, u32* data_len) {
 	size_t startPos;
 	size_t NALStart = 0;
 	size_t NALEnd = 0;

IsoLib/favs_example/src/hevc.h

@@ -13,7 +13,7 @@ MP4Err hevc_parse_pps_minimal(BitBuffer *bb, struct hevc_pps* pps);
 MP4Err hevc_parse_slice_header_minimal(BitBuffer *bb, struct hevc_poc* poc, struct hevc_slice_header* header,
 struct hevc_sps* sps, struct hevc_pps* pps);
 u8* stripNALEmulation(u8* buffer, u32* bufferLen);
-int parseHEVCNal(FILE* input, u8** data, int* data_len);
+u32 parseHEVCNal(FILE* input, u8** data, u32* data_len);
 ISOErr analyze_hevc_stream(FILE* input, struct hevc_stream* stream);
 
 #endif

IsoLib/ipmp_example/src/protectAudioMovie.c

@@ -70,7 +70,7 @@ MP4Err addIPMPToolDescriptorUpdateToODAccessUnit( MP4Handle odAccessUnitH,
 /
 / main function
 /
-/*=====*/
+/ =====*/
 
 int main( int argc, char **argv )
 {
@@ -100,7 +100,7 @@ int main( int argc, char **argv )
 / protectMyAudioMovie
 / Protect the audio media track using an IPMP Tool specified by its IPMP_ToolID
 /
-/*=====*/
+/ =====*/
 
 MP4Err protectMyAudioMovie( char *inFilename, char *outFilename, u64 ipmpToolID )
 {
@@ -355,7 +355,7 @@ MP4Err protectMyAudioMovie( char *inFilename, char *outFilename, u64 ipmpToolID
 / associateSampleDescWithIPMPToolPtr
 / Create the IPMP_ToolDecriptorPointer and add it to the media Sample Description
 /
-/*=====*/
+/ =====*/
 
 MP4Err associateSampleDescWithIPMPToolPtr( MP4Handle outMediaSampleDescrH, 
 										   u16 theIPMP_ToolDescriptorID) {
@@ -384,7 +384,7 @@ MP4Err associateSampleDescWithIPMPToolPtr( MP4Handle outMediaSampleDescrH,
 / addIPMPToolDescriptorUpdateToODAccessUnit
 / Create the IPMP_ToolDecriptorUpdate command and add it to an OD access unit
 /
-/*=====*/
+/ =====*/
 
 MP4Err addIPMPToolDescriptorUpdateToODAccessUnit( MP4Handle odAccessUnitH,
                                                   u16 ipmpToolDescriptorId,
@@ -437,7 +437,7 @@ MP4Err addIPMPToolDescriptorUpdateToODAccessUnit( MP4Handle odAccessUnitH,
 / protectSample
 / Protect one media access unit (or sample)
 /
-/*=====*/
+/ =====*/
 
 MP4Err protectSample(MP4Handle sampleH, u64 ipmpToolID) {
 
@@ -452,7 +452,7 @@ MP4Err protectSample(MP4Handle sampleH, u64 ipmpToolID) {
 / putToolListInIOD
 / Create the IPMP Tool List and put it in the IOD 
 /
-/*=====*/
+/ =====*/
 
 MP4Err putToolListInIOD( MP4Movie theMovie, u64 theIpmpToolID) {
 

IsoLib/isoiff_tool/src/HEVCDecoderConfigRecord.c

@@ -334,13 +334,13 @@ MP4Err ISOIFF_CreateHEVCDecConfRecFromHandle(MP4Handle recordDataHandle,
   // buffer += 4;
   memcpy(&tmp8, buffer, 1);
   buffer += 1;
-  hevcDecConfRec->general_profile_compatibility_flags = (tmp8 << 24);
+  hevcDecConfRec->general_profile_compatibility_flags = ((u64)tmp8 << 24);
   memcpy(&tmp8, buffer, 1);
   buffer += 1;
-  hevcDecConfRec->general_profile_compatibility_flags |= (tmp8 << 16);
+  hevcDecConfRec->general_profile_compatibility_flags |= ((u64)tmp8 << 16);
   memcpy(&tmp8, buffer, 1);
   buffer += 1;
-  hevcDecConfRec->general_profile_compatibility_flags |= (tmp8 << 8);
+  hevcDecConfRec->general_profile_compatibility_flags |= ((u64)tmp8 << 8);
   memcpy(&tmp8, buffer, 1);
   buffer += 1;
   hevcDecConfRec->general_profile_compatibility_flags |= tmp8;
@@ -350,19 +350,19 @@ MP4Err ISOIFF_CreateHEVCDecConfRecFromHandle(MP4Handle recordDataHandle,
   // hevcDecConfRec->general_constraint_indicator_flags = tmp64 >> 16;
   memcpy(&tmp8, buffer, 1);
   buffer += 1;
-  hevcDecConfRec->general_constraint_indicator_flags = tmp8 << 40;
+  hevcDecConfRec->general_constraint_indicator_flags = (u64)tmp8 << 40;
   memcpy(&tmp8, buffer, 1);
   buffer += 1;
-  hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 32);
+  hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 32);
   memcpy(&tmp8, buffer, 1);
   buffer += 1;
-  hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 24);
+  hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 24);
   memcpy(&tmp8, buffer, 1);
   buffer += 1;
-  hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 16);
+  hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 16);
   memcpy(&tmp8, buffer, 1);
   buffer += 1;
-  hevcDecConfRec->general_constraint_indicator_flags |= (tmp8 << 8);
+  hevcDecConfRec->general_constraint_indicator_flags |= ((u64)tmp8 << 8);
   memcpy(&tmp8, buffer, 1);
   buffer += 1;
   hevcDecConfRec->general_constraint_indicator_flags |= tmp8;

IsoLib/libisomediafile/CMakeLists.txt

@@ -103,6 +103,7 @@ add_library(
     src/MetaboxRelationAtom.c
     src/MJ2BitsPerComponentAtom.c
     src/MJ2ColorSpecificationAtom.c
+    src/MP4ColourInformationAtom.c
     src/MJ2FileTypeAtom.c
     src/MJ2HeaderAtom.c
     src/MJ2ImageHeaderAtom.c
@@ -186,6 +187,7 @@ add_library(
     src/SubSampleInformationAtom.c
     src/SubsegmentIndexAtom.c
     src/SyncSampleAtom.c
+    src/T35MetadataSampleEntry.c
     src/TextMetaSampleEntry.c
     src/TimeToSampleAtom.c
     src/TrackAtom.c

IsoLib/libisomediafile/src/ISOMovies.h

@@ -63,6 +63,7 @@ extern "C"
 #define ISOOpenMovieInPlace MP4OpenMovieInPlace
 
   struct MP4BoxedMetadataSampleEntry;
+  struct MP4T35MetadataSampleEntry;
 
   /**
    * @brief constants for the graphics modes (e.g. for MJ2SetMediaGraphicsMode)
@@ -311,7 +312,8 @@ extern "C"
 #define ISOGetUserDataTypeCount MP4GetUserDataTypeCount
 #define ISONewUserData MP4NewUserData
 #define ISOCreateTrackReader MP4CreateTrackReader
-#define ISOSetMebxTrackReader MP4SetMebxTrackReader
+#define ISOSetMebxTrackReaderLocalKeyId MP4SetMebxTrackReaderLocalKeyId
+#define ISOSelectFirstMebxTrackReaderKey MP4SelectFirstMebxTrackReaderKey
 #define ISODisposeTrackReader MP4DisposeTrackReader
 #define ISONewHandle MP4NewHandle
 #define ISOSetHandleSize MP4SetHandleSize
@@ -800,13 +802,96 @@ extern "C"
    * @param sampleEntryH input sample entry of the mebx track
    * @param key_cnt number of local_key_id's
    */
-  ISO_EXTERN(ISOErr)
-  ISOGetMebxMetadataCount(MP4Handle sampleEntryH, u32 *key_cnt);
+  ISO_EXTERN(ISOErr) ISOGetMebxMetadataCount(MP4Handle sampleEntryH, u32 *key_cnt);
 
+  /**
+   * @brief Get metadata key configuration from a 'mebx' sample entry.
+   *
+   * Retrieves the key information at index @p idx from the MetadataKeyTableBox. Returns namespace,
+   * value, locale, setup data, and the local_key_id for this entry.
+   *
+   * @param sampleEntryH Handle containing the 'mebx' sample entry.
+   * @param idx Zero-based index of the key entry to query.
+   * @param local_key_id Output; receives the local_key_id for this key.
+   * @param key_namespace Output; receives the namespace FourCC.
+   * @param key_value Optional handle to receive the key value data.
+   * @param locale_string Optional; receives locale string if present.
+   * @param setupInfo Optional handle to receive setup information if present.
+   *
+   * @return ISOErr code: MP4NoErr on success, MP4BadDataErr if no key table, MP4NotFoundErr if not
+   * found, or other error codes.
+   */
   ISO_EXTERN(ISOErr)
-  ISOGetMebxMetadataConfig(MP4Handle sampleEntryH, u32 cnt, u32 *local_key_id, u32 *key_namespace,
+  ISOGetMebxMetadataConfig(MP4Handle sampleEntryH, u32 idx, u32 *local_key_id, u32 *key_namespace,
                            MP4Handle key_value, char **locale_string, MP4Handle setupInfo);
 
+  /*************************************************************************************************
+   * T.35 Metadata Track Functions
+   ************************************************************************************************/
+
+  /**
+   * @brief Create a new T.35 metadata sample entry.
+   * @ingroup SampleDescr
+   *
+   * Creates a T35MetadataSampleEntry ('it35') with a T35CommonHeaderBox ('t35C') containing
+   * the specified T.35 prefix text.
+   *
+   * @param outSE Output; receives the created T35MetadataSampleEntry.
+   * @param dataReferenceIndex Data reference index (typically 1 for self-contained media).
+   * @param t35_prefix_text UTF-8 string conforming to format: T35Prefix[:T35Description]
+   *                        where T35Prefix is even number of uppercase hex digits (0-9, A-F).
+   *                        Example: "B500900001:SMPTE-ST2094-50"
+   * @return MP4Err code: MP4NoErr on success, MP4BadParamErr if validation fails.
+   */
+  MP4_EXTERN(MP4Err)
+  ISONewT35SampleDescription(struct MP4T35MetadataSampleEntry **outSE, u32 dataReferenceIndex,
+                             const char *t35_prefix_text);
+
+  /**
+   * @brief Create a complete T.35 timed metadata track.
+   * @ingroup Tracks
+   *
+   * Convenience function that creates a metadata track with MP4MetaHandlerType,
+   * adds a T35MetadataSampleEntry with the specified T.35 prefix, and optionally
+   * adds a track reference to a video track using the 'rndr' reference type.
+   *
+   * After calling this function, use MP4AddMediaSample() or similar functions to
+   * add T.35 metadata samples to the track.
+   *
+   * @param theMovie Input movie object.
+   * @param timescale Media timescale (typically matches video track timescale).
+   * @param t35_prefix_text UTF-8 T.35 prefix string (e.g., "B500900001:SMPTE-ST2094-50").
+   * @param videoTrack Optional video track for track reference (NULL if not needed).
+   * @param trackReferenceType Track reference type or 0 for no reference.
+   * @param outTrack Output; receives the created metadata track.
+   * @param outMedia Optional output; receives the created media (NULL if not needed).
+   * @return ISOErr code: MP4NoErr on success, error code otherwise.
+   */
+  ISO_EXTERN(ISOErr)
+  ISONewT35MetadataTrack(MP4Movie theMovie, u32 timescale, const char *t35_prefix_text,
+                         MP4Track videoTrack, u32 trackReferenceType, MP4Track *outTrack,
+                         MP4Media *outMedia);
+
+  /**
+   * @brief Read the t35_identifier and description from a serialized T.35 sample entry handle.
+   * @ingroup SampleDescr
+   *
+   * Properly deserializes the handle returned by MP4GetMediaSampleDescription() and extracts
+   * the T.35 identifier bytes and optional description string. The caller is responsible for
+   * freeing *outIdentifier and *outDescription with free().
+   *
+   * @param sampleEntryH  Handle containing the serialized 'it35' sample entry.
+   * @param outIdentifier Output; receives a newly allocated copy of the t35_identifier bytes.
+   * @param outIdentifierSize Output; receives the number of bytes in *outIdentifier.
+   * @param outDescription Optional output; receives a newly allocated description string, or NULL
+   *                       if no description is present. Pass NULL to ignore.
+   * @return MP4NoErr on success, MP4NotFoundErr if no identifier is present, MP4BadParamErr on
+   *         invalid input.
+   */
+  ISO_EXTERN(ISOErr)
+  ISOGetT35SampleEntryFields(MP4Handle sampleEntryH, u8 **outIdentifier, u32 *outIdentifierSize,
+                             char **outDescription);
+
   /*************************************************************************************************
    * VVC Sample descriptions
    ************************************************************************************************/