Merge pull request #74 from maryla-uc/t35_tool

Add "bitstream" injection method to t35_tool

Author: podborski

IsoLib/libisomediafile/src/MP4Media.c

@@ -1923,6 +1923,147 @@ MP4GetIndMediaSampleWithPad(MP4Media theMedia, u32 sampleNumber, MP4Handle outSa
   return err;
 }
 
+MP4_EXTERN(MP4Err)
+MP4UpdateMediaSample(MP4Movie theMovie, MP4Media theMedia, u32 sampleNumber, MP4Handle sampleH,
+                     u32 sampleSize)
+{
+  MP4Err err;
+  MP4MediaInformationAtomPtr minf;
+  MP4SampleTableAtomPtr stbl;
+  MP4SampleSizeAtomPtr stsz;
+  MP4SampleToChunkAtomPtr stsc;
+  MP4ChunkOffsetAtomPtr stco;
+
+  MP4PrivateMovieRecordPtr movie = (MP4PrivateMovieRecordPtr)theMovie;
+  MP4MediaDataAtomPtr mdat;
+
+  u32 chunkNumber;
+  u32 sampleDescriptionIndex;
+  u32 firstSampleNumberInChunk;
+  u32 sampleOffsetWithinChunk;
+  u32 oldSize;
+  u64 chunkOffset;
+  u64 computedOffset;
+  s32 deltaSize;
+
+  err = MP4NoErr;
+  if((theMovie == NULL) || (theMedia == NULL) || (sampleH == NULL))
+  {
+    BAILWITHERROR(MP4BadParamErr);
+  }
+
+  mdat = (MP4MediaDataAtomPtr)movie->mdat;
+  if((mdat == NULL) || (mdat->data == NULL))
+  {
+    BAILWITHERROR(MP4NotImplementedErr);
+  }
+
+  minf = (MP4MediaInformationAtomPtr)((MP4MediaAtomPtr)theMedia)->information;
+  if(minf == NULL) BAILWITHERROR(MP4InvalidMediaErr);
+
+  stbl = (MP4SampleTableAtomPtr)minf->sampleTable;
+  if(stbl == NULL) BAILWITHERROR(MP4InvalidMediaErr);
+
+  stsz = (MP4SampleSizeAtomPtr)stbl->SampleSize;
+  stsc = (MP4SampleToChunkAtomPtr)stbl->SampleToChunk;
+  stco = (MP4ChunkOffsetAtomPtr)stbl->ChunkOffset;
+
+  if((stsz == NULL) || (stsc == NULL) || (stco == NULL)) BAILWITHERROR(MP4InvalidMediaErr);
+
+  /* get chunk and offset within chunk */
+  err = stsc->lookupSample(stbl->SampleToChunk, sampleNumber, &chunkNumber, &sampleDescriptionIndex,
+                           &firstSampleNumberInChunk);
+  if(err) goto bail;
+
+  err = stsz->getSampleSizeAndOffset(stbl->SampleSize, sampleNumber, &oldSize,
+                                     firstSampleNumberInChunk, &sampleOffsetWithinChunk);
+  if(err) goto bail;
+
+  err = stco->getChunkOffset(stbl->ChunkOffset, chunkNumber, &chunkOffset);
+  if(err) goto bail;
+
+  computedOffset = chunkOffset + sampleOffsetWithinChunk;
+  deltaSize      = sampleSize - oldSize;
+
+  if(deltaSize != 0)
+  {
+    /* Shift data in mdat */
+    u64 mdatOffset = computedOffset;
+    char *newData;
+
+    newData = (char *)realloc(mdat->data, mdat->dataSize + deltaSize);
+    if(newData == NULL) BAILWITHERROR(MP4NoMemoryErr);
+    mdat->data = newData;
+
+    memmove(mdat->data + mdatOffset + sampleSize, mdat->data + mdatOffset + oldSize,
+            mdat->dataSize - (mdatOffset + oldSize));
+
+    mdat->dataSize += deltaSize;
+
+    /* Update sample size in stsz */
+    if(stsz->sampleSize != 0)
+    {
+      u32 i;
+      stsz->sizes = (u32 *)calloc(stsz->sampleCount, sizeof(u32));
+      if(stsz->sizes == NULL) BAILWITHERROR(MP4NoMemoryErr);
+      for(i = 0; i < stsz->sampleCount; i++)
+        stsz->sizes[i] = stsz->sampleSize;
+      stsz->sampleSize = 0;
+    }
+    stsz->sizes[sampleNumber - 1] = sampleSize;
+
+    /* Update chunk offsets directly for all tracks */
+    {
+      MP4MovieAtomPtr moov = (MP4MovieAtomPtr)movie->moovAtomPtr;
+      u32 trackCount;
+      u32 i;
+      err = MP4GetListEntryCount(moov->trackList, &trackCount);
+      if(err) goto bail;
+
+      for(i = 0; i < trackCount; i++)
+      {
+        MP4TrackAtomPtr trak;
+        err = MP4GetListEntry(moov->trackList, i, (char **)&trak);
+        if(err) goto bail;
+        if(trak && trak->trackMedia)
+        {
+          MP4MediaAtomPtr media = (MP4MediaAtomPtr)trak->trackMedia;
+          if(media->information)
+          {
+            MP4MediaInformationAtomPtr minf_ptr = (MP4MediaInformationAtomPtr)media->information;
+            if(minf_ptr->sampleTable)
+            {
+              MP4SampleTableAtomPtr stbl_ptr = (MP4SampleTableAtomPtr)minf_ptr->sampleTable;
+              MP4ChunkOffsetAtomPtr stco_ptr = (MP4ChunkOffsetAtomPtr)stbl_ptr->ChunkOffset;
+
+              if(stco_ptr)
+              {
+                u32 j;
+                for(j = 0; j < stco_ptr->entryCount; j++)
+                {
+                  if(stco_ptr->offsets[j] >= computedOffset + oldSize)
+                  {
+                    stco_ptr->offsets[j] += deltaSize;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    if(err) goto bail;
+  }
+
+  /* Copy new data */
+  u64 mdatOffset = computedOffset;
+  memcpy(mdat->data + mdatOffset, *sampleH, sampleSize);
+
+bail:
+  TEST_RETURN(err);
+  return err;
+}
+
 MP4_EXTERN(MP4Err)
 MP4GetIndMediaSampleReference(MP4Media theMedia, u32 sampleNumber, u32 *outOffset, u32 *outSize,
                               u32 *outDuration, u32 *outSampleFlags, u32 *outSampleDescIndex,

IsoLib/libisomediafile/src/MP4Movies.h

@@ -1,4 +1,4 @@
-/**
+/**
  * @file MP4Movies.h
  * @brief API
  * @version 0.1
@@ -1075,6 +1075,19 @@ extern "C"
   MP4AddMediaSamples(MP4Media media, MP4Handle sampleH, u32 sampleCount, MP4Handle durationsH,
                      MP4Handle sizesH, MP4Handle sampleEntryH, MP4Handle decodingOffsetsH,
                      MP4Handle syncSamplesH);
+
+  /**
+   * @brief Update a sample in the media.
+   *
+   * @param media input media object
+   * @param sampleNumber 1-based index of the sample to update
+   * @param sampleH handle containing the new data
+   * @param sampleSize new size of the sample
+   * @return MP4Err error code
+   */
+  MP4_EXTERN(MP4Err)
+  MP4UpdateMediaSample(MP4Movie theMovie, MP4Media media, u32 sampleNumber, MP4Handle sampleH,
+                       u32 sampleSize);
   /**
    * @brief Add media samples by reference with padding bits
    *

IsoLib/t35_tool/CMakeLists.txt

@@ -74,6 +74,7 @@ add_executable(
   injection/MebxMe4cStrategy.cpp
   injection/DedicatedIt35Strategy.cpp
   injection/SampleGroupStrategy.cpp
+  injection/BitstreamStrategy.cpp
   extraction/ExtractionStrategy.cpp
   extraction/MebxMe4cExtractor.cpp
   extraction/DedicatedIt35Extractor.cpp