Ignore:
Timestamp:
4 Jul 2013, 21:00:23 (12 years ago)
Author:
tech
Message:

Integrated following changes:

  • H_MV_FIX1071, fix of encoder side reference list construction on IRAP pictures, same as in HM11.
  • H_3D_VSO_FIX_BORDRE_EXTENSION, fixed uninitialized borders for org-yuvs in VSO
  • H_MV_ENC_DEC_TRAC, added cu/pu level trace ( only enabled when ENC_DEC_TRACE is enabled)
Location:
branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComRom.cpp

    r446 r521  
    324324Bool   g_bJustDoIt = false;
    325325UInt64 g_nSymbolCounter = 0;
     326#if H_MV_ENC_DEC_TRAC
     327Bool g_traceCU = true;
     328Bool g_tracePU = true;
     329Bool g_traceTU = true;
     330Bool g_disableHLSTrace = false;
     331UInt64 g_stopAtCounter   = 10803;
     332#endif
    326333#endif
    327334// ====================================================================================================================
    … …  
    518525Int  g_eTTable[4] = {0,3,1,2};
    519526
     527#if H_MV_ENC_DEC_TRAC
     528#if ENC_DEC_TRACE
     529Void writeToTraceFile( Char* symbolName, Int val, Bool doIt )
     530{
     531  if ( ( ( g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END )|| g_bJustDoIt ) && doIt  )
     532  {
     533    if ( g_stopAtCounter == g_nSymbolCounter )
     534    {
     535      std::cout << "Break point here." << std::endl;
     536    }
     537    fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
     538    fprintf( g_hTrace, "%-50s       : %d\n", symbolName, val );     
     539    fflush ( g_hTrace );
     540    g_nSymbolCounter++;
     541  }
     542}
     543
     544Void writeToTraceFile( Char* symbolName, Bool doIt )
     545{
     546  if ( ( ( g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END )|| g_bJustDoIt ) && doIt  )
     547  {
     548    fprintf( g_hTrace, "%s", symbolName );   
     549    fflush ( g_hTrace );
     550    g_nSymbolCounter++;
     551  }
     552}
     553
     554#endif
     555#endif
    520556//! \}

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComRom.h

    r324 r521  
    4040
    4141#include "CommonDef.h"
     42#include "TypeDef.h"
    4243
    4344#include<stdio.h>
    … …  
    184185#define DTRACE_CABAC_N        if ( ( g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END )|| g_bJustDoIt ) fprintf( g_hTrace, "\n"    );
    185186
     187#if H_MV_ENC_DEC_TRAC
     188 extern Bool   g_traceCU;
     189 extern Bool   g_tracePU;
     190 extern Bool   g_traceTU;
     191 extern Bool   g_disableHLSTrace;
     192 extern UInt64 g_stopAtCounter;
     193
     194#define DTRACE_CU(x,y)             writeToTraceFile( x,y, g_traceCU );
     195#define DTRACE_PU(x,y)             writeToTraceFile( x,y, g_tracePU );
     196#define DTRACE_TU(x,y)             writeToTraceFile( x,y, g_traceTU );
     197#define DTRACE_CU_S(x)             writeToTraceFile( x,   g_traceCU );
     198#define DTRACE_PU_S(x)             writeToTraceFile( x,   g_tracePU );
     199#define DTRACE_TU_S(x)             writeToTraceFile( x,   g_traceTU );
     200
     201
     202 Void           writeToTraceFile( Char* symbolName, Int val, Bool doIt );
     203 Void           writeToTraceFile( Char* symbolName, Bool doIt );
     204#endif
    186205#else
    187206
    … …  
    194213#define DTRACE_CABAC_N
    195214
     215#if H_MV_ENC_DEC_TRAC
     216#define DTRACE_CU(x,y)             
     217#define DTRACE_PU(x,y)             
     218#define DTRACE_TU(x,y)             
     219
     220#define DTRACE_CU_S(x)             
     221#define DTRACE_PU_S(x)             
     222#define DTRACE_TU_S(x)             
     223
     224#endif
    196225#endif
    197226

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp

    r504 r521  
    654654}
    655655
    656 #if H_MV
     656#if H_MV && !H_MV_FIX1071
    657657// Temporary fix for FIX1071 should be removed later
    658658Int TComSlice::getNumRpsCurrTempList( TComReferencePictureSet* rps /* = 0 */)
    … …  
    661661#endif
    662662{
    663 
    664663  Int numRpsCurrTempList = 0;
    665664
    … …  
    668667    return 0;
    669668  }
    670 #if H_MV
     669#if H_MV && !H_MV_FIX1071
    671670// Temporary fix for FIX1071 should be removed later
    672671  if (rps == NULL)
    … …  
    13021301/** Function for constructing an explicit Reference Picture Set out of the available pictures in a referenced Reference Picture Set
    13031302*/
     1303#if FIX1071 && H_MV_FIX1071
     1304Void TComSlice::createExplicitReferencePictureSetFromReference( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool isRAP)
     1305#else
    13041306Void TComSlice::createExplicitReferencePictureSetFromReference( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet)
     1307#endif
    13051308{
    13061309  TComPic* rpcPic;
    … …  
    13271330        // and should be added to the explicit Reference Picture Set
    13281331        pcRPS->setDeltaPOC(k, pReferencePictureSet->getDeltaPOC(i));
     1332#if FIX1071 && H_MV_FIX1071
     1333        pcRPS->setUsed(k, pReferencePictureSet->getUsed(i) && (!isRAP));
     1334#else
    13291335        pcRPS->setUsed(k, pReferencePictureSet->getUsed(i));
     1336#endif
    13301337        if(pcRPS->getDeltaPOC(k) < 0)
    13311338        {

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h

    r510 r521  
    16191619  Bool      getCheckLDC     ()                                  { return m_bCheckLDC; }
    16201620  Bool      getMvdL1ZeroFlag ()                                  { return m_bLMvdL1Zero;    }
    1621 #if H_MV // This is a temporary fix of the temporary fix L0177
     1621#if H_MV && !H_MV_FIX1071 // This is a temporary fix of the temporary fix L0177
    16221622  Int       getNumRpsCurrTempList( TComReferencePictureSet* rps = NULL );
    16231623#else
    … …  
    17361736  Bool isStepwiseTemporalLayerSwitchingPointCandidate( TComList<TComPic*>& rcListPic );
    17371737  Int       checkThatAllRefPicsAreAvailable( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool printErrors, Int pocRandomAccess = 0);
     1738#if FIX1071 && H_MV_FIX1071
     1739  Void      createExplicitReferencePictureSetFromReference( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool isRAP);
     1740#else
    17381741  Void      createExplicitReferencePictureSetFromReference( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet);
     1742#endif
    17391743
    17401744  Void setMaxNumMergeCand               (UInt val )         { m_maxNumMergeCand = val;                    }

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h

    r510 r521  
    6969///////////////////////////////////   MAJOR DEFINES   /////////////////////////////////// 
    7070/////////////////////////////////////////////////////////////////////////////////////////
     71#if H_MV
     72#define H_MV_FIX1071                      1  //< Fix on Fix1071, same as in HTM 11
     73#define H_MV_ENC_DEC_TRAC                 0  //< CU/PU level tracking
     74#endif
    7175
    7276#if H_3D
    … …  
    129133                                              // Sony_M23639
    130134#define H_3D_GEN                          1   // Some general changes can be removed after merge
    131 #define H_3D_CLEANUPS                     1
    132 #define H_3D_FIX                          1   // Temporary for minor fixes
     135#define H_3D_CLEANUPS                     1   // Temporary for minor fixes can be removed after merge
     136#define H_3D_FIX                          1   // Temporary for minor fixes can be removed after merge
     137#define H_3D_VSO_FIX_BORDRE_EXTENSION     1   // Temporary for minor fixes can be removed after merge
    133138#endif
    134139
Note: See TracChangeset for help on using the changeset viewer.