Ignore:
Timestamp:
13 Nov 2015, 16:29:39 (9 years ago)
Author:
tech
Message:

Merged 15.1-dev1@1381.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r1356 r1386  
    4444#if ENC_DEC_TRACE
    4545
    46 Void  SyntaxElementWriter::xWriteCodeTr (UInt value, UInt  length, const Char *pSymbolName)
     46Void  SyntaxElementWriter::xWriteCodeTr (UInt value, UInt  length, const TChar *pSymbolName)
    4747{
    4848  xWriteCode (value,length);
    4949  if( g_HLSTraceEnable )
    5050  {
    51 #if H_MV_ENC_DEC_TRAC
     51#if NH_MV_ENC_DEC_TRAC
    5252    if ( !g_disableNumbering )
    5353    {
    … …  
    7070}
    7171
    72 Void  SyntaxElementWriter::xWriteUvlcTr (UInt value, const Char *pSymbolName)
     72Void  SyntaxElementWriter::xWriteUvlcTr (UInt value, const TChar *pSymbolName)
    7373{
    7474  xWriteUvlc (value);
    7575  if( g_HLSTraceEnable )
    7676  {
    77 #if H_MV_ENC_DEC_TRAC
     77#if NH_MV_ENC_DEC_TRAC
    7878    if ( !g_disableNumbering )
    7979    {
    … …  
    8989}
    9090
    91 Void  SyntaxElementWriter::xWriteSvlcTr (Int value, const Char *pSymbolName)
     91Void  SyntaxElementWriter::xWriteSvlcTr (Int value, const TChar *pSymbolName)
    9292{
    9393  xWriteSvlc(value);
    9494  if( g_HLSTraceEnable )
    9595  {
    96 #if H_MV_ENC_DEC_TRAC
     96#if NH_MV_ENC_DEC_TRAC
    9797    if ( !g_disableNumbering )
    9898    {
    … …  
    108108}
    109109
    110 Void  SyntaxElementWriter::xWriteFlagTr(UInt value, const Char *pSymbolName)
     110Void  SyntaxElementWriter::xWriteFlagTr(UInt value, const TChar *pSymbolName)
    111111{
    112112  xWriteFlag(value);
    113113  if( g_HLSTraceEnable )
    114114  {
    115 #if H_MV_ENC_DEC_TRAC
     115#if NH_MV_ENC_DEC_TRAC
    116116    if ( !g_disableNumbering )
    117117    {
    … …  
    127127}
    128128
     129#if NH_MV_ENC_DEC_TRAC
    129130Void  SyntaxElementWriter::xWriteStringTr( UChar* value, UInt length, const Char *pSymbolName)
    130131{
    … …  
    136137  }
    137138}
    138 
     139#endif
    139140#endif
    140141
    … …  
    176177}
    177178
     179#if NH_MV_ENC_DEC_TRAC
    178180Void  SyntaxElementWriter::xWriteString( UChar* sCode, UInt uiLength)
    179181{
    … …  
    185187  m_pcBitIf->write( 0, 8 ); //zero-termination byte
    186188}
    187 
     189#endif
    188190Void SyntaxElementWriter::xWriteRbspTrailingBits()
    189191{
Note: See TracChangeset for help on using the changeset viewer.