commit e29b3425d0623a58f2b6aa813f1bd76d15defccb
author Yanqiang Fan <yanqiang.fan@mediatek.com> Mon Aug 03 14:02:36 2020 +0800
committer Chong Zhang <chz@google.com> Tue Aug 04 10:30:31 2020 -0700
tree 65f5b5c12118aa75f51d1e326abe59da4378e549
parent 14e5956d05742abd1d35675c68d8dfc0e272c76a

Reserve item ids for samples + grid

Reserve item ids for samples + grid, if the file size is small
than tile size, the mNumTiles is 1. The numItemsToReserve will
equal to mNumTiles, not reserve id for grid item. It will
cause grid item been over written, can not find the file size.

Change the numItemsToReserve calculate expression from mNumTiles > 1
to mNumTiles > 0, to reserve id space for grid item.

Bug: 162797911
Change-Id: I18638f1e9026282044c7df73f8a2d78d58a13447

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 8f7d4bf..d99596e 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2774,7 +2774,7 @@
         // even if the file is well-formed and the primary picture is correct.
 
         // Reserve item ids for samples + grid
-        size_t numItemsToReserve = mNumTiles + (mNumTiles > 1);
+        size_t numItemsToReserve = mNumTiles + (mNumTiles > 0);
         status_t err = mOwner->reserveItemId_l(numItemsToReserve, &mItemIdBase);
         if (err != OK) {
             return err;