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

am: 9d65d13cc7

Change-Id: Ib8d8f9c58c1ffb169cf488d57fb841f80a664e97

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 fcb2141,caa028a..465f37c
--- 1/media/libstagefright/include/SampleTable.h
--- 2/media/libstagefright/include/SampleTable.h
+++ b/media/libstagefright/include/SampleTable.h
@@@ -142,19 -137,8 +139,16 @@@ 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);