Changeset 521 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecSbac.cpp
- Timestamp:
- 4 Jul 2013, 21:00:23 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecSbac.cpp
r504 r521 331 331 m_pcTDecBinIf->decodeBinTrm(uiSymbol); 332 332 333 #if H_MV_ENC_DEC_TRAC 334 DTRACE_CU("pcm_flag", uiSymbol) 335 #endif 333 336 if (uiSymbol) 334 337 { … … 412 415 UInt uiSymbol; 413 416 m_pcTDecBinIf->decodeBin( uiSymbol, m_CUTransquantBypassFlagSCModel.get( 0, 0, 0 ) ); 417 #if H_MV_ENC_DEC_TRAC 418 DTRACE_CU("cu_transquant_bypass_flag", uiSymbol); 419 #endif 414 420 pcCU->setCUTransquantBypassSubParts(uiSymbol ? true : false, uiAbsPartIdx, uiDepth); 415 421 } … … 431 437 UInt uiCtxSkip = pcCU->getCtxSkipFlag( uiAbsPartIdx ); 432 438 m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUSkipFlagSCModel.get( 0, 0, uiCtxSkip ) ); 439 #if !H_MV_ENC_DEC_TRAC 433 440 DTRACE_CABAC_VL( g_nSymbolCounter++ ); 434 441 DTRACE_CABAC_T( "\tSkipFlag" ); … … 438 445 DTRACE_CABAC_V( uiSymbol ); 439 446 DTRACE_CABAC_T( "\n"); 447 #endif 440 448 441 449 if( uiSymbol ) … … 447 455 pcCU->setMergeFlagSubParts( true , uiAbsPartIdx, 0, uiDepth ); 448 456 } 457 #if H_MV_ENC_DEC_TRAC 458 DTRACE_CU("cu_skip_flag", uiSymbol); 459 #endif 449 460 } 450 461 … … 460 471 UInt uiSymbol; 461 472 m_pcTDecBinIf->decodeBin( uiSymbol, *m_cCUMergeFlagExtSCModel.get( 0 ) ); 473 #if H_MV_ENC_DEC_TRAC 474 DTRACE_PU("merge_flag", uiSymbol) 475 #endif 462 476 pcCU->setMergeFlagSubParts( uiSymbol ? true : false, uiAbsPartIdx, uiPUIdx, uiDepth ); 463 477 478 #if !H_MV_ENC_DEC_TRAC 464 479 DTRACE_CABAC_VL( g_nSymbolCounter++ ); 465 480 DTRACE_CABAC_T( "\tMergeFlag: " ); … … 470 485 DTRACE_CABAC_V( uiAbsPartIdx ); 471 486 DTRACE_CABAC_T( "\n" ); 487 #endif 472 488 } 473 489 … … 494 510 } 495 511 } 512 #if H_MV_ENC_DEC_TRAC 513 DTRACE_PU("merge_idx", uiUnaryIdx) 514 #endif 496 515 } 497 516 ruiMergeIndex = uiUnaryIdx; 498 517 518 #if !H_MV_ENC_DEC_TRAC 499 519 DTRACE_CABAC_VL( g_nSymbolCounter++ ) 500 520 DTRACE_CABAC_T( "\tparseMergeIndex()" ) … … 502 522 DTRACE_CABAC_V( ruiMergeIndex ) 503 523 DTRACE_CABAC_T( "\n" ) 524 #endif 504 525 } 505 526 … … 521 542 UInt uiSymbol; 522 543 m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUSplitFlagSCModel.get( 0, 0, pcCU->getCtxSplitFlag( uiAbsPartIdx, uiDepth ) ) ); 544 #if H_MV_ENC_DEC_TRAC 545 DTRACE_CU("split_cu_flag", uiSymbol); 546 #else 523 547 DTRACE_CABAC_VL( g_nSymbolCounter++ ) 524 548 DTRACE_CABAC_T( "\tSplitFlag\n" ) 549 #endif 525 550 pcCU->setDepthSubParts( uiDepth + uiSymbol, uiAbsPartIdx ); 526 551 … … 545 570 { 546 571 m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUPartSizeSCModel.get( 0, 0, 0) ); 572 #if H_MV_ENC_DEC_TRAC 573 DTRACE_CU("part_mode", uiSymbol) 574 #endif 547 575 } 548 576 eMode = uiSymbol ? SIZE_2Nx2N : SIZE_NxN; … … 598 626 } 599 627 } 628 #if H_MV_ENC_DEC_TRAC 629 DTRACE_CU("part_mode", eMode ) 630 #endif 600 631 } 601 632 pcCU->setPartSizeSubParts( eMode, uiAbsPartIdx, uiDepth ); … … 621 652 m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUPredModeSCModel.get( 0, 0, 0 ) ); 622 653 iPredMode += uiSymbol; 654 #if H_MV_ENC_DEC_TRAC 655 DTRACE_CU("pred_mode_flag", uiSymbol) 656 #endif 623 657 pcCU->setPredModeSubParts( (PredMode)iPredMode, uiAbsPartIdx, uiDepth ); 624 658 } … … 639 673 m_pcTDecBinIf->decodeBin( symbol, m_cCUIntraPredSCModel.get( 0, 0, 0) ); 640 674 mpmPred[j] = symbol; 675 #if H_MV_ENC_DEC_TRAC 676 DTRACE_CU("prev_intra_luma_pred_flag", symbol) 677 #endif 641 678 } 642 679 for (j=0;j<partNum;j++) … … 652 689 symbol++; 653 690 } 691 #if H_MV_ENC_DEC_TRAC 692 DTRACE_CU("mpm_idx", symbol) 693 #endif 654 694 intraPredMode = preds[symbol]; 655 695 } … … 659 699 m_pcTDecBinIf->decodeBinsEP( symbol, 5 ); 660 700 intraPredMode = symbol; 661 701 #if H_MV_ENC_DEC_TRAC 702 DTRACE_CU("rem_intra_luma_pred_mode", symbol) 703 #endif 662 704 //postponed sorting of MPMs (only in remaining branch) 663 705 if (preds[0] > preds[1]) … … 690 732 if( uiSymbol == 0 ) 691 733 { 734 #if H_MV_ENC_DEC_TRAC 735 DTRACE_CU("intra_chroma_pred_mode", uiSymbol ) 736 #endif 692 737 uiSymbol = DM_CHROMA_IDX; 693 738 } … … 697 742 UInt uiIPredMode; 698 743 m_pcTDecBinIf->decodeBinsEP( uiIPredMode, 2 ); 744 #if H_MV_ENC_DEC_TRAC 745 DTRACE_CU("intra_chroma_pred_mode", uiIPredMode ) 746 #endif 699 747 UInt uiAllowedChromaDir[ NUM_CHROMA_MODE ]; 700 748 pcCU->getAllowedChromaDir( uiAbsPartIdx, uiAllowedChromaDir ); … … 729 777 uiSymbol++; 730 778 ruiInterDir = uiSymbol; 779 #if H_MV_ENC_DEC_TRAC 780 DTRACE_PU("inter_pred_idc", ruiInterDir - 1 ) 781 #endif 782 731 783 return; 732 784 } … … 764 816 } 765 817 818 #if H_MV_ENC_DEC_TRAC 819 #if ENC_DEC_TRACE 820 if ( eRefList == REF_PIC_LIST_0 ) 821 { 822 DTRACE_PU("ref_idx_l0", uiSymbol) 823 } 824 else 825 { 826 DTRACE_PU("ref_idx_l1", uiSymbol) 827 } 828 #endif 829 #endif 766 830 return; 767 831 } … … 835 899 { 836 900 m_pcTDecBinIf->decodeBin( ruiSubdivFlag, m_cCUTransSubdivFlagSCModel.get( 0, 0, uiLog2TransformBlockSize ) ); 901 #if !H_MV_ENC_DEC_TRAC 837 902 DTRACE_CABAC_VL( g_nSymbolCounter++ ) 838 903 DTRACE_CABAC_T( "\tparseTransformSubdivFlag()" ) … … 842 907 DTRACE_CABAC_V( uiLog2TransformBlockSize ) 843 908 DTRACE_CABAC_T( "\n" ) 909 #endif 844 910 } 845 911 … … 849 915 const UInt uiCtx = 0; 850 916 m_pcTDecBinIf->decodeBin( uiSymbol , m_cCUQtRootCbfSCModel.get( 0, 0, uiCtx ) ); 917 #if !H_MV_ENC_DEC_TRAC 851 918 DTRACE_CABAC_VL( g_nSymbolCounter++ ) 852 919 DTRACE_CABAC_T( "\tparseQtRootCbf()" ) … … 858 925 DTRACE_CABAC_V( uiAbsPartIdx ) 859 926 DTRACE_CABAC_T( "\n" ) 927 #else 928 DTRACE_CU( "rqt_root_cbf", uiSymbol ) 929 #endif 860 930 861 931 uiQtRootCbf = uiSymbol; … … 904 974 const UInt uiCtx = pcCU->getCtxQtCbf( eType, uiTrDepth ); 905 975 m_pcTDecBinIf->decodeBin( uiSymbol , m_cCUQtCbfSCModel.get( 0, eType ? TEXT_CHROMA: eType, uiCtx ) ); 906 976 #if !H_MV_ENC_DEC_TRAC 907 977 DTRACE_CABAC_VL( g_nSymbolCounter++ ) 908 978 DTRACE_CABAC_T( "\tparseQtCbf()" ) … … 916 986 DTRACE_CABAC_V( uiAbsPartIdx ) 917 987 DTRACE_CABAC_T( "\n" ) 988 #endif 918 989 919 990 pcCU->setCbfSubParts( uiSymbol << uiTrDepth, eType, uiAbsPartIdx, uiDepth ); … … 941 1012 } 942 1013 } 1014 #if !H_MV_ENC_DEC_TRAC 943 1015 DTRACE_CABAC_VL( g_nSymbolCounter++ ) 944 1016 DTRACE_CABAC_T("\tparseTransformSkip()"); … … 952 1024 DTRACE_CABAC_V( uiAbsPartIdx ) 953 1025 DTRACE_CABAC_T( "\n" ) 1026 #endif 954 1027 955 1028 pcCU->setTransformSkipSubParts( useTransformSkip, eTType, uiAbsPartIdx, uiDepth); … … 1027 1100 Void TDecSbac::parseCoeffNxN( TComDataCU* pcCU, TCoeff* pcCoef, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, UInt uiDepth, TextType eTType ) 1028 1101 { 1102 #if !H_MV_ENC_DEC_TRAC 1029 1103 DTRACE_CABAC_VL( g_nSymbolCounter++ ) 1030 1104 DTRACE_CABAC_T( "\tparseCoeffNxN()\teType=" ) … … 1051 1125 DTRACE_CABAC_V( pcCU->getPredictionMode( uiAbsPartIdx ) ) 1052 1126 DTRACE_CABAC_T( "\n" ) 1127 #endif 1053 1128 1054 1129 if( uiWidth > pcCU->getSlice()->getSPS()->getMaxTrSize() ) … … 1588 1663 uiW += ( 1 == uiCode ? 1 : 0 ); 1589 1664 } 1665 #if H_MV_ENC_DEC_TRAC 1666 DTRACE_CU("iv_res_pred_weight_idx", uiW ) 1667 #endif 1590 1668 pcCU->setARPWSubParts( ( UChar )( uiW ) , uiAbsPartIdx, uiDepth ); 1591 1669 } … … 1604 1682 UInt uiCtxIC = pcCU->getCtxICFlag( uiAbsPartIdx ); 1605 1683 m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUICFlagSCModel.get( 0, 0, uiCtxIC ) ); 1684 #if !H_MV_ENC_DEC_TRAC 1606 1685 DTRACE_CABAC_VL( g_nSymbolCounter++ ); 1607 1686 DTRACE_CABAC_T( "\tICFlag" ); … … 1611 1690 DTRACE_CABAC_V( uiSymbol ); 1612 1691 DTRACE_CABAC_T( "\n"); 1692 #else 1693 DTRACE_CU("ic_flag", uiSymbol) 1694 #endif 1613 1695 1614 1696 pcCU->setICFlagSubParts( uiSymbol ? true : false , uiAbsPartIdx, 0, uiDepth );
Note: See TracChangeset for help on using the changeset viewer.