Changeset 1338 in SHVCSoftware for branches/SHM-dev


Ignore:
Timestamp:
22 Jul 2015, 02:50:13 (9 years ago)
Author:
seregin
Message:

port rev 4416

Location:
branches/SHM-dev/source
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r1323 r1338  
    693693/** \param pcListPic list of pictures to be written to file
    694694    \param tId       temporal sub-layer ID
    695     \todo            DYN_REF_FREE should be revised
    696695 */
    697696#if SVC_EXTENSION
    … …  
    847846        if ( !pcPicTop->getSlice(0)->isReferenced() && pcPicTop->getReconMark() == true )
    848847        {
    849 #if !DYN_REF_FREE
    850848          pcPicTop->setReconMark(false);
    851849
    852850          // mark it should be extended later
    853851          pcPicTop->getPicYuvRec()->setBorderExtension( false );
    854 
    855 #else
    856           pcPicTop->destroy();
    857           pcListPic->erase( iterPic );
    858           iterPic = pcListPic->begin(); // to the beginning, non-efficient way, have to be revised!
    859           continue;
    860 #endif
    861852        }
    862853        if ( !pcPicBottom->getSlice(0)->isReferenced() && pcPicBottom->getReconMark() == true )
    863854        {
    864 #if !DYN_REF_FREE
    865855          pcPicBottom->setReconMark(false);
    866856
    867857          // mark it should be extended later
    868858          pcPicBottom->getPicYuvRec()->setBorderExtension( false );
    869 
    870 #else
    871           pcPicBottom->destroy();
    872           pcListPic->erase( iterPic );
    873           iterPic = pcListPic->begin(); // to the beginning, non-efficient way, have to be revised!
    874           continue;
    875 #endif
    876859        }
    877860        pcPicTop->setOutputMark(false);
    … …  
    981964        if ( !pcPic->getSlice(0)->isReferenced() && pcPic->getReconMark() == true )
    982965        {
    983 #if !DYN_REF_FREE
    984966          pcPic->setReconMark(false);
    985967
    986968          // mark it should be extended later
    987969          pcPic->getPicYuvRec()->setBorderExtension( false );
    988 
    989 #else
    990           pcPic->destroy();
    991           pcListPic->erase( iterPic );
    992           iterPic = pcListPic->begin(); // to the beginning, non-efficient way, have to be revised!
    993           continue;
    994 #endif
    995970        }
    996971        pcPic->setOutputMark(false);
    … …  
    1003978
    1004979/** \param pcListPic list of pictures to be written to file
    1005     \todo            DYN_REF_FREE should be revised
    1006980 */
    1007981#if SVC_EXTENSION
    … …  
    10741048        if ( !pcPicTop->getSlice(0)->isReferenced() && pcPicTop->getReconMark() == true )
    10751049        {
    1076 #if !DYN_REF_FREE
    10771050          pcPicTop->setReconMark(false);
    10781051
    10791052          // mark it should be extended later
    10801053          pcPicTop->getPicYuvRec()->setBorderExtension( false );
    1081 
    1082 #else
    1083           pcPicTop->destroy();
    1084           pcListPic->erase( iterPic );
    1085           iterPic = pcListPic->begin(); // to the beginning, non-efficient way, have to be revised!
    1086           continue;
    1087 #endif
    10881054        }
    10891055        if ( !pcPicBottom->getSlice(0)->isReferenced() && pcPicBottom->getReconMark() == true )
    10901056        {
    1091 #if !DYN_REF_FREE
    10921057          pcPicBottom->setReconMark(false);
    10931058
    10941059          // mark it should be extended later
    10951060          pcPicBottom->getPicYuvRec()->setBorderExtension( false );
    1096 
    1097 #else
    1098           pcPicBottom->destroy();
    1099           pcListPic->erase( iterPic );
    1100           iterPic = pcListPic->begin(); // to the beginning, non-efficient way, have to be revised!
    1101           continue;
    1102 #endif
    11031061        }
    11041062        pcPicTop->setOutputMark(false);
    11051063        pcPicBottom->setOutputMark(false);
    11061064
    1107 #if !DYN_REF_FREE
    11081065        if(pcPicTop)
    11091066        {
    … …  
    11121069          pcPicTop = NULL;
    11131070        }
    1114 #endif
    11151071      }
    11161072    }
    … …  
    12111167        if ( !pcPic->getSlice(0)->isReferenced() && pcPic->getReconMark() == true )
    12121168        {
    1213 #if !DYN_REF_FREE
    12141169          pcPic->setReconMark(false);
    12151170
    12161171          // mark it should be extended later
    12171172          pcPic->getPicYuvRec()->setBorderExtension( false );
    1218 
    1219 #else
    1220           pcPic->destroy();
    1221           pcListPic->erase( iterPic );
    1222           iterPic = pcListPic->begin(); // to the beginning, non-efficient way, have to be revised!
    1223           continue;
    1224 #endif
    12251173        }
    12261174        pcPic->setOutputMark(false);
    12271175      }
    12281176#if !SVC_EXTENSION
    1229 #if !DYN_REF_FREE
    1230       if(pcPic)
     1177      if(pcPic != NULL)
    12311178      {
    12321179        pcPic->destroy();
    … …  
    12341181        pcPic = NULL;
    12351182      }
    1236 #endif
    12371183#endif
    12381184      iterPic++;

  • branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

    r1337 r1338  
    164164#define AMP_SAD                                           1 ///< dedicated SAD functions for AMP
    165165#define DECODER_CHECK_SUBSTREAM_AND_SLICE_TRAILING_BYTES  1
    166 #define DYN_REF_FREE                                      0 ///< Reference memory management - dynamic free of reference memories
    167166#define RDO_WITHOUT_DQP_BITS                              0 ///< Disable counting dQP bits in RDO-based mode decision
    168167#define SAO_ENCODE_ALLOW_USE_PREDEBLOCK                   1
Note: See TracChangeset for help on using the changeset viewer.