Changeset 918 in SHVCSoftware for branches/SHM-upgrade/source/Lib


Ignore:
Timestamp:
12 Nov 2014, 20:27:23 (10 years ago)
Author:
seregin
Message:

update make file, add TAppDecoderAnalyser and TLibDecoderAnalyser

Location:
branches/SHM-upgrade/source/Lib
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-upgrade/source/Lib/TLibDecoder/SyntaxElementParser.cpp

    r916 r918  
    4343#include "TLibCommon/TComBitStream.h"
    4444#include "SyntaxElementParser.h"
     45#if RExt__DECODER_DEBUG_BIT_STATISTICS
     46#include "TLibCommon/TComCodingStatistics.h"
     47#endif
    4548
    4649#if ENC_DEC_TRACE
    … …  
    219222
    220223#if Q0096_OVERLAY_SEI
    221 Void  SyntaxElementParser::xReadString  (UInt bufSize, UChar *pVal, UInt& rLength)
     224#if RExt__DECODER_DEBUG_BIT_STATISTICS
     225Void SyntaxElementParser::xReadString (UInt bufSize, UChar *pVal, UInt& rLength, const Char *pSymbolName)
     226#else
     227Void  SyntaxElementParser::xReadString (UInt bufSize, UChar *pVal, UInt& rLength)
     228#endif
    222229{
    223230  assert( m_pcBitstream->getNumBitsRead() % 8 == 0 ); //always start reading at a byte-aligned position

  • branches/SHM-upgrade/source/Lib/TLibDecoder/SyntaxElementParser.h

    r916 r918  
    6464#define READ_FLAG(        code, name)     xReadFlag (         code, name )
    6565#if Q0096_OVERLAY_SEI
    66 #define READ_STRING(bufSize, code, length, name)   xReadStringTr ( bufSize, code, length, name )
     66#define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length, name )
    6767#endif
    6868
    … …  
    103103  Void  xReadFlag    ( UInt&  val, const Char *pSymbolName );
    104104#if Q0096_OVERLAY_SEI
    105   Void  xReadStringTr(UInt bufSize, UChar *pValue, UInt& rLength, const Char *pSymbolName);
     105  Void  xReadString  (UInt bufSize, UChar *pValue, UInt& rLength, const Char *pSymbolName);
    106106#endif
    107107#else

  • branches/SHM-upgrade/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r916 r918  
    183183
    184184#if Q0048_CGS_3D_ASYMLUT
    185 Void TDecCavlc::parsePPS(TComPPS* pcPPS, TCom3DAsymLUT * pc3DAsymLUT , Int nLayerID)
     185Void TDecCavlc::parsePPS(TComPPS* pcPPS, TCom3DAsymLUT * pc3DAsymLUT, Int nLayerID)
    186186#else
    187187Void TDecCavlc::parsePPS(TComPPS* pcPPS)
    … …  
    413413#if REF_REGION_OFFSET
    414414            READ_UVLC( uiCode,      "num_ref_loc_offsets" ); pcPPS->setNumScaledRefLayerOffsets(uiCode);
    415             for(Int i = 0; i < pcPPS->getNumScaledRefLayerOffsets(); i++)
     415            for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
    416416            {
    417               READ_CODE( 6, uiCode,  "ref_loc_offset_layer_id" );  pcPPS->setScaledRefLayerId( i, uiCode );
    418               READ_FLAG( uiCode, "scaled_ref_layer_offset_present_flag" );   pcPPS->setScaledRefLayerOffsetPresentFlag( i, uiCode );
     417              READ_CODE( 6, uiCode,  "ref_loc_offset_layer_id" );  pcPPS->setScaledRefLayerId( k, uiCode );
     418              READ_FLAG( uiCode, "scaled_ref_layer_offset_present_flag" );   pcPPS->setScaledRefLayerOffsetPresentFlag( k, uiCode );
    419419              if (uiCode)
    420420              {
    421                 Window& scaledWindow = pcPPS->getScaledRefLayerWindow(i);
     421                Window& scaledWindow = pcPPS->getScaledRefLayerWindow(k);
    422422                READ_SVLC( iCode, "scaled_ref_layer_left_offset" );    scaledWindow.setWindowLeftOffset  (iCode << 1);
    423423                READ_SVLC( iCode, "scaled_ref_layer_top_offset" );     scaledWindow.setWindowTopOffset   (iCode << 1);
    … …  
    428428#endif
    429429              }
    430               READ_FLAG( uiCode, "ref_region_offset_present_flag" );   pcPPS->setRefRegionOffsetPresentFlag( i, uiCode );
     430              READ_FLAG( uiCode, "ref_region_offset_present_flag" );   pcPPS->setRefRegionOffsetPresentFlag( k, uiCode );
    431431              if (uiCode)
    432432              {
    433                 Window& refWindow = pcPPS->getRefLayerWindow(i);
     433                Window& refWindow = pcPPS->getRefLayerWindow(k);
    434434                READ_SVLC( iCode, "ref_region_left_offset" );    refWindow.setWindowLeftOffset  (iCode << 1);
    435435                READ_SVLC( iCode, "ref_region_top_offset" );     refWindow.setWindowTopOffset   (iCode << 1);
    … …  
    438438              }
    439439#if R0209_GENERIC_PHASE
    440               READ_FLAG( uiCode, "resample_phase_set_present_flag" );   pcPPS->setResamplePhaseSetPresentFlag( i, uiCode );
     440              READ_FLAG( uiCode, "resample_phase_set_present_flag" );   pcPPS->setResamplePhaseSetPresentFlag( k, uiCode );
    441441              if (uiCode)
    442442              {
    443                 READ_UVLC( uiCode, "phase_hor_luma" );    pcPPS->setPhaseHorLuma ( i, uiCode );
    444                 READ_UVLC( uiCode, "phase_ver_luma" );    pcPPS->setPhaseVerLuma ( i, uiCode );
    445                 READ_UVLC( uiCode, "phase_hor_chroma_plus8" );  pcPPS->setPhaseHorChroma (i, uiCode - 8);
    446                 READ_UVLC( uiCode, "phase_ver_chroma_plus8" );  pcPPS->setPhaseVerChroma (i, uiCode - 8);
     443                READ_UVLC( uiCode, "phase_hor_luma" );    pcPPS->setPhaseHorLuma ( k, uiCode );
     444                READ_UVLC( uiCode, "phase_ver_luma" );    pcPPS->setPhaseVerLuma ( k, uiCode );
     445                READ_UVLC( uiCode, "phase_hor_chroma_plus8" );  pcPPS->setPhaseHorChroma (k, uiCode - 8);
     446                READ_UVLC( uiCode, "phase_ver_chroma_plus8" );  pcPPS->setPhaseVerChroma (k, uiCode - 8);
    447447              }
    448448#endif
    … …  
    451451#if MOVE_SCALED_OFFSET_TO_PPS
    452452            READ_UVLC( uiCode,      "num_scaled_ref_layer_offsets" ); pcPPS->setNumScaledRefLayerOffsets(uiCode);
    453             for(Int i = 0; i < pcPPS->getNumScaledRefLayerOffsets(); i++)
     453            for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
    454454            {
    455               Window& scaledWindow = pcPPS->getScaledRefLayerWindow(i);
     455              Window& scaledWindow = pcPPS->getScaledRefLayerWindow(k);
    456456#if O0098_SCALED_REF_LAYER_ID
    457               READ_CODE( 6,  uiCode,  "scaled_ref_layer_id" );       pcPPS->setScaledRefLayerId( i, uiCode );
     457              READ_CODE( 6,  uiCode,  "scaled_ref_layer_id" );       pcPPS->setScaledRefLayerId( k, uiCode );
    458458#endif
    459459              READ_SVLC( iCode, "scaled_ref_layer_left_offset" );    scaledWindow.setWindowLeftOffset  (iCode << 1);
    … …  
    462462              READ_SVLC( iCode, "scaled_ref_layer_bottom_offset" );  scaledWindow.setWindowBottomOffset(iCode << 1);
    463463#if P0312_VERT_PHASE_ADJ
    464               READ_FLAG( uiCode, "vert_phase_position_enable_flag" ); scaledWindow.setVertPhasePositionEnableFlag(uiCode);  pcPPS->setVertPhasePositionEnableFlag( pcPPS->getScaledRefLayerId(i), uiCode);
     464              READ_FLAG( uiCode, "vert_phase_position_enable_flag" ); scaledWindow.setVertPhasePositionEnableFlag(uiCode);  pcPPS->setVertPhasePositionEnableFlag( pcPPS->getScaledRefLayerId(k), uiCode);
    465465#endif
    466466            }

  • branches/SHM-upgrade/source/Lib/TLibEncoder/TEncCavlc.cpp

    r916 r918  
    318318#if REF_REGION_OFFSET
    319319            WRITE_UVLC( pcPPS->getNumScaledRefLayerOffsets(),      "num_ref_loc_offsets" );
    320             for(Int num = 0; num < pcPPS->getNumScaledRefLayerOffsets(); num++)
     320            for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
    321321            {
    322               WRITE_CODE( pcPPS->getScaledRefLayerId(num), 6, "ref_loc_offset_layer_id" );
    323               WRITE_FLAG( pcPPS->getScaledRefLayerOffsetPresentFlag(num) ? 1 : 0, "scaled_ref_layer_offset_prsent_flag" );
    324               if (pcPPS->getScaledRefLayerOffsetPresentFlag(num))
     322              WRITE_CODE( pcPPS->getScaledRefLayerId(k), 6, "ref_loc_offset_layer_id" );
     323              WRITE_FLAG( pcPPS->getScaledRefLayerOffsetPresentFlag(k) ? 1 : 0, "scaled_ref_layer_offset_prsent_flag" );
     324              if (pcPPS->getScaledRefLayerOffsetPresentFlag(k))
    325325              {
    326                 Window scaledWindow = pcPPS->getScaledRefLayerWindow(num);
     326                Window scaledWindow = pcPPS->getScaledRefLayerWindow(k);
    327327                WRITE_SVLC( scaledWindow.getWindowLeftOffset()   >> 1, "scaled_ref_layer_left_offset" );
    328328                WRITE_SVLC( scaledWindow.getWindowTopOffset()    >> 1, "scaled_ref_layer_top_offset" );
    … …  
    330330                WRITE_SVLC( scaledWindow.getWindowBottomOffset() >> 1, "scaled_ref_layer_bottom_offset" );
    331331              }
    332               WRITE_FLAG( pcPPS->getRefRegionOffsetPresentFlag(num) ? 1 : 0, "ref_region_offset_prsent_flag" );
    333               if (pcPPS->getRefRegionOffsetPresentFlag(num))
     332              WRITE_FLAG( pcPPS->getRefRegionOffsetPresentFlag(k) ? 1 : 0, "ref_region_offset_prsent_flag" );
     333              if (pcPPS->getRefRegionOffsetPresentFlag(k))
    334334              {
    335                 Window refWindow = pcPPS->getRefLayerWindow(num);
     335                Window refWindow = pcPPS->getRefLayerWindow(k);
    336336                WRITE_SVLC( refWindow.getWindowLeftOffset()   >> 1, "ref_region_left_offset" );
    337337                WRITE_SVLC( refWindow.getWindowTopOffset()    >> 1, "ref_region_top_offset" );
    … …  
    340340              }
    341341#if R0209_GENERIC_PHASE
    342               WRITE_FLAG( pcPPS->getResamplePhaseSetPresentFlag(num) ? 1 : 0, "resample_phase_set_present_flag" );
    343               if (pcPPS->getResamplePhaseSetPresentFlag(num))
     342              WRITE_FLAG( pcPPS->getResamplePhaseSetPresentFlag(k) ? 1 : 0, "resample_phase_set_present_flag" );
     343              if (pcPPS->getResamplePhaseSetPresentFlag(k))
    344344              {
    345                 WRITE_UVLC( pcPPS->getPhaseHorLuma(num), "phase_hor_luma" );
    346                 WRITE_UVLC( pcPPS->getPhaseVerLuma(num), "phase_ver_luma" );
    347                 WRITE_UVLC( pcPPS->getPhaseHorChroma(num) + 8, "phase_hor_chroma_plus8" );
    348                 WRITE_UVLC( pcPPS->getPhaseVerChroma(num) + 8, "phase_ver_chroma_plus8" );
     345                WRITE_UVLC( pcPPS->getPhaseHorLuma(k), "phase_hor_luma" );
     346                WRITE_UVLC( pcPPS->getPhaseVerLuma(k), "phase_ver_luma" );
     347                WRITE_UVLC( pcPPS->getPhaseHorChroma(k) + 8, "phase_hor_chroma_plus8" );
     348                WRITE_UVLC( pcPPS->getPhaseVerChroma(k) + 8, "phase_ver_chroma_plus8" );
    349349              }
    350350#endif
    … …  
    353353#if MOVE_SCALED_OFFSET_TO_PPS
    354354            WRITE_UVLC( pcPPS->getNumScaledRefLayerOffsets(),      "num_scaled_ref_layer_offsets" );
    355             for(Int num = 0; num < pcPPS->getNumScaledRefLayerOffsets(); num++)
     355            for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
    356356            {
    357               Window scaledWindow = pcPPS->getScaledRefLayerWindow(num);
     357              Window scaledWindow = pcPPS->getScaledRefLayerWindow(k);
    358358#if O0098_SCALED_REF_LAYER_ID
    359               WRITE_CODE( pcPPS->getScaledRefLayerId(num), 6,          "scaled_ref_layer_id" );
     359              WRITE_CODE( pcPPS->getScaledRefLayerId(k), 6,          "scaled_ref_layer_id" );
    360360#endif
    361361              WRITE_SVLC( scaledWindow.getWindowLeftOffset()   >> 1, "scaled_ref_layer_left_offset" );
Note: See TracChangeset for help on using the changeset viewer.