@scrypted/libav 1.0.181 → 1.0.182

package/openh264/codec/encoder/core/inc/parameter_sets.h

@@ -1,181 +0,0 @@
-/*!
- * \copy
- *     Copyright (c)  2013, Cisco Systems
- *     All rights reserved.
- *
- *     Redistribution and use in source and binary forms, with or without
- *     modification, are permitted provided that the following conditions
- *     are met:
- *
- *        * Redistributions of source code must retain the above copyright
- *          notice, this list of conditions and the following disclaimer.
- *
- *        * Redistributions in binary form must reproduce the above copyright
- *          notice, this list of conditions and the following disclaimer in
- *          the documentation and/or other materials provided with the
- *          distribution.
- *
- *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *     POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WELS_PARAMETER_SETS_H__
-#define WELS_PARAMETER_SETS_H__
-
-#include "typedefs.h"
-#include "wels_const.h"
-#include "wels_common_basis.h"
-
-namespace WelsEnc {
-
-/* Sequence Parameter Set, refer to Page 57 in JVT X201wcm */
-typedef struct TagWelsSPS {
-uint32_t        uiSpsId;
-int16_t         iMbWidth;
-int16_t         iMbHeight;
-uint32_t        uiLog2MaxFrameNum;
-uint32_t        uiPocType;
-/* POC type 0 */
-int32_t         iLog2MaxPocLsb;
-/* POC type 1 */
-// int32_t         iOffsetForNonRefPic;
-
-// int32_t         iOffsetForTopToBottomField;
-// int32_t         iNumRefFramesInPocCycle;
-// int8_t          iOffsetForRefFrame[256];
-SCropOffset     sFrameCrop;
-int16_t         iNumRefFrames;
-// uint32_t        uiNumUnitsInTick;
-// uint32_t        uiTimeScale;
-
-uint8_t         uiProfileIdc;
-uint8_t         iLevelIdc;
-// uint8_t         uiChromaFormatIdc;
-// uint8_t         uiChromaArrayType;              //support =1
-
-// uint8_t         uiBitDepthLuma;         //=8, only used in decoder, encoder in general_***; it can be removed when removed general up_sample
-// uint8_t         uiBitDepthChroma;               //=8
-/* TO BE CONTINUE: POC type 1 */
-// bool            bDeltaPicOrderAlwaysZeroFlag;
-bool            bGapsInFrameNumValueAllowedFlag;
-
-// bool            bFrameMbsOnlyFlag;
-// bool            bMbaffFlag;     // MB Adapative Frame Field
-// bool            bDirect8x8InferenceFlag;
-bool            bFrameCroppingFlag;
-
-bool            bVuiParamPresentFlag;
-// bool            bTimingInfoPresentFlag;
-// bool            bFixedFrameRateFlag;
-
-// Note: members bVideoSignalTypePresent through uiColorMatrix below are also defined in SSpatialLayerConfig in codec_app_def.h,
-// along with definitions for enumerators EVideoFormatSPS, EColorPrimaries, ETransferCharacteristics, and EColorMatrix.
-bool	bVideoSignalTypePresent;	// false => do not write any of the following information to the header
-uint8_t	uiVideoFormat;				// EVideoFormatSPS; 3 bits in header; 0-5 => component, kpal, ntsc, secam, mac, undef
-bool	bFullRange;					// false => analog video data range [16, 235]; true => full data range [0,255]
-bool	bColorDescriptionPresent;	// false => do not write any of the following three items to the header
-uint8_t	uiColorPrimaries;			// EColorPrimaries; 8 bits in header; 0 - 9 => ???, bt709, undef, ???, bt470m, bt470bg,
-                                    //    smpte170m, smpte240m, film, bt2020
-uint8_t	uiTransferCharacteristics;	// ETransferCharacteristics; 8 bits in header; 0 - 15 => ???, bt709, undef, ???, bt470m, bt470bg, smpte170m,
-                                    //   smpte240m, linear, log100, log316, iec61966-2-4, bt1361e, iec61966-2-1, bt2020-10, bt2020-12
-uint8_t	uiColorMatrix;				// EColorMatrix; 8 bits in header (corresponds to FFmpeg "colorspace"); 0 - 10 => GBR, bt709,
-                                    //   undef, ???, fcc, bt470bg, smpte170m, smpte240m, YCgCo, bt2020nc, bt2020c
-
-bool            bConstraintSet0Flag;
-bool            bConstraintSet1Flag;
-bool            bConstraintSet2Flag;
-bool            bConstraintSet3Flag;
-// bool            bSeparateColorPlaneFlag;  // =false,: only used in decoder, encoder in general_***; it can be removed when removed general up_sample
-
-// aspect ratio in VUI
-bool            bAspectRatioPresent;
-ESampleAspectRatio  eAspectRatio;
-uint16_t            sAspectRatioExtWidth;
-uint16_t            sAspectRatioExtHeight;
-
-} SWelsSPS, *PWelsSPS;
-
-
-/* Sequence Parameter Set SVC extension syntax, refer to Page 391 in JVT X201wcm */
-typedef struct TagSpsSvcExt {
-// SCropOffset     sSeqScaledRefLayer;
-
-uint8_t         iExtendedSpatialScalability;    // ESS
-// uint8_t         uiChromaPhaseXPlus1Flag;
-// uint8_t         uiChromaPhaseYPlus1;
-// uint8_t         uiSeqRefLayerChromaPhaseXPlus1Flag;
-// uint8_t         uiSeqRefLayerChromaPhaseYPlus1;
-// bool            bInterLayerDeblockingFilterCtrlPresentFlag;
-bool            bSeqTcoeffLevelPredFlag;
-bool            bAdaptiveTcoeffLevelPredFlag;
-bool            bSliceHeaderRestrictionFlag;
-} SSpsSvcExt, *PSpsSvcExt;
-
-/* Subset sequence parameter set syntax, refer to Page 391 in JVT X201wcm */
-typedef struct TagSubsetSps {
-SWelsSPS                pSps;
-SSpsSvcExt      sSpsSvcExt;
-
-// bool            bSvcVuiParamPresentFlag;
-// bool            bAdditionalExtension2Flag;
-// bool            bAdditionalExtension2DataFlag;
-} SSubsetSps, *PSubsetSps;
-
-/* Picture parameter set syntax, refer to Page 59 in JVT X201wcm */
-typedef struct TagWelsPPS {
-uint32_t        iSpsId;
-uint32_t        iPpsId;
-
-#if !defined(DISABLE_FMO_FEATURE)
-uint32_t        uiNumSliceGroups;
-uint32_t        uiSliceGroupMapType;
-/* uiSliceGroupMapType = 0 */
-uint32_t        uiRunLength[MAX_SLICEGROUP_IDS];
-/* uiSliceGroupMapType = 2 */
-uint32_t        uiTopLeft[MAX_SLICEGROUP_IDS];
-uint32_t        uiBottomRight[MAX_SLICEGROUP_IDS];
-/* uiSliceGroupMapType = 3, 4 or 5 */
-/* uiSliceGroupMapType = 3, 4 or 5 */
-bool            bSliceGroupChangeDirectionFlag;
-uint32_t        uiSliceGroupChangeRate;
-/* uiSliceGroupMapType = 6 */
-uint32_t        uiPicSizeInMapUnits;
-uint32_t        uiSliceGroupId[MAX_SLICEGROUP_IDS];
-#endif//!DISABLE_FMO_FEATURE
-
-// uint32_t        uiNumRefIdxL0Active;
-// uint32_t        uiNumRefIdxL1Active;
-
-int8_t          iPicInitQp;
-int8_t          iPicInitQs;
-uint8_t         uiChromaQpIndexOffset;
-
-/* potential application for High profile */
-// int32_t         iSecondChromaQpIndexOffset;
-// /* potential application for High profile */
-
-// bool            bPicOrderPresentFlag;
-bool    bEntropyCodingModeFlag;
-bool            bDeblockingFilterControlPresentFlag;
-
-// bool            bConstainedIntraPredFlag;
-// bool            bRedundantPicCntPresentFlag;
-// bool            bWeightedPredFlag;
-// uint8_t         uiWeightedBiPredIdc;
-
-} SWelsPPS, *PWelsPPPS;
-
-}
-
-#endif //WELS_PARAMETER_SETS_H__

package/openh264/codec/encoder/core/inc/paraset_strategy.h

@@ -1,310 +0,0 @@
-/*!
- * \copy
- *     Copyright (c)  2013, Cisco Systems
- *     All rights reserved.
- *
- *     Redistribution and use in source and binary forms, with or without
- *     modification, are permitted provided that the following conditions
- *     are met:
- *
- *        * Redistributions of source code must retain the above copyright
- *          notice, this list of conditions and the following disclaimer.
- *
- *        * Redistributions in binary form must reproduce the above copyright
- *          notice, this list of conditions and the following disclaimer in
- *          the documentation and/or other materials provided with the
- *          distribution.
- *
- *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *     POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WELS_PARASET_STRATEGY_H
-#define WELS_PARASET_STRATEGY_H
-
-#include "param_svc.h"
-#include "utils.h"
-
-namespace WelsEnc {
-
-class IWelsParametersetStrategy {
- public:
-  virtual ~IWelsParametersetStrategy() { }
-
-  static IWelsParametersetStrategy* CreateParametersetStrategy (EParameterSetStrategy eSpsPpsIdStrategy,
-      const bool bSimulcastAVC, const int32_t kiSpatialLayerNum);
-
-  //virtual SParaSetOffset* GetParaSetOffset() = 0;
-
-  virtual int32_t GetPpsIdOffset (const int32_t iPpsId) = 0;
-  virtual int32_t GetSpsIdOffset (const int32_t iPpsId, const int32_t iSpsId) = 0;
-  virtual int32_t* GetSpsIdOffsetList (const int iParasetType) = 0;
-
-  virtual uint32_t GetAllNeededParasetNum() = 0;
-
-  virtual uint32_t GetNeededSpsNum() = 0;
-  virtual uint32_t GetNeededSubsetSpsNum() = 0;
-  virtual uint32_t GetNeededPpsNum() = 0;
-
-  virtual void LoadPrevious (SExistingParasetList* pExistingParasetList,  SWelsSPS* pSpsArray,
-                             SSubsetSps*       pSubsetArray,
-                             SWelsPPS* pPpsArray) = 0;
-
-  virtual void Update (const uint32_t kuiId, const int iParasetType) = 0;
-  virtual void UpdatePpsList (sWelsEncCtx* pCtx) = 0;
-
-  virtual bool CheckParamCompatibility (SWelsSvcCodingParam* pCodingParam, SLogContext* pLogCtx) = 0;
-
-  virtual uint32_t GenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
-                                   const int32_t iDlayerCount,
-                                   uint32_t kuiSpsId,
-                                   SWelsSPS*& pSps, SSubsetSps*& pSubsetSps, bool bSVCBaselayer) = 0;
-
-  virtual uint32_t InitPps (sWelsEncCtx* pCtx, uint32_t kiSpsId,
-                            SWelsSPS* pSps,
-                            SSubsetSps* pSubsetSps,
-                            uint32_t kuiPpsId,
-                            const bool kbDeblockingFilterPresentFlag,
-                            const bool kbUsingSubsetSps,
-                            const bool kbEntropyCodingModeFlag) = 0;
-
-  virtual  void SetUseSubsetFlag (const uint32_t iPpsId, const bool bUseSubsetSps) = 0;
-
-  virtual  void UpdateParaSetNum (sWelsEncCtx* pCtx) = 0;
-
-  virtual  int32_t GetCurrentPpsId (const int32_t iPpsId, const int32_t iIdrLoop) = 0;
-
-  virtual  void OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList,
-                                        sWelsEncCtx* pCtx, SExistingParasetList* pExistingParasetList) = 0;
-  virtual  void LoadPreviousStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList) = 0;
-
-  virtual int32_t GetSpsIdx (const int32_t iIdx) = 0;
-};
-
-
-class  CWelsParametersetIdConstant : public IWelsParametersetStrategy {
- public:
-
-  CWelsParametersetIdConstant (const bool bSimulcastAVC, const int32_t kiSpatialLayerNum);
-  virtual ~ CWelsParametersetIdConstant();
-
-  virtual int32_t GetPpsIdOffset (const int32_t iPpsId);
-  virtual int32_t GetSpsIdOffset (const int32_t iPpsId, const int32_t iSpsId);
-  int32_t* GetSpsIdOffsetList (const int iParasetType);
-
-  uint32_t GetAllNeededParasetNum();
-
-  virtual uint32_t GetNeededSpsNum();
-  virtual uint32_t GetNeededSubsetSpsNum();
-  virtual uint32_t GetNeededPpsNum();
-
-  virtual void LoadPrevious (SExistingParasetList* pExistingParasetList, SWelsSPS* pSpsArray,
-                             SSubsetSps*       pSubsetArray,
-                             SWelsPPS* pPpsArray);
-
-  virtual void Update (const uint32_t kuiId, const int iParasetType);
-  virtual void UpdatePpsList (sWelsEncCtx* pCtx) {};
-
-  bool CheckParamCompatibility (SWelsSvcCodingParam* pCodingParam, SLogContext* pLogCtx) {
-    return true;
-  };
-
-  virtual uint32_t GenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
-                                   const int32_t iDlayerCount, uint32_t kuiSpsId,
-                                   SWelsSPS*& pSps, SSubsetSps*& pSubsetSps, bool bSVCBaselayer);
-
-  virtual uint32_t InitPps (sWelsEncCtx* pCtx, uint32_t kiSpsId,
-                            SWelsSPS* pSps,
-                            SSubsetSps* pSubsetSps,
-                            uint32_t kuiPpsId,
-                            const bool kbDeblockingFilterPresentFlag,
-                            const bool kbUsingSubsetSps,
-                            const bool kbEntropyCodingModeFlag);
-
-  virtual void SetUseSubsetFlag (const uint32_t iPpsId, const bool bUseSubsetSps);
-
-  virtual void UpdateParaSetNum (sWelsEncCtx* pCtx) {};
-
-  virtual int32_t GetCurrentPpsId (const int32_t iPpsId, const int32_t iIdrLoop) {
-    return iPpsId;
-  };
-
-  virtual void OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList,
-                                       sWelsEncCtx* pCtx,
-                                       SExistingParasetList* pExistingParasetList) {};
-  virtual void LoadPreviousStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList) {};
-
-  virtual int32_t GetSpsIdx (const int32_t iIdx) {
-    return 0;
-  };
- protected:
-
-  virtual void LoadPreviousSps (SExistingParasetList* pExistingParasetList, SWelsSPS* pSpsArray,
-                                SSubsetSps*       pSubsetArray) {};
-  virtual void LoadPreviousPps (SExistingParasetList* pExistingParasetList, SWelsPPS* pPpsArray) {};
-
- protected:
-  SParaSetOffset m_sParaSetOffset;
-  bool m_bSimulcastAVC;
-  int32_t m_iSpatialLayerNum;
-
-  uint32_t m_iBasicNeededSpsNum;
-  uint32_t m_iBasicNeededPpsNum;
-};
-
-/*
-  typedef struct TagParaSetOffsetVariable {
-    int32_t       iParaSetIdDelta[MAX_DQ_LAYER_NUM+1];//mark delta between SPS_ID_in_bs and sps_id_in_encoder, can be minus, for each dq-layer
-    //need not extra +1 due no MGS and FMO case so far
-    bool          bUsedParaSetIdInBs[MAX_PPS_COUNT];      //mark the used SPS_ID with 1
-    uint32_t      uiNextParaSetIdToUseInBs;               //mark the next SPS_ID_in_bs, for all layers
-  } SParaSetOffsetVariable;
-
-  typedef struct TagParaSetOffset {
-    //in PS0 design, "sParaSetOffsetVariable" record the previous paras before current IDR, AND NEED to be stacked and recover across IDR
-    SParaSetOffsetVariable
-    sParaSetOffsetVariable[PARA_SET_TYPE]; //PARA_SET_TYPE=3; paraset_type = 0: AVC_SPS; =1: Subset_SPS; =2: PPS
-    //in PSO design, "bPpsIdMappingIntoSubsetsps" uses the current para of current IDR period
-    bool
-    bPpsIdMappingIntoSubsetsps[MAX_DQ_LAYER_NUM+1];   // need not extra +1 due no MGS and FMO case so far
-
-    int32_t  iPpsIdList[MAX_DQ_LAYER_NUM][MAX_PPS_COUNT]; //index0: max pps types; index1: for differnt IDRs, if only index0=1, index1 can reach MAX_PPS_COUNT
-
-    //#if _DEBUG
-    int32_t  eSpsPpsIdStrategy;
-    //#endif
-
-    uint32_t uiNeededSpsNum;
-    uint32_t uiNeededSubsetSpsNum;
-    uint32_t uiNeededPpsNum;
-
-    uint32_t uiInUseSpsNum;
-    uint32_t uiInUseSubsetSpsNum;
-    uint32_t uiInUsePpsNum;
-  } SParaSetOffset;
-  */
-
-class  CWelsParametersetIdNonConstant : public CWelsParametersetIdConstant {
- public:
-  CWelsParametersetIdNonConstant (const bool bSimulcastAVC,
-                                  const int32_t kiSpatialLayerNum): CWelsParametersetIdConstant (bSimulcastAVC, kiSpatialLayerNum) {};
-
-  virtual void OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList,
-                                       sWelsEncCtx* pCtx,
-                                       SExistingParasetList* pExistingParasetList);
-  virtual void LoadPreviousStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList);
-};
-
-class  CWelsParametersetIdIncreasing : public CWelsParametersetIdNonConstant {
- public:
-  CWelsParametersetIdIncreasing (const bool bSimulcastAVC,
-                                 const int32_t kiSpatialLayerNum): CWelsParametersetIdNonConstant (bSimulcastAVC, kiSpatialLayerNum) {};
-
-
-  virtual int32_t GetPpsIdOffset (const int32_t iPpsId);
-  virtual int32_t GetSpsIdOffset (const int32_t iPpsId, const int32_t iSpsId);
-
-  virtual void Update (const uint32_t kuiId, const int iParasetType);
-
- protected:
-
-  //void ParasetIdAdditionIdAdjust (SParaSetOffsetVariable* sParaSetOffsetVariable, const int32_t kiCurEncoderParaSetId,
-  //                              const uint32_t kuiMaxIdInBs);
-
- private:
-  void DebugPps (const int32_t kiPpsId);
-  void DebugSpsPps (const int32_t iPpsId, const int32_t iSpsId);
-};
-
-
-class  CWelsParametersetSpsListing : public CWelsParametersetIdNonConstant {
- public:
-  CWelsParametersetSpsListing (const bool bSimulcastAVC, const int32_t kiSpatialLayerNum);
-
-  virtual uint32_t GetNeededSubsetSpsNum();
-
-  virtual void LoadPrevious (SExistingParasetList* pExistingParasetList,  SWelsSPS* pSpsArray,
-                             SSubsetSps*       pSubsetArray,
-                             SWelsPPS* pPpsArray);
-
-  bool CheckParamCompatibility (SWelsSvcCodingParam* pCodingParam, SLogContext* pLogCtx);
-
-  virtual uint32_t GenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
-                                   const int32_t iDlayerCount, uint32_t kuiSpsId,
-                                   SWelsSPS*& pSps, SSubsetSps*& pSubsetSps, bool bSVCBaselayer);
-
-  virtual void UpdateParaSetNum (sWelsEncCtx* pCtx);
-
-  int32_t GetSpsIdx (const int32_t iIdx) {
-    return iIdx;
-  };
-
-  virtual void OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList,
-                                       sWelsEncCtx* pCtx,
-                                       SExistingParasetList* pExistingParasetList);
- protected:
-  virtual void LoadPreviousSps (SExistingParasetList* pExistingParasetList, SWelsSPS* pSpsArray,
-                                SSubsetSps*       pSubsetArray);
-  virtual bool CheckPpsGenerating();
-  virtual int32_t SpsReset (sWelsEncCtx* pCtx, bool kbUseSubsetSps);
-};
-
-class  CWelsParametersetSpsPpsListing : public CWelsParametersetSpsListing {
- public:
-  CWelsParametersetSpsPpsListing (const bool bSimulcastAVC, const int32_t kiSpatialLayerNum);
-
-  //uint32_t GetNeededPpsNum();
-
-  virtual void UpdatePpsList (sWelsEncCtx* pCtx);
-
-  virtual uint32_t InitPps (sWelsEncCtx* pCtx, uint32_t kiSpsId,
-                            SWelsSPS* pSps,
-                            SSubsetSps* pSubsetSps,
-                            uint32_t kuiPpsId,
-                            const bool kbDeblockingFilterPresentFlag,
-                            const bool kbUsingSubsetSps,
-                            const bool kbEntropyCodingModeFlag);
-
-  virtual void UpdateParaSetNum (sWelsEncCtx* pCtx);
-
-  virtual int32_t GetCurrentPpsId (const int32_t iPpsId, const int32_t iIdrLoop);
-
-  virtual void OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList,
-                                       sWelsEncCtx* pCtx,
-                                       SExistingParasetList* pExistingParasetList);
-  virtual void LoadPreviousStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList);
- protected:
-  virtual void LoadPreviousPps (SExistingParasetList* pExistingParasetList, SWelsPPS* pPpsArray);
-
-  virtual bool CheckPpsGenerating();
-  virtual int32_t SpsReset (sWelsEncCtx* pCtx, bool kbUseSubsetSps);
-};
-
-class CWelsParametersetSpsListingPpsIncreasing : public CWelsParametersetSpsListing {
- public:
-  CWelsParametersetSpsListingPpsIncreasing (const bool bSimulcastAVC,
-      const int32_t kiSpatialLayerNum): CWelsParametersetSpsListing (bSimulcastAVC, kiSpatialLayerNum) {};
-
-  virtual int32_t GetPpsIdOffset (const int32_t kiPpsId);
-  virtual void Update (const uint32_t kuiId, const int iParasetType);
-};
-
-int32_t FindExistingSps (SWelsSvcCodingParam* pParam, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
-                         const int32_t iDlayerCount, const int32_t iSpsNumInUse,
-                         SWelsSPS* pSpsArray,
-                         SSubsetSps* pSubsetArray, bool bSVCBaseLayer);
-
-}
-
-#endif

package/openh264/codec/encoder/core/inc/picture.h

@@ -1,137 +0,0 @@
-/*!
- * \copy
- *     Copyright (c)  2013, Cisco Systems
- *     All rights reserved.
- *
- *     Redistribution and use in source and binary forms, with or without
- *     modification, are permitted provided that the following conditions
- *     are met:
- *
- *        * Redistributions of source code must retain the above copyright
- *          notice, this list of conditions and the following disclaimer.
- *
- *        * Redistributions in binary form must reproduce the above copyright
- *          notice, this list of conditions and the following disclaimer in
- *          the documentation and/or other materials provided with the
- *          distribution.
- *
- *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *     POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-//picture.h  -  reconstruction picture/ reference picture/ residual picture are declared here
-#ifndef WELS_PICTURE_H__
-#define WELS_PICTURE_H__
-
-#include "typedefs.h"
-#include "as264_common.h"
-#include "wels_common_basis.h"
-
-namespace WelsEnc {
-#define LIST_SIZE      0x10000    //(256*256)
-typedef struct TagScreenBlockFeatureStorage {
-//Input
-uint16_t*  pFeatureOfBlockPointer;    // Pointer to pFeatureOfBlock
-int32_t    iIs16x16;      //Feature block size
-uint8_t      uiFeatureStrategyIndex;// index of hash strategy
-
-//Modify
-uint32_t*  pTimesOfFeatureValue;    // times of every value in Feature
-uint16_t**
-pLocationOfFeature;      // uint16_t *pLocationOfFeature[LIST_SIZE], pLocationOfFeature[i] saves all the location(x,y) whose Feature = i;
-uint16_t*  pLocationPointer;  // buffer of position array
-int32_t    iActualListSize;      // actual list size
-uint32_t uiSadCostThreshold[BLOCK_SIZE_ALL];
-bool      bRefBlockFeatureCalculated; // flag of whether pre-process is done
-uint16_t **pFeatureValuePointerList;//uint16_t* pFeatureValuePointerList[WELS_MAX (LIST_SIZE_SUM_16x16, LIST_SIZE_MSE_16x16)]
-} SScreenBlockFeatureStorage; //should be stored with RefPic, one for each frame
-
-/*
- *  Reconstructed Picture definition
- *  It is used to express reference picture, also consequent reconstruction picture for output
- */
-typedef struct TagPicture {
-/************************************payload pData*********************************/
-uint8_t*    pBuffer;    // pointer to the first allocated byte, basical offset of pBuffer, dimension:
-uint8_t*    pData[3];    // pointer to picture planes respectively
-int32_t    iLineSize[3];  // iLineSize of picture planes respectively
-
-// picture information
-/*******************************from other standard syntax****************************/
-/*from pSps*/
-int32_t    iWidthInPixel;  // picture width in pixel
-int32_t    iHeightInPixel;// picture height in pixel
-int32_t    iPictureType;  // got from sSliceHeader(): eSliceType
-int32_t    iFramePoc;    // frame POC
-
-float      fFrameRate;   // MOVE
-int32_t    iFrameNum;    // frame number      //for pRef pic management
-
-uint32_t*  uiRefMbType;  // for iMbWidth*iMbHeight
-uint8_t*    pRefMbQp;    // for iMbWidth*iMbHeight
-
-int32_t*     pMbSkipSad;   //for iMbWidth*iMbHeight
-
-SMVUnitXY*  sMvList;
-
-/*******************************sef_definition for misc use****************************/
-int32_t    iMarkFrameNum;
-int32_t    iLongTermPicNum;
-
-bool    bUsedAsRef;            //for pRef pic management
-bool    bIsLongRef;  // long term reference frame flag  //for pRef pic management
-bool    bIsSceneLTR;  //long term reference & large scene change
-uint8_t    uiRecieveConfirmed;
-uint8_t    uiTemporalId;
-uint8_t    uiSpatialId;
-int32_t   iFrameAverageQp;
-
-/*******************************for screen reference frames****************************/
-SScreenBlockFeatureStorage* pScreenBlockFeatureStorage;
-
-  /*
-   *    set picture as unreferenced
-   */
-  void SetUnref () {
-      iFramePoc          = -1;
-      iFrameNum          = -1;
-      uiTemporalId       =
-        uiSpatialId      =
-        iLongTermPicNum  = -1;
-      bIsLongRef         = false;
-      uiRecieveConfirmed = RECIEVE_FAILED;
-      iMarkFrameNum      = -1;
-      bUsedAsRef         = false;
-
-      if (NULL != pScreenBlockFeatureStorage)
-        pScreenBlockFeatureStorage->bRefBlockFeatureCalculated = false;
-  }
-
-} SPicture;
-
-/*
- *  Residual Picture
- */
-//typedef struct Rs_Picture_s{
-//  int16_t    *pBuffer[4];    // base pBuffer
-//  int16_t    *pData[4];    // pData pBuffer
-//  int32_t    real_linesize[4];// actual iLineSize of picture planes respectively
-//  int32_t    used_linesize[4];// iLineSize of picture planes respectively used currently
-//  int32_t    planes;      // planes of YUV
-//}Rs_Picture_t;
-
-}  // end of namespace WelsEnc {
-
-#endif//WELS_PICTURE_H__
-