Snap for 7414767 from 35e6d0c0992212a5313949fc5023f1d5b8f03586 to sc-release

Change-Id: I068f856ceb03f2c1d42b745bf8861ed0734c384a

2 files changed, 67 insertions, 10 deletions

diff --git a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
index 7f955355..a9916030 100644
--- a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
+++ b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
@@ -503,8 +503,7 @@ bool C2GoldfishAvcDec::setDecodeArgs(C2ReadView *inBuffer,
         mInPBuffer = const_cast<uint8_t *>(inBuffer->data() + inOffset);
         mInPBufferSize = inSize;
         mInTsMarker = tsMarker;
-        mIndex2Pts[mInTsMarker] = mPts;
-        mPts2Index[mPts] = mInTsMarker;
+        insertPts(tsMarker, mPts);
     }
 
     // uint32_t displayHeight = mHeight;
@@ -547,6 +546,9 @@ void C2GoldfishAvcDec::deleteContext() {
     if (mContext) {
         mContext->destroyH264Context();
         mContext.reset(nullptr);
+        mPts2Index.clear();
+        mOldPts2Index.clear();
+        mIndex2Pts.clear();
     }
 }
 
@@ -760,13 +762,61 @@ void C2GoldfishAvcDec::copyImageData(h264_image_t &img) {
     }
 }
 
-void C2GoldfishAvcDec::removePts(uint64_t pts) {
+uint64_t C2GoldfishAvcDec::getWorkIndex(uint64_t pts) {
+    if (!mOldPts2Index.empty()) {
+        auto iter = mOldPts2Index.find(pts);
+        if (iter != mOldPts2Index.end()) {
+            auto index = iter->second;
+            DDD("found index %d for pts %" PRIu64, (int)index, pts);
+            return index;
+        }
+    }
+    auto iter = mPts2Index.find(pts);
+    if (iter != mPts2Index.end()) {
+        auto index = iter->second;
+        DDD("found index %d for pts %" PRIu64, (int)index, pts);
+        return index;
+    }
+    DDD("not found index for pts %" PRIu64, pts);
+    return 0;
+}
+
+void C2GoldfishAvcDec::insertPts(uint32_t work_index, uint64_t pts) {
     auto iter = mPts2Index.find(pts);
-    if (iter == mPts2Index.end()) return;
+    if (iter != mPts2Index.end()) {
+        // we have a collision here:
+        // apparently, older session is not done yet,
+        // lets save them
+        DDD("inserted to old pts %" PRIu64 " with index %d", pts, (int)iter->second);
+        mOldPts2Index[iter->first] = iter->second;
+    }
+    DDD("inserted pts %" PRIu64 " with index %d", pts, (int)work_index);
+    mIndex2Pts[work_index] = pts;
+    mPts2Index[pts] = work_index;
+}
 
-    auto index = iter->second;
+void C2GoldfishAvcDec::removePts(uint64_t pts) {
+    bool found = false;
+    uint64_t index = 0;
+    // note: check old pts first to see
+    // if we have some left over, check them
+    if (!mOldPts2Index.empty()) {
+        auto iter = mOldPts2Index.find(pts);
+        if (iter != mOldPts2Index.end()) {
+            mOldPts2Index.erase(iter);
+            index = iter->second;
+            found = true;
+        }
+    } else {
+        auto iter = mPts2Index.find(pts);
+        if (iter != mPts2Index.end()) {
+            mPts2Index.erase(iter);
+            index = iter->second;
+            found = true;
+        }
+    }
 
-    mPts2Index.erase(iter);
+    if (!found) return;
 
     auto iter2 = mIndex2Pts.find(index);
     if (iter2 == mIndex2Pts.end()) return;
@@ -859,6 +909,8 @@ void C2GoldfishAvcDec::process(const std::unique_ptr<C2Work> &work,
                     mCsd1.assign(mInPBuffer, mInPBuffer + mInPBufferSize);
                     DDD("assign to csd1 with %d bytpes", mInPBufferSize);
                 }
+                // this is not really a valid pts from config
+                removePts(mPts);
             }
 
             uint32_t delay;
@@ -918,10 +970,10 @@ void C2GoldfishAvcDec::process(const std::unique_ptr<C2Work> &work,
                 }
             }
 
-            DDD("got data %" PRIu64 " with pts %" PRIu64,  mPts2Index[mImg.pts], mImg.pts);
+            DDD("got data %" PRIu64 " with pts %" PRIu64,  getWorkIndex(mImg.pts), mImg.pts);
             mHeaderDecoded = true;
             copyImageData(mImg);
-            finishWork(mPts2Index[mImg.pts], work);
+            finishWork(getWorkIndex(mImg.pts), work);
             removePts(mImg.pts);
         } else {
             work->workletsProcessed = 0u;
@@ -986,9 +1038,9 @@ C2GoldfishAvcDec::drainInternal(uint32_t drainMode,
         // TODO: maybe keep rendering to screen
         //        mImg = mContext->getImage();
         if (mImg.data != nullptr) {
-            DDD("got data in drain mode %" PRIu64 " with pts %" PRIu64,  mPts2Index[mImg.pts], mImg.pts);
+            DDD("got data in drain mode %" PRIu64 " with pts %" PRIu64,  getWorkIndex(mImg.pts), mImg.pts);
             copyImageData(mImg);
-            finishWork(mPts2Index[mImg.pts], work);
+            finishWork(getWorkIndex(mImg.pts), work);
             removePts(mImg.pts);
         } else {
             fillEmptyWork(work);
diff --git a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.h b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.h
index d906d025..3c5be7f9 100644
--- a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.h
+++ b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.h
@@ -79,7 +79,12 @@ class C2GoldfishAvcDec : public SimpleC2Component {
     std::shared_ptr<IntfImpl> mIntf;
 
     void removePts(uint64_t pts);
+    void insertPts(uint32_t work_index, uint64_t pts);
+    uint64_t getWorkIndex(uint64_t pts);
 
+    // there are same pts matching to different work indices
+    // this happen during csd0/csd1 switching
+    std::map<uint64_t, uint64_t> mOldPts2Index;
     std::map<uint64_t, uint64_t> mPts2Index;
     std::map<uint64_t, uint64_t> mIndex2Pts;
     uint64_t  mPts {0};