Changeset 1229 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

9 Jul 2015, 00:39:18 (9 years ago)

Author:

seregin

Message:

port rev 4168

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1445 +1445 @@
 
     Bool isField = false;
-    Bool isTff = false;
+    Bool isTopField = false;
     
     if(!m_SEIs.empty())
@@ -1454 +1454 @@
       {
         SEIPictureTiming* pictureTiming = (SEIPictureTiming*) *(pictureTimingSEIs.begin());
-        isField = (pictureTiming->m_picStruct == 1) || (pictureTiming->m_picStruct == 2);
-        isTff =  (pictureTiming->m_picStruct == 1);
-      }
-
+        isField    = (pictureTiming->m_picStruct == 1) || (pictureTiming->m_picStruct == 2) || (pictureTiming->m_picStruct == 9) || (pictureTiming->m_picStruct == 10) || (pictureTiming->m_picStruct == 11) || (pictureTiming->m_picStruct == 12);
+        isTopField = (pictureTiming->m_picStruct == 1) || (pictureTiming->m_picStruct == 9) || (pictureTiming->m_picStruct == 11);
+      }
+
+#if Q0189_TMVP_CONSTRAINTS
       // Check if any new temporal motion vector prediction constraints SEI has arrived
       SEIMessages seiTMVPConstrainsList = extractSeisByType (m_SEIs, SEI::TMVP_CONSTRAINTS);
@@ -1483 +1484 @@
         }
       }
+#endif
     }
     
     //Set Field/Frame coding mode
     m_pcPic->setField(isField);
-    m_pcPic->setTopField(isTff);
+    m_pcPic->setTopField(isTopField);
 
     // transfer any SEI messages that have been received to the picture