Changeset 6 in SHVCSoftware for trunk/source


Ignore:
Timestamp:
8 Nov 2012, 20:54:05 (12 years ago)
Author:
seregin
Message:

Correct IntraBL cost and fix for couple of compiler warnings.

Location:
trunk/source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/App/TAppDecoder/TAppDecTop.cpp

    r2 r6  
    168168    streampos location = bitstreamFile.tellg();
    169169    AnnexBStats stats = AnnexBStats();
    170     bool bPreviousPictureDecoded = false;
    171170
    172171    vector<uint8_t> nalUnit;
    … …  
    212211          bytestream.reset();
    213212        }
    214         bPreviousPictureDecoded = true;
    215213      }
    216214    }

  • trunk/source/Lib/TLibCommon/CommonDef.h

    r2 r6  
    5656// ====================================================================================================================
    5757
    58 #define NV_VERSION        "0.1"                 ///< Current software version
     58#define NV_VERSION        "0.1.1"                 ///< Current software version
    5959
    6060// ====================================================================================================================

  • trunk/source/Lib/TLibCommon/TComPic.cpp

    r2 r6  
    6868, m_bSpatialEnhLayer( false )
    6969, m_pcFullPelBaseRec( NULL )
     70#if REF_IDX_ME_AROUND_ZEROMV
     71, m_bIsILR                                (false)
     72#endif
    7073#endif
    7174{

  • trunk/source/Lib/TLibCommon/TComPic.h

    r2 r6  
    6161#if SVC_EXTENSION
    6262  UInt                  m_layerId;              //  Layer ID
    63 #endif
    64 #if REF_IDX_ME_AROUND_ZEROMV
    65   Bool                  m_bIsILR;                 //  Is ILR picture
    6663#endif
    6764  Bool                  m_bUsedByCurr;            //  Used by current picture
    … …  
    9188  Bool                  m_bSpatialEnhLayer;       // whether current layer is a spatial enhancement layer,
    9289  TComPicYuv*           m_pcFullPelBaseRec;    // upsampled base layer recontruction for difference domain inter prediction
     90#if REF_IDX_ME_AROUND_ZEROMV
     91  Bool                  m_bIsILR;                 //  Is ILR picture
     92#endif
    9393#endif
    9494

  • trunk/source/Lib/TLibCommon/TComUpsampleFilter.cpp

    r2 r6  
    33#include "TypeDef.h"
    44
    5 #if SVC_EXTENSION
     5#if SVC_UPSAMPLING
    66// ====================================================================================================================
    77// Tables:

  • trunk/source/Lib/TLibDecoder/TDecTop.cpp

    r2 r6  
    159159        m_cIlpPic[j] = new  TComPic;
    160160        //m_cIlpPic[j]->createWithOutYuv(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, &m_cSPS, true);
     161#if SVC_UPSAMPLING
    161162        m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, pcSPS, true);
     163#else
     164        m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true);
     165#endif
    162166        for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCUsInFrame(); i++)
    163167        {

  • trunk/source/Lib/TLibEncoder/TEncEntropy.cpp

    r2 r6  
    237237  }
    238238
     239#if INTRA_BL
     240  if( pcCU->isIntraBL( uiAbsPartIdx ) )
     241  {
     242    return;
     243  }
     244#endif
     245
    239246  m_pcEntropyCoderIf->codePredMode( pcCU, uiAbsPartIdx );
    240247}

  • trunk/source/Lib/TLibEncoder/TEncSearch.cpp

    r2 r6  
    894894                            Bool         bChroma )
    895895{
    896 #if INTRA_BL
    897   if ( pcCU->isIntraBL( 0 ))
    898   {
    899     return;
    900   }
    901 #endif
    902 
    903896  if( bLuma )
    904897  {
    … …  
    917910#if INTRA_BL
    918911      m_pcEntropyCoder->encodeIntraBLFlag ( pcCU, 0, true );
    919 #endif
    920      
     912      if( pcCU->isIntraBL( 0 ) )
     913      {
     914        return;
     915      }
     916#endif     
    921917      m_pcEntropyCoder  ->encodePartSize( pcCU, 0, pcCU->getDepth(0), true );
    922918
    … …  
    956952    }
    957953  }
     954#if INTRA_BL
     955  if( pcCU->isIntraBL( 0 ) )
     956  {
     957    return;
     958  }
     959#endif
    958960  if( bChroma )
    959961  {
    … …  
    61536155    }
    61546156    m_pcEntropyCoder->encodeSkipFlag ( pcCU, 0, true );
     6157#if INTRA_BL
     6158    if(m_pcEncCfg->getLayerId())
     6159    {
     6160      m_pcEntropyCoder->encodeIntraBLFlag(pcCU, 0, true);
     6161      assert( pcCU->isIntraBL( 0 ) == false );
     6162    }
     6163#endif
    61556164    m_pcEntropyCoder->encodePredMode( pcCU, 0, true );
    61566165    m_pcEntropyCoder->encodePartSize( pcCU, 0, pcCU->getDepth(0), true );

  • trunk/source/Lib/TLibEncoder/TEncTop.cpp

    r2 r6  
    389389        m_cIlpPic[j] = new  TComPic;
    390390        //m_cIlpPic[j]->createWithOutYuv(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, &m_cSPS, true);
     391#if SVC_UPSAMPLING
    391392        m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, &m_cSPS, true);
     393#else
     394        m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true);
     395#endif
    392396#if REF_IDX_ME_AROUND_ZEROMV
    393397        m_cIlpPic[j]->setIsILR(true);
Note: See TracChangeset for help on using the changeset viewer.