From 6b6088f24246c440dd3841f4cc16832f4addd3d8 Mon Sep 17 00:00:00 2001
From: Seungwook Hong <seungwook.hong@nokia.com>
Date: Fri, 29 Jan 2021 12:58:40 -0800
Subject: [PATCH] JVET-U0097: rollback PicHeader to const
---
source/Lib/CommonLib/Slice.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 2f7cd5727..df366b861 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -2665,11 +2665,7 @@ private:
const SPS* m_pcSPS;
const PPS* m_pcPPS;
Picture* m_pcPic;
-#if GDR_ENABLED
- PicHeader* m_pcPicHeader; //!< pointer to picture header structure
-#else
const PicHeader* m_pcPicHeader; //!< pointer to picture header structure
-#endif
bool m_colFromL0Flag; // collocated picture from List0 flag
@@ -2723,13 +2719,8 @@ public:
virtual ~Slice();
void initSlice();
void inheritFromPicHeader( PicHeader *picHeader, const PPS *pps, const SPS *sps );
-#if GDR_ENABLED
- void setPicHeader(PicHeader* pcPicHeader) { m_pcPicHeader = pcPicHeader; }
- PicHeader* getPicHeader() const { return m_pcPicHeader; }
-#else
void setPicHeader( const PicHeader* pcPicHeader ) { m_pcPicHeader = pcPicHeader; }
const PicHeader* getPicHeader() const { return m_pcPicHeader; }
-#endif
int getRefIdx4MVPair( RefPicList eCurRefPicList, int nCurRefIdx );
--
GitLab