Merge \\\"Impose a size bound for dynamically allocated tables in stbl.\\\" into...

am: 4c969bf93f

Change-Id: I6258bac89bbe02e47b3c912df26f26033d7b76b4

diff --cc include/media/stagefright/DataSource.h
Simple merge

diff --cc media/libstagefright/SampleTable.cpp
Simple merge

diff --cc media/libstagefright/include/SampleTable.h
index 465f37c,82f1486..fcb2141
--- 1/media/libstagefright/include/SampleTable.h
--- 2/media/libstagefright/include/SampleTable.h
+++ b/media/libstagefright/include/SampleTable.h
@@@ -139,16 -140,11 +142,19 @@@ private
      };
      SampleToChunkEntry *mSampleToChunkEntries;
  
+     // Approximate size of all tables combined.
+     uint64_t mTotalSize;
+ 
      friend struct SampleIterator;
  
 +    // normally we don't round
 +    inline uint64_t getSampleTime(
 +            size_t sample_index, uint64_t scale_num, uint64_t scale_den) const {
 +        return (sample_index < (size_t)mNumSampleSizes && mSampleTimeEntries != NULL
 +                && scale_den != 0)
 +                ? (mSampleTimeEntries[sample_index].mCompositionTime * scale_num) / scale_den : 0;
 +    }
 +
      status_t getSampleSize_l(uint32_t sample_index, size_t *sample_size);
      uint32_t getCompositionTimeOffset(uint32_t sampleIndex);