Changeset 1170 in 3DVCSoftware
- Timestamp:
- 5 Apr 2015, 22:49:22 (10 years ago)
- Location:
- branches/HTM-13.1-dev0
- Files:
-
- 1 added
- 26 edited
-
cfg/3D-HEVC/baseCfg_2view+depth.cfg (modified) (1 diff)
-
cfg/3D-HEVC/baseCfg_2view.cfg (modified) (1 diff)
-
cfg/3D-HEVC/baseCfg_3view+depth.cfg (modified) (1 diff)
-
cfg/3D-HEVC/baseCfg_3view.cfg (modified) (1 diff)
-
cfg/3D-HEVC/deltaCfg_3view.cfg (modified) (1 diff)
-
cfg/3D-HEVC/fullCfg.cfg (modified) (1 diff)
-
codingresults/1170_InCmpPred_vs_1169_ColourOff.xls (added)
-
source/App/TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
-
source/App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
-
source/App/TAppEncoder/TAppEncTop.cpp (modified) (6 diffs)
-
source/Lib/TLibCommon/TComSlice.cpp (modified) (8 diffs)
-
source/Lib/TLibCommon/TComSlice.h (modified) (6 diffs)
-
source/Lib/TLibCommon/TypeDef.h (modified) (2 diffs)
-
source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (5 diffs)
-
source/Lib/TLibDecoder/TDecCAVLC.h (modified) (4 diffs)
-
source/Lib/TLibDecoder/TDecEntropy.cpp (modified) (2 diffs)
-
source/Lib/TLibDecoder/TDecGop.cpp (modified) (1 diff)
-
source/Lib/TLibDecoder/TDecGop.h (modified) (3 diffs)
-
source/Lib/TLibDecoder/TDecTop.cpp (modified) (4 diffs)
-
source/Lib/TLibDecoder/TDecTop.h (modified) (2 diffs)
-
source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (4 diffs)
-
source/Lib/TLibEncoder/TEncCavlc.h (modified) (2 diffs)
-
source/Lib/TLibEncoder/TEncCfg.h (modified) (5 diffs)
-
source/Lib/TLibEncoder/TEncEntropy.cpp (modified) (2 diffs)
-
source/Lib/TLibEncoder/TEncGOP.cpp (modified) (4 diffs)
-
source/Lib/TLibEncoder/TEncSlice.cpp (modified) (2 diffs)
-
source/Lib/TLibEncoder/TEncTop.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-13.1-dev0/cfg/3D-HEVC/baseCfg_2view+depth.cfg
r1163 r1170 81 81 82 82 # QPfactor betaOffsetDiv2 #ref_pics_active reference pictures deltaRPS reference idcs ilPredLayerIdc refLayerPicPosIl_L1 83 # Type POC QPoffset tcOffsetDiv2 temporal_id #ref_pics predict #ref_idcs #ActiveRefLayerPics refLayerPicPosIl_L0 84 Frame1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 85 Frame2: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 86 Frame3: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 87 Frame4: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 88 Frame5: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 89 Frame6: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 90 Frame7: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 91 Frame8: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 92 93 FrameI_l1: I 0 0 0.442 0 0 0 0 0 0 0 94 Frame1_l1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 95 Frame2_l1: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 96 Frame3_l1: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 97 Frame4_l1: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 98 Frame5_l1: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 99 Frame6_l1: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 100 Frame7_l1: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 101 Frame8_l1: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 102 103 FrameI_l2: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 104 Frame1_l2: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 105 Frame2_l2: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 106 Frame3_l2: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 107 Frame4_l2: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 108 Frame5_l2: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 109 Frame6_l2: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 110 Frame7_l2: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 111 Frame8_l2: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 112 113 FrameI_l3: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 114 Frame1_l3: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 115 Frame2_l3: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 116 Frame3_l3: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 117 Frame4_l3: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 118 Frame5_l3: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 119 Frame6_l3: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 120 Frame7_l3: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 121 Frame8_l3: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 83 # Type POC QPoffset tcOffsetDiv2 temporal_id #ref_pics predict #ref_idcs #ActiveRefLayerPics refLayerPicPosIl_L0 interCompPred 84 Frame1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 0 85 Frame2: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 0 86 Frame3: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 0 87 Frame4: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 0 88 Frame5: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 0 89 Frame6: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 0 90 Frame7: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 0 91 Frame8: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 0 92 93 FrameI_l1: I 0 0 0.442 0 0 0 0 0 0 0 1 94 Frame1_l1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 1 95 Frame2_l1: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 1 96 Frame3_l1: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 1 97 Frame4_l1: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 1 98 Frame5_l1: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 1 99 Frame6_l1: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 1 100 Frame7_l1: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 1 101 Frame8_l1: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 1 102 103 FrameI_l2: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 104 Frame1_l2: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 105 Frame2_l2: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 106 Frame3_l2: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 107 Frame4_l2: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 108 Frame5_l2: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 109 Frame6_l2: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 110 Frame7_l2: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 111 Frame8_l2: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 112 113 FrameI_l3: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 114 Frame1_l3: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 115 Frame2_l3: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 116 Frame3_l3: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 117 Frame4_l3: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 118 Frame5_l3: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 119 Frame6_l3: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 120 Frame7_l3: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 121 Frame8_l3: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 122 122 123 123 #=========== Motion Search ============= -
branches/HTM-13.1-dev0/cfg/3D-HEVC/baseCfg_2view.cfg
r1124 r1170 70 70 71 71 # QPfactor betaOffsetDiv2 #ref_pics_active reference pictures deltaRPS reference idcs ilPredLayerIdc refLayerPicPosIl_L1 72 # Type POC QPoffset tcOffsetDiv2 temporal_id #ref_pics predict #ref_idcs #ActiveRefLayerPics refLayerPicPosIl_L0 73 Frame1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 74 Frame2: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 75 Frame3: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 76 Frame4: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 77 Frame5: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 78 Frame6: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 79 Frame7: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 80 Frame8: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 81 82 FrameI_l1: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 83 Frame1_l1: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 84 Frame2_l1: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 85 Frame3_l1: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 86 Frame4_l1: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 87 Frame5_l1: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 88 Frame6_l1: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 89 Frame7_l1: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 90 Frame8_l1: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 72 # Type POC QPoffset tcOffsetDiv2 temporal_id #ref_pics predict #ref_idcs #ActiveRefLayerPics refLayerPicPosIl_L0 interCompPred 73 Frame1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 0 74 Frame2: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 0 75 Frame3: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 0 76 Frame4: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 0 77 Frame5: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 0 78 Frame6: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 0 79 Frame7: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 0 80 Frame8: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 0 81 82 FrameI_l1: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 0 83 Frame1_l1: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 0 84 Frame2_l1: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 0 85 Frame3_l1: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 0 86 Frame4_l1: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 0 87 Frame5_l1: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 0 88 Frame6_l1: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 0 89 Frame7_l1: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 0 90 Frame8_l1: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 0 91 91 92 92 #=========== Motion Search ============= -
branches/HTM-13.1-dev0/cfg/3D-HEVC/baseCfg_3view+depth.cfg
r1163 r1170 95 95 96 96 # QPfactor betaOffsetDiv2 #ref_pics_active reference pictures deltaRPS reference idcs ilPredLayerIdc refLayerPicPosIl_L1 97 # Type POC QPoffset tcOffsetDiv2 temporal_id #ref_pics predict #ref_idcs #ActiveRefLayerPics refLayerPicPosIl_L0 98 Frame1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 99 Frame2: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 100 Frame3: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 101 Frame4: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 102 Frame5: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 103 Frame6: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 104 Frame7: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 105 Frame8: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 106 107 FrameI_l1: I 0 0 0.442 0 0 0 0 0 0 0 108 Frame1_l1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 109 Frame2_l1: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 110 Frame3_l1: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 111 Frame4_l1: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 112 Frame5_l1: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 113 Frame6_l1: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 114 Frame7_l1: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 115 Frame8_l1: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 116 117 FrameI_l2: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 118 Frame1_l2: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 119 Frame2_l2: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 120 Frame3_l2: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 121 Frame4_l2: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 122 Frame5_l2: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 123 Frame6_l2: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 124 Frame7_l2: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 125 Frame8_l2: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 126 127 FrameI_l3: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 128 Frame1_l3: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 129 Frame2_l3: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 130 Frame3_l3: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 131 Frame4_l3: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 132 Frame5_l3: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 133 Frame6_l3: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 134 Frame7_l3: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 135 Frame8_l3: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 136 137 FrameI_l4: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 138 Frame1_l4: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 139 Frame2_l4: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 140 Frame3_l4: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 141 Frame4_l4: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 142 Frame5_l4: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 143 Frame6_l4: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 144 Frame7_l4: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 145 Frame8_l4: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 146 147 FrameI_l5: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 148 Frame1_l5: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 149 Frame2_l5: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 150 Frame3_l5: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 151 Frame4_l5: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 152 Frame5_l5: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 153 Frame6_l5: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 154 Frame7_l5: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 155 Frame8_l5: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 97 # Type POC QPoffset tcOffsetDiv2 temporal_id #ref_pics predict #ref_idcs #ActiveRefLayerPics refLayerPicPosIl_L0 interCompPred 98 Frame1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 0 99 Frame2: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 0 100 Frame3: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 0 101 Frame4: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 0 102 Frame5: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 0 103 Frame6: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 0 104 Frame7: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 0 105 Frame8: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 0 106 107 FrameI_l1: I 0 0 0.442 0 0 0 0 0 0 0 1 108 Frame1_l1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 1 109 Frame2_l1: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 1 110 Frame3_l1: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 1 111 Frame4_l1: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 1 112 Frame5_l1: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 1 113 Frame6_l1: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 1 114 Frame7_l1: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 1 115 Frame8_l1: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 1 116 117 FrameI_l2: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 118 Frame1_l2: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 119 Frame2_l2: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 120 Frame3_l2: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 121 Frame4_l2: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 122 Frame5_l2: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 123 Frame6_l2: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 124 Frame7_l2: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 125 Frame8_l2: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 126 127 FrameI_l3: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 128 Frame1_l3: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 129 Frame2_l3: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 130 Frame3_l3: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 131 Frame4_l3: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 132 Frame5_l3: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 133 Frame6_l3: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 134 Frame7_l3: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 135 Frame8_l3: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 136 137 FrameI_l4: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 138 Frame1_l4: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 139 Frame2_l4: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 140 Frame3_l4: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 141 Frame4_l4: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 142 Frame5_l4: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 143 Frame6_l4: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 144 Frame7_l4: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 145 Frame8_l4: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 146 147 FrameI_l5: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 148 Frame1_l5: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 149 Frame2_l5: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 150 Frame3_l5: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 151 Frame4_l5: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 152 Frame5_l5: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 153 Frame6_l5: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 154 Frame7_l5: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 155 Frame8_l5: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 156 156 157 157 #=========== Motion Search ============= -
branches/HTM-13.1-dev0/cfg/3D-HEVC/baseCfg_3view.cfg
r1124 r1170 80 80 81 81 # QPfactor betaOffsetDiv2 #ref_pics_active reference pictures deltaRPS reference idcs ilPredLayerIdc refLayerPicPosIl_L1 82 # Type POC QPoffset tcOffsetDiv2 temporal_id #ref_pics predict #ref_idcs #ActiveRefLayerPics refLayerPicPosIl_L0 83 84 Frame1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 85 Frame2: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 86 Frame3: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 87 Frame4: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 88 Frame5: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 89 Frame6: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 90 Frame7: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 91 Frame8: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 92 93 FrameI_l1: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 94 Frame1_l1: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 95 Frame2_l1: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 96 Frame3_l1: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 97 Frame4_l1: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 98 Frame5_l1: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 99 Frame6_l1: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 100 Frame7_l1: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 101 Frame8_l1: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 102 103 FrameI_l2: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 104 Frame1_l2: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 105 Frame2_l2: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 106 Frame3_l2: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 107 Frame4_l2: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 108 Frame5_l2: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 109 Frame6_l2: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 110 Frame7_l2: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 111 Frame8_l2: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 82 # Type POC QPoffset tcOffsetDiv2 temporal_id #ref_pics predict #ref_idcs #ActiveRefLayerPics refLayerPicPosIl_L0 interCompPred 83 84 Frame1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 0 85 Frame2: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 0 86 Frame3: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 0 87 Frame4: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 0 88 Frame5: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 0 89 Frame6: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 0 90 Frame7: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 0 91 Frame8: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 0 92 93 FrameI_l1: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 0 94 Frame1_l1: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 0 95 Frame2_l1: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 0 96 Frame3_l1: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 0 97 Frame4_l1: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 0 98 Frame5_l1: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 0 99 Frame6_l1: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 0 100 Frame7_l1: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 0 101 Frame8_l1: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 0 102 103 FrameI_l2: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 0 104 Frame1_l2: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 0 105 Frame2_l2: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 0 106 Frame3_l2: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 0 107 Frame4_l2: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 0 108 Frame5_l2: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 0 109 Frame6_l2: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 0 110 Frame7_l2: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 0 111 Frame8_l2: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 0 112 112 113 113 #=========== Motion Search ============= -
branches/HTM-13.1-dev0/cfg/3D-HEVC/deltaCfg_3view.cfg
r1124 r1170 45 45 46 46 47 FrameI_l1: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 48 Frame1_l1: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 49 Frame2_l1: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 50 Frame3_l1: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 51 Frame4_l1: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 52 Frame5_l1: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 53 Frame6_l1: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 54 Frame7_l1: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 55 Frame8_l1: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 47 FrameI_l1: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 48 Frame1_l1: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 49 Frame2_l1: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 50 Frame3_l1: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 51 Frame4_l1: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 52 Frame5_l1: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 53 Frame6_l1: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 54 Frame7_l1: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 55 Frame8_l1: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 56 56 57 57 FrameI_l3: -
branches/HTM-13.1-dev0/cfg/3D-HEVC/fullCfg.cfg
r1163 r1170 159 159 160 160 # QPfactor betaOffsetDiv2 #ref_pics_active reference pictures deltaRPS reference idcs ilPredLayerIdc refLayerPicPosIl_L1 161 # Type POC QPoffset tcOffsetDiv2 temporal_id #ref_pics predict #ref_idcs #ActiveRefLayerPics refLayerPicPosIl_L0 162 Frame1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 00163 Frame2: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 10164 Frame3: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 10165 Frame4: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 10166 Frame5: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 00167 Frame6: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0168 Frame7: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 10169 Frame8: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 00170 171 FrameI_l1: I 0 0 0.442 0 0 0 0 0 0 0172 Frame1_l1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0173 Frame2_l1: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0174 Frame3_l1: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0175 Frame4_l1: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0176 Frame5_l1: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0177 Frame6_l1: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0178 Frame7_l1: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0179 Frame8_l1: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0180 181 FrameI_l2: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 182 Frame1_l2: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 183 Frame2_l2: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 184 Frame3_l2: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 185 Frame4_l2: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 186 Frame5_l2: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 187 Frame6_l2: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 188 Frame7_l2: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 189 Frame8_l2: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 190 191 FrameI_l3: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 192 Frame1_l3: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 193 Frame2_l3: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 194 Frame3_l3: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 195 Frame4_l3: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 196 Frame5_l3: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 197 Frame6_l3: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 198 Frame7_l3: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 199 Frame8_l3: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 200 201 FrameI_l4: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 202 Frame1_l4: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 203 Frame2_l4: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 204 Frame3_l4: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 205 Frame4_l4: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 206 Frame5_l4: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 207 Frame6_l4: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 208 Frame7_l4: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 209 Frame8_l4: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 210 211 FrameI_l5: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 212 Frame1_l5: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 213 Frame2_l5: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 214 Frame3_l5: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 215 Frame4_l5: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 216 Frame5_l5: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 217 Frame6_l5: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 218 Frame7_l5: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 219 Frame8_l5: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 161 # Type POC QPoffset tcOffsetDiv2 temporal_id #ref_pics predict #ref_idcs #ActiveRefLayerPics refLayerPicPosIl_L0 interCompPred 162 Frame1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 0 163 Frame2: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 0 164 Frame3: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 0 165 Frame4: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 0 166 Frame5: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 0 167 Frame6: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 0 168 Frame7: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 0 169 Frame8: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 0 170 171 FrameI_l1: I 0 0 0.442 0 0 0 0 0 0 0 1 172 Frame1_l1: B 8 1 0.442 0 0 0 4 4 -8 -10 -12 -16 0 0 1 173 Frame2_l1: B 4 2 0.3536 0 0 0 2 3 -4 -6 4 1 4 5 1 1 0 0 1 0 1 174 Frame3_l1: B 2 3 0.3536 0 0 0 2 4 -2 -4 2 6 1 2 4 1 1 1 1 0 1 175 Frame4_l1: B 1 4 0.68 0 0 0 2 4 -1 1 3 7 1 1 5 1 0 1 1 1 0 1 176 Frame5_l1: B 3 4 0.68 0 0 0 2 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 0 1 177 Frame6_l1: B 6 3 0.3536 0 0 0 2 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 0 1 178 Frame7_l1: B 5 4 0.68 0 0 0 2 4 -1 -5 1 3 1 1 5 1 0 1 1 1 0 1 179 Frame8_l1: B 7 4 0.68 0 0 0 2 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 0 1 180 181 FrameI_l2: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 182 Frame1_l2: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 183 Frame2_l2: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 184 Frame3_l2: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 185 Frame4_l2: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 186 Frame5_l2: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 187 Frame6_l2: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 188 Frame7_l2: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 189 Frame8_l2: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 190 191 FrameI_l3: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 192 Frame1_l3: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 193 Frame2_l3: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 194 Frame3_l3: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 195 Frame4_l3: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 196 Frame5_l3: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 197 Frame6_l3: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 198 Frame7_l3: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 199 Frame8_l3: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 200 201 FrameI_l4: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 202 Frame1_l4: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 203 Frame2_l4: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 204 Frame3_l4: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 205 Frame4_l4: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 206 Frame5_l4: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 207 Frame6_l4: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 208 Frame7_l4: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 209 Frame8_l4: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 210 211 FrameI_l5: P 0 3 0.442 0 0 0 1 0 0 1 0 0 -1 1 212 Frame1_l5: B 8 4 0.442 0 0 0 4 4 -8 -10 -12 -16 0 1 0 1 -1 1 213 Frame2_l5: B 4 5 0.3536 0 0 0 3 3 -4 -6 4 1 4 5 1 1 0 0 1 1 0 1 -1 1 214 Frame3_l5: B 2 6 0.3536 0 0 0 3 4 -2 -4 2 6 1 2 4 1 1 1 1 1 0 1 -1 1 215 Frame4_l5: B 1 7 0.68 0 0 0 3 4 -1 1 3 7 1 1 5 1 0 1 1 1 1 0 1 -1 1 216 Frame5_l5: B 3 7 0.68 0 0 0 3 4 -1 -3 1 5 1 -2 5 1 1 1 1 0 1 0 2 -1 1 217 Frame6_l5: B 6 6 0.3536 0 0 0 3 4 -2 -4 -6 2 1 -3 5 1 1 1 1 0 1 0 2 -1 1 218 Frame7_l5: B 5 7 0.68 0 0 0 3 4 -1 -5 1 3 1 1 5 1 0 1 1 1 1 0 2 -1 1 219 Frame8_l5: B 7 7 0.68 0 0 0 3 4 -1 -3 -7 1 1 -2 5 1 1 1 1 0 1 0 2 -1 1 220 220 221 221 #=========== Motion Search ============= -
branches/HTM-13.1-dev0/source/App/TAppDecoder/TAppDecTop.cpp
r1084 r1170 248 248 { 249 249 m_tDecTop[decIdx]->setTargetOptLayerSetIdx( m_targetOptLayerSetIdx ); 250 m_tDecTop[decIdx]->setProfileIdc( ); 250 251 } 251 252 … … 1050 1051 m_tDecTop[ decIdx ]->setLayerInitilizedFlags( m_layerInitilizedFlags ); 1051 1052 m_tDecTop[ decIdx ]->setTargetOptLayerSetIdx( m_targetOptLayerSetIdx ); 1053 m_tDecTop[ decIdx ]->setProfileIdc ( ); 1052 1054 1053 1055 #if H_3D -
branches/HTM-13.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp
r1166 r1170 224 224 in>>entry.m_interViewRefPosL[1][i]; 225 225 } 226 #endif 227 #if HHI_INTER_COMP_PRED_K0052 228 #if H_3D 229 in>>entry.m_interCompPredFlag; 230 #endif 226 231 #endif 227 232 return in; -
branches/HTM-13.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp
r1169 r1170 204 204 } 205 205 #endif 206 207 206 for(Int layerIdInVps = 0; layerIdInVps < m_numberOfLayers; layerIdInVps++) 208 207 { … … 644 643 } 645 644 #endif 645 #if H_3D_ANNEX_SELECTION_FIX 646 #if H_3D 647 /// SET Profiles 648 for(Int layerIdInVps = 0; layerIdInVps < m_numberOfLayers; layerIdInVps++) 649 { 650 Int profileIdc = -1; 651 for (Int olsIdx = 0; olsIdx < vps.getNumOutputLayerSets(); olsIdx++ ) 652 { 653 Int lsIdx = vps.olsIdxToLsIdx( olsIdx ); 654 for(Int i = 0; i < vps.getNumLayersInIdList( lsIdx ); i++ ) 655 { 656 if( vps.getLayerIdInNuh( layerIdInVps) == vps.getLayerSetLayerIdList(lsIdx, i) ) 657 { 658 Int ptlIdx = vps.getProfileTierLevelIdx( olsIdx, i ); 659 if ( ptlIdx != -1 ) 660 { 661 Int curProfileIdc = vps.getPTL(ptlIdx)->getGeneralPTL()->getProfileIdc(); 662 if (profileIdc == -1) 663 { 664 profileIdc = curProfileIdc; 665 } 666 else 667 { 668 if ( profileIdc != curProfileIdc ) 669 { 670 fprintf(stderr, "Error: ProfileIdc for layer with index %d in VPS not equal in all OLSs. \n", layerIdInVps ); 671 exit(EXIT_FAILURE); 672 } 673 } 674 } 675 } 676 } 677 } 678 if (profileIdc == -1 ) 679 { 680 fprintf(stderr, "Error: No profile given for layer with index %d in VPS not equal in all OLS. \n", layerIdInVps ); 681 exit(EXIT_FAILURE); 682 } 683 m_acTEncTopList[ layerIdInVps ]->setProfileIdc( profileIdc ); 684 } 685 #endif 686 #endif 646 687 #if H_3D_VSO 647 688 if ( m_bUseVSO ) … … 1337 1378 1338 1379 assert( m_iNumberOfViews == vps.getNumViews() ); 1380 1381 1382 #if HHI_INTER_COMP_PRED_K0052 1383 #if H_3D 1384 vps.initViewCompLayer( ); 1385 #endif 1386 #endif 1339 1387 } 1340 1388 … … 1426 1474 #endif 1427 1475 { 1476 #if !HHI_INTER_COMP_PRED_K0052 1428 1477 Bool refAlwaysIntra = ( i == getGOPSize() ) && ( m_iIntraPeriod[ curLayerIdInVps ] % m_iIntraPeriod[ refLayerIdInVps ] == 0 ); 1478 #endif 1429 1479 Bool refLayerZero = ( i == getGOPSize() ) && ( refLayerIdInVps == 0 ); 1480 #if HHI_INTER_COMP_PRED_K0052 1481 // refAlwaysIntra actually not needed, since TemporalIds need to be aligned within an AU. 1482 // Thus, reference pictures of IRAP pictures have TemporalId equal to 0. 1483 maxTid = std::max( maxTid, refLayerZero ? 0 : geRef.m_temporalId ); 1484 #else 1430 1485 maxTid = std::max( maxTid, ( refAlwaysIntra || refLayerZero ) ? 0 : geRef.m_temporalId ); 1486 #endif 1431 1487 } 1432 1488 } … … 1436 1492 else 1437 1493 { 1494 #if HHI_INTER_COMP_PRED_K0052 1495 if( m_depthFlag[ curLayerIdInVps ] && ( m_mpiFlag|| m_qtPredFlag || m_intraContourFlag ) ) 1496 { 1497 Int nuhLayerIdTex = vps.getLayerIdInNuh( vps.getViewIndex( curLayerIdInNuh ), false ); 1498 if ( nuhLayerIdTex == refLayerIdInNuh ) 1499 { 1500 for( Int i = 0; i < ( getGOPSize() + 1); i++ ) 1501 { 1502 GOPEntry geCur = m_GOPListMvc[curLayerIdInVps][( i < getGOPSize() ? i : MAX_GOP )]; 1503 GOPEntry geRef = m_GOPListMvc[refLayerIdInVps][( i < getGOPSize() ? i : MAX_GOP )]; 1504 if ( geCur.m_interCompPredFlag ) 1505 { 1506 Bool refLayerZero = ( i == getGOPSize() ) && ( refLayerIdInVps == 0 ); 1507 maxTid = std::max( maxTid, refLayerZero ? 0 : geRef.m_temporalId ); 1508 } 1509 } 1510 } 1511 } 1512 if( !m_depthFlag[ curLayerIdInVps ] && vps.getNumRefListLayers( curLayerIdInNuh) > 0 && ( m_depthRefinementFlag || m_viewSynthesisPredFlag || m_depthBasedBlkPartFlag ) ) 1513 { 1514 for( Int i = 0; i < ( getGOPSize() + 1); i++ ) 1515 { 1516 GOPEntry geCur = m_GOPListMvc[curLayerIdInVps][( i < getGOPSize() ? i : MAX_GOP )]; 1517 GOPEntry geRef = m_GOPListMvc[refLayerIdInVps][( i < getGOPSize() ? i : MAX_GOP )]; 1518 1519 if ( geCur.m_interCompPredFlag ) 1520 { 1521 for (Int j = 0; j < geCur.m_numActiveRefLayerPics; j++ ) 1522 { 1523 Int nuhLayerIdDep = vps.getLayerIdInNuh( vps.getViewIndex( vps.getIdRefListLayer( curLayerIdInNuh, geCur.m_interLayerPredLayerIdc[j] ) ), true ); 1524 if ( nuhLayerIdDep == refLayerIdInNuh ) 1525 { 1526 Bool refLayerZero = ( i == getGOPSize() ) && ( refLayerIdInVps == 0 ); 1527 maxTid = std::max( maxTid, refLayerZero ? 0 : geRef.m_temporalId ); 1528 } 1529 } 1530 } 1531 } 1532 } 1533 #else 1438 1534 if( m_depthFlag[ curLayerIdInVps ] && ( m_mpiFlag|| m_qtPredFlag || m_intraContourFlag ) ) 1439 1535 { … … 1466 1562 } 1467 1563 } 1564 #endif 1468 1565 } 1469 } 1566 } // if ( vps.getDirectDependencyFlag( curLayerIdInVps, refLayerIdInVps ) ) 1470 1567 vps.setMaxTidIlRefPicsPlus1( refLayerIdInVps, curLayerIdInVps, maxTid + 1 ); 1471 1568 #endif 1472 } 1473 } 1569 } // Loop curLayerIdInVps 1570 } // Loop refLayerIdInVps 1474 1571 1475 1572 // Max temporal id for inter layer reference pictures presence flag -
branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComSlice.cpp
r1163 r1170 137 137 #endif 138 138 #if H_3D 139 #if HHI_INTER_COMP_PRED_K0052 140 , m_inCmpPredFlag ( false ) 141 #endif 139 142 , m_depthToDisparityB ( NULL ) 140 143 , m_depthToDisparityF ( NULL ) … … 185 188 m_iDefaultRefViewIdx = -1; 186 189 m_bDefaultRefViewIdxAvailableFlag = false; 190 #if HHI_INTER_COMP_PRED_K0052 191 m_ivMvPredFlag = false; 192 m_ivMvScalingFlag = false; 193 m_ivResPredFlag = false; 194 m_depthRefinementFlag = false; 195 m_viewSynthesisPredFlag = false; 196 m_depthBasedBlkPartFlag = false; 197 m_mpiFlag = false; 198 m_intraContourFlag = false; 199 m_intraSdcWedgeFlag = false; 200 m_qtPredFlag = false; 201 m_interSdcFlag = false; 202 m_depthIntraSkipFlag = false; 203 m_subPbSize = 1 << 6; 204 m_mpiSubPbSize = 1 << 6; 205 #endif 187 206 } 188 207 … … 2155 2174 { 2156 2175 m_numViews = 1; 2157 #if HHI_VIEW_ID_LIST_I5_J0107 2176 #if HHI_VIEW_ID_LIST_I5_J0107 || HHI_INTER_COMP_PRED_K0052 2158 2177 #if H_3D 2159 2178 AOF( m_viewOIdxList.size() == 0 ); 2179 2160 2180 m_viewOIdxList.push_back( 0 ); 2161 2181 #endif … … 2178 2198 { 2179 2199 m_numViews++; 2180 #if HHI_VIEW_ID_LIST_I5_J0107 2200 #if HHI_VIEW_ID_LIST_I5_J0107 || HHI_INTER_COMP_PRED_K0052 2181 2201 #if H_3D 2182 2202 m_viewOIdxList.push_back( getViewOrderIdx( lId ) ); … … 4031 4051 4032 4052 #if H_3D 4033 4034 4053 Void TComSlice::init3dToolParameters() 4035 4054 { 4036 4055 Bool depthFlag = getIsDepth(); 4037 4056 4057 #if !HHI_INTER_COMP_PRED_K0052 4038 4058 Bool depthOfRefViewsAvailFlag = false; 4039 4059 Bool textOfCurViewAvailFlag = false; 4040 4060 #endif 4061 4062 4063 4064 #if !HHI_INTER_COMP_PRED_K0052 4041 4065 TComVPS* vps = getVPS(); 4042 4066 … … 4080 4104 } 4081 4105 } 4106 4082 4107 4083 4108 Bool lidG0 = ( getLayerId() > 0 ); … … 4105 4130 m_subPbSize = lidG0 ? ( 1 << ( sps3dExt->getLog2SubPbSizeMinus3 ( depthFlag ) + 3 ) ) : getSPS()->getMaxCUWidth(); 4106 4131 m_mpiSubPbSize = 1 << ( sps3dExt->getLog2MpiSubPbSizeMinus3( depthFlag ) + 3 ); 4132 #else 4133 Bool nRLLG0 = ( getVPS()->getNumRefListLayers( getLayerId() ) > 0 ); 4134 4135 TComSps3dExtension* sps3dExt = getSPS()->getSps3dExtension(); 4136 4137 m_ivMvPredFlag = sps3dExt->getIvMvPredFlag ( depthFlag ) && nRLLG0 ; 4138 m_ivMvScalingFlag = sps3dExt->getIvMvScalingFlag ( depthFlag ) ; 4139 m_ivResPredFlag = sps3dExt->getIvResPredFlag ( depthFlag ) && nRLLG0 ; 4140 m_depthRefinementFlag = sps3dExt->getDepthRefinementFlag ( depthFlag ) && getInCompPredFlag(); 4141 m_viewSynthesisPredFlag = sps3dExt->getViewSynthesisPredFlag( depthFlag ) && nRLLG0 && getInCompPredFlag(); 4142 m_depthBasedBlkPartFlag = sps3dExt->getDepthBasedBlkPartFlag( depthFlag ) && getInCompPredFlag(); 4143 m_mpiFlag = sps3dExt->getMpiFlag ( depthFlag ) && getInCompPredFlag(); 4144 m_intraContourFlag = sps3dExt->getIntraContourFlag ( depthFlag ) && getInCompPredFlag(); 4145 m_intraSdcWedgeFlag = sps3dExt->getIntraSdcWedgeFlag ( depthFlag ) ; 4146 m_qtPredFlag = sps3dExt->getQtPredFlag ( depthFlag ) && getInCompPredFlag(); 4147 m_interSdcFlag = sps3dExt->getInterSdcFlag ( depthFlag ) ; 4148 m_depthIntraSkipFlag = sps3dExt->getDepthIntraSkipFlag ( depthFlag ) ; 4149 4150 m_subPbSize = 1 << ( sps3dExt->getLog2SubPbSizeMinus3 ( depthFlag ) + 3 ); 4151 m_mpiSubPbSize = 1 << ( sps3dExt->getLog2MpiSubPbSizeMinus3( depthFlag ) + 3 ); 4152 4153 #endif 4107 4154 4108 4155 #if H_3D_OUTPUT_ACTIVE_TOOLS … … 4110 4157 std::cout << "DepthFlag: :" << getIsDepth() << std::endl; 4111 4158 std::cout << "ViewOrderIdx: :" << getViewIndex() << std::endl; 4159 #if HHI_INTER_COMP_PRED_K0052 4160 std::cout << "InterCmpPredAvailableFlag:" << getInCmpPredAvailFlag() << std::endl; 4161 std::cout << "InterCompPredFlag :" << getInCompPredFlag() << std::endl; 4162 //std::cout << "TextOfCurViewAvailFlag :" << textOfCurViewAvailFlag << std::endl; 4163 #else 4112 4164 std::cout << "DepthOfRefViewsAvailFlag:" << depthOfRefViewsAvailFlag << std::endl; 4113 4165 std::cout << "TextOfCurViewAvailFlag :" << textOfCurViewAvailFlag << std::endl; 4166 #endif 4114 4167 4115 4168 std::cout << "ivMvPredFlag :" << m_ivMvPredFlag << std::endl; -
branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComSlice.h
r1169 r1170 920 920 Int ***m_aaaiCodedOffset; 921 921 922 #if HHI_VIEW_ID_LIST_I5_J0107 922 #if HHI_VIEW_ID_LIST_I5_J0107 || HHI_INTER_COMP_PRED_K0052 923 923 std::vector<Int> m_viewOIdxList; 924 924 #endif 925 925 #if HHI_INTER_COMP_PRED_K0052 926 std::vector< std::vector<Bool> > m_viewCompLayerPresentFlag; 927 std::vector< std::vector<Int> > m_viewCompLayerId; 928 #endif 926 929 #endif 927 930 … … 1152 1155 Int getNumViews() { return m_numViews; } 1153 1156 Void initNumViews(); 1154 #if HHI_VIEW_ID_LIST_I5_J0107 1157 #if HHI_INTER_COMP_PRED_K0052 1158 #if H_3D 1159 Void initViewCompLayer( ) 1160 { 1161 assert( m_viewCompLayerId.size() == 0 && m_viewCompLayerPresentFlag.size() == 0 ); 1162 for( Int i = 0; i < getNumViews(); i++ ) 1163 { 1164 m_viewCompLayerId .push_back( std::vector<Int>(0) ); 1165 m_viewCompLayerPresentFlag.push_back( std::vector<Bool>(0) ); 1166 1167 for( Int depFlag = 0; depFlag <= 1; depFlag++ ) 1168 { 1169 Int iViewOIdx = getViewOIdxList( i ); 1170 Int layerId = -1; 1171 for( Int j = 0; j <= getMaxLayersMinus1(); j++ ) 1172 { 1173 Int jNuhLId = getLayerIdInNuh( j ); 1174 if( getVpsDepthFlag( jNuhLId ) == ( (Bool) depFlag ) && getViewOrderIdx( jNuhLId ) == iViewOIdx 1175 && getDependencyId( jNuhLId ) == 0 && getAuxId( jNuhLId ) == 0 ) 1176 { 1177 layerId = jNuhLId; 1178 } 1179 } 1180 m_viewCompLayerPresentFlag[ i ].push_back( layerId != -1 ); 1181 m_viewCompLayerId [ i ].push_back( layerId ); 1182 } 1183 } 1184 }; 1185 #endif 1186 #endif 1187 1188 #if HHI_VIEW_ID_LIST_I5_J0107 || HHI_INTER_COMP_PRED_K0052 1155 1189 Int getViewOIdxList( Int i ) { return m_viewOIdxList[i]; } 1156 1190 #endif 1157 1191 #if HHI_INTER_COMP_PRED_K0052 1192 Int getInvViewOIdxList( Int viewOIdx ) 1193 { 1194 for ( Int i = 0; i < m_viewOIdxList.size(); i++ ) 1195 { 1196 if ( m_viewOIdxList[ i ] == viewOIdx ) 1197 { 1198 return i; 1199 } 1200 } 1201 assert( 0 ); 1202 return -1; 1203 }; 1204 Bool getViewCompLayerPresentFlag (Int i, Bool d ) { return m_viewCompLayerPresentFlag[ getInvViewOIdxList(i) ][d]; } 1205 Bool getViewCompLayerId (Int i, Bool d ) { return m_viewCompLayerId [ getInvViewOIdxList(i) ][d]; } 1206 #endif 1158 1207 Bool getDependencyFlag( Int i, Int j ) { return m_dependencyFlag[i][j]; } 1159 1208 Int getNumDirectRefLayers( Int layerIdInNuh ) { return m_numDirectRefLayers[ layerIdInNuh ]; }; … … 2390 2439 #endif 2391 2440 #if H_3D 2441 #if HHI_INTER_COMP_PRED_K0052 2442 std::vector<Int> m_inCmpRefViewIdcs; 2443 Bool m_inCmpPredAvailFlag; 2444 Bool m_inCmpPredFlag; 2445 #endif 2392 2446 TComPic* m_ivPicsCurrPoc [2][MAX_NUM_LAYERS]; 2393 2447 Int** m_depthToDisparityB; … … 2492 2546 Int getRefPOC ( RefPicList e, Int iRefIdx) { return m_aiRefPOCList[e][iRefIdx]; } 2493 2547 #if H_3D 2548 #if HHI_INTER_COMP_PRED_K0052 2549 Bool getInCmpPredAvailFlag( ) { return m_inCmpPredAvailFlag; } 2550 Bool getInCompPredFlag( ) { return m_inCmpPredFlag; } 2551 Void setInCompPredFlag( Bool b ) { m_inCmpPredFlag = b; } 2552 Int getInCmpRefViewIdcs( Int i ) { return m_inCmpRefViewIdcs [i]; } 2553 Int getNumCurCmpLIds( ) { return (Int) m_inCmpRefViewIdcs.size(); } 2554 #endif 2494 2555 TComPic* getIvPic ( Bool depthFlag, Int viewIndex){ return m_ivPicsCurrPoc[ depthFlag ? 1 : 0 ][ viewIndex ]; } 2495 2556 #endif … … 2593 2654 UInt getTLayer () { return m_uiTLayer; } 2594 2655 Void setTLayer ( UInt uiTLayer ) { m_uiTLayer = uiTLayer; } 2656 #if H_MV 2657 Int getTemporalId ( ) { return (Int) m_uiTLayer; } 2658 #endif 2595 2659 2596 2660 Void setTLayerInfo( UInt uiTLayer ); … … 2835 2899 #if H_3D 2836 2900 // 3D-HEVC tool parameters 2901 #if HHI_INTER_COMP_PRED_K0052 2902 Void deriveInCmpPredAndCpAvailFlag() 2903 { 2904 Int numCurCmpLIds = getIsDepth() ? 1 : getNumActiveRefLayerPics(); 2905 std::vector<Int> curCmpLIds; 2906 if ( getIsDepth() ) 2907 { 2908 curCmpLIds.push_back( getLayerId() ); 2909 } 2910 else 2911 { 2912 for (Int i = 0; i < numCurCmpLIds; i++) 2913 { 2914 curCmpLIds.push_back( getRefPicLayerId( i ) ); 2915 } 2916 } 2917 2918 // m_cpAvailableFlag = true; 2919 Bool allRefCmpLayersAvailFlag = true; 2920 2921 for( Int i = 0; i <= numCurCmpLIds - 1; i++ ) 2922 { 2923 m_inCmpRefViewIdcs.push_back( getVPS()->getViewOrderIdx( curCmpLIds[ i ] )); 2924 //if( !getVPS()->getCpPresentFlag( getViewIdx(), inCmpRefViewIdcs( i ) ) ) 2925 //{ 2926 // m_cpAvailableFlag = false; 2927 //} 2928 Bool refCmpCurLIdAvailFlag = false; 2929 if( getVPS()->getViewCompLayerPresentFlag( m_inCmpRefViewIdcs[ i ], !getIsDepth() ) ) 2930 { 2931 Int j = getVPS()->getLayerIdInVps( getVPS()->getViewCompLayerId( m_inCmpRefViewIdcs[ i ], !getIsDepth() ) ); 2932 if ( getVPS()->getDirectDependencyFlag( getVPS()->getLayerIdInVps( getLayerId() ) , j ) && 2933 getVPS()->getSubLayersVpsMaxMinus1( j ) >= getTemporalId() && 2934 ( getTemporalId() == 0 || getVPS()->getMaxTidIlRefPicsPlus1( j , getVPS()->getLayerIdInVps( getLayerId() ) ) > getTemporalId() ) 2935 ) 2936 { 2937 refCmpCurLIdAvailFlag = true; 2938 } 2939 } 2940 if( !refCmpCurLIdAvailFlag ) 2941 { 2942 allRefCmpLayersAvailFlag = false; 2943 } 2944 } 2945 2946 if( !allRefCmpLayersAvailFlag ) 2947 { 2948 m_inCmpPredAvailFlag = false; 2949 } 2950 else 2951 { 2952 TComSps3dExtension* sps3dExt = getSPS()->getSps3dExtension(); 2953 if( !getIsDepth() ) 2954 { 2955 m_inCmpPredAvailFlag = sps3dExt->getViewSynthesisPredFlag( getIsDepth() ) || 2956 sps3dExt->getDepthBasedBlkPartFlag( getIsDepth() ) || 2957 sps3dExt->getDepthRefinementFlag ( getIsDepth() ); 2958 } 2959 else 2960 { 2961 m_inCmpPredAvailFlag = sps3dExt->getIntraContourFlag( getIsDepth() ) || 2962 sps3dExt->getQtPredFlag( getIsDepth() ) || 2963 sps3dExt->getMpiFlag( getIsDepth() ); 2964 } 2965 } 2966 }; 2967 2968 #endif 2969 2837 2970 Void init3dToolParameters(); 2971 #if HHI_INTER_COMP_PRED_K0052 2972 Void checkInCompPredRefLayers() 2973 { 2974 if ( getInCompPredFlag() ) 2975 { 2976 for (Int i = 0; i < getNumCurCmpLIds(); i++ ) 2977 { 2978 assert( getIvPic(!getIsDepth(), getInCmpRefViewIdcs( i ) ) != NULL ); 2979 // It is a requirement of bitstream conformance that there 2980 // is a picture in the DPB with PicOrderCntVal equal to the PicOrderCntVal of the current picture, 2981 // and a nuh_layer_id value equal to ViewCompLayerId[ inCmpRefViewIdcs[ i ] ][ !DepthFlag ]. 2982 } 2983 } 2984 }; 2985 2986 #endif 2838 2987 Bool getIvMvPredFlag ( ) { return m_ivMvPredFlag ; }; 2839 2988 Bool getIvMvScalingFlag ( ) { return m_ivMvScalingFlag ; }; -
branches/HTM-13.1-dev0/source/Lib/TLibCommon/TypeDef.h
r1169 r1170 81 81 82 82 #if H_MV 83 #define H_MV_ENC_DEC_TRAC 0//< CU/PU level tracking83 #define H_MV_ENC_DEC_TRAC 1 //< CU/PU level tracking 84 84 #endif 85 85 86 86 #if H_3D 87 87 #define SEC_DEPTH_INTRA_SKIP_MODE_K0033 1 // Depth intra skip mode 88 88 89 #if SEC_DEPTH_INTRA_SKIP_MODE_K0033 89 90 #define NEIGHBORING_PIX_AVAILABILITY_FIX 1 … … 331 332 #if H_3D 332 333 #define HHI_VIEW_ID_LIST_I5_J0107 0 334 #define HHI_INTER_COMP_PRED_K0052 1 335 #define H_3D_ANNEX_SELECTION_FIX 1 336 333 337 #endif 334 338 #define H_MV_FIX_REF_LAYER_PIC_FLAG 1 -
branches/HTM-13.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp
r1169 r1170 39 39 #include "SEIread.h" 40 40 #include "TDecSlice.h" 41 41 #if H_3D_ANNEX_SELECTION_FIX 42 #include "TDecTop.h" 43 #endif 42 44 //! \ingroup TLibDecoder 43 45 //! \{ … … 1330 1332 } 1331 1333 1334 #if HHI_INTER_COMP_PRED_K0052 1335 #if H_3D 1336 pcVPS->initViewCompLayer( ); 1337 #endif 1338 #endif 1332 1339 1333 1340 for( Int i = 1; i <= pcVPS->getMaxLayersMinus1(); i++ ) … … 2028 2035 #endif 2029 2036 rpcSlice->setSPS(sps); 2037 #if !HHI_INTER_COMP_PRED_K0052 2030 2038 #if H_3D 2031 2039 rpcSlice->init3dToolParameters(); 2040 #endif 2032 2041 #endif 2033 2042 rpcSlice->setPPS(pps); … … 2424 2433 } 2425 2434 } 2435 #if HHI_INTER_COMP_PRED_K0052 2436 #if H_3D 2437 if ( getDecTop()->decProcAnnexI() ) 2438 { 2439 rpcSlice->deriveInCmpPredAndCpAvailFlag(); 2440 if ( rpcSlice->getInCmpPredAvailFlag() ) 2441 { 2442 READ_FLAG(uiCode, "in_comp_pred_flag"); rpcSlice->setInCompPredFlag((Bool)uiCode); 2443 } 2444 rpcSlice->init3dToolParameters(); 2445 } 2446 #endif 2447 #endif 2426 2448 #endif 2427 2449 if(sps->getUseSAO()) … … 2605 2627 } 2606 2628 #if H_3D_IC 2629 #if H_3D_ANNEX_SELECTION_FIX 2630 else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) 2631 && !rpcSlice->getIsDepth() && vps->getNumRefListLayers( layerId ) > 0 2632 && getDecTop()->decProcAnnexI() 2633 ) 2634 #else 2607 2635 else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) && !rpcSlice->getIsDepth() && vps->getNumRefListLayers( layerId ) > 0 ) 2636 #endif 2608 2637 { 2609 2638 UInt uiCodeTmp = 0; -
branches/HTM-13.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.h
r1163 r1170 52 52 // Class definition 53 53 // ==================================================================================================================== 54 #if H_3D_ANNEX_SELECTION_FIX 55 class TDecTop; 56 #endif 54 57 55 58 /// CAVLC decoder class … … 67 70 Int** m_aaiTempOffset; 68 71 #endif 72 #if H_3D_ANNEX_SELECTION_FIX 73 TDecTop* m_decTop; 74 #endif 75 69 76 70 77 public: … … 108 115 Void parsePPS ( TComPPS* pcPPS); 109 116 #endif 110 117 #if H_3D_ANNEX_SELECTION_FIX 118 Void setDecTop ( TDecTop* decTop ) { m_decTop = decTop; }; 119 #endif 111 120 Void parseVUI ( TComVUI* pcVUI, TComSPS* pcSPS ); 112 121 Void parseSEI ( SEIMessages& ); … … 170 179 Void parseScalingList ( TComScalingList* scalingList ); 171 180 Void xDecodeScalingList ( TComScalingList *scalingList, UInt sizeId, UInt listId); 181 182 #if H_3D_ANNEX_SELECTION_FIX 183 TDecTop* getDecTop() { return m_decTop; }; 184 #endif 185 172 186 protected: 173 187 Bool xMoreRbspData(); -
branches/HTM-13.1-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp
r1169 r1170 547 547 548 548 #if H_MV_ENC_DEC_TRAC 549 #if ENC_DEC_TRACE 549 550 UInt uiLPelX = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ]; 550 551 UInt uiTPelY = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ]; … … 555 556 DTRACE_TU("log2TrafoSize", g_uiMaxCUWidth>>uiDepth) 556 557 DTRACE_TU("trafoDepth" , uiDepth) 558 #endif 557 559 #endif 558 560 -
branches/HTM-13.1-dev0/source/Lib/TLibDecoder/TDecGop.cpp
r1084 r1170 92 92 m_pcSliceDecoder = pcSliceDecoder; 93 93 m_pcLoopFilter = pcLoopFilter; 94 m_pcSAO = pcSAO; 94 m_pcSAO = pcSAO; 95 95 } 96 96 -
branches/HTM-13.1-dev0/source/Lib/TLibDecoder/TDecGop.h
r872 r1170 56 56 #include "TDecBinCoderCABAC.h" 57 57 58 58 59 //! \ingroup TLibDecoder 59 60 //! \{ … … 62 63 // Class definition 63 64 // ==================================================================================================================== 65 #if H_3D_ANNEX_SELECTION_FIX 66 class TDecTop; 67 #endif 68 64 69 65 70 /// GOP decoder class … … 78 83 TDecSlice* m_pcSliceDecoder; 79 84 TComLoopFilter* m_pcLoopFilter; 85 #if H_3D_ANNEX_SELECTION_FIX 86 TDecTop* m_decTop; 87 #endif 80 88 81 89 TComSampleAdaptiveOffset* m_pcSAO; -
branches/HTM-13.1-dev0/source/Lib/TLibDecoder/TDecTop.cpp
r1164 r1170 418 418 initROM(); 419 419 #endif 420 #if H_3D_ANNEX_SELECTION_FIX 421 m_cCavlcDecoder.setDecTop( this ); 422 #endif 420 423 m_cGopDecoder.init( &m_cEntropyDecoder, &m_cSbacDecoder, &m_cBinCABAC, &m_cCavlcDecoder, &m_cSliceDecoder, &m_cLoopFilter, &m_cSAO ); 421 424 m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder ); … … 727 730 #endif 728 731 #if H_3D 732 #if !HHI_INTER_COMP_PRED_K0052 729 733 m_apcSlicePilot->init3dToolParameters(); 734 #endif 730 735 #endif 731 736 pps->setSPS(sps); … … 1125 1130 #if H_3D 1126 1131 pcSlice->setIvPicLists( m_ivPicLists ); 1132 1133 #if HHI_INTER_COMP_PRED_K0052 1134 pcSlice->checkInCompPredRefLayers(); 1127 1135 #if H_3D_IV_MERGE 1128 1136 #if H_3D_FCO … … 1132 1140 #endif 1133 1141 #endif 1142 #else 1143 #if H_3D_IV_MERGE 1144 #if H_3D_FCO 1145 //assert( !getIsDepth() ); 1146 #else 1147 assert( !getIsDepth() || ( pcSlice->getTexturePic() != 0 ) ); 1148 #endif 1149 #endif 1150 #endif 1134 1151 #endif 1135 1152 #if H_MV -
branches/HTM-13.1-dev0/source/Lib/TLibDecoder/TDecTop.h
r1133 r1170 243 243 CamParsCollector* m_pcCamParsCollector; 244 244 #endif 245 #if H_3D_ANNEX_SELECTION_FIX 246 Int m_profileIdc; 247 #endif 245 248 #endif 246 249 … … 301 304 Void setCamParsCollector( CamParsCollector* pcCamParsCollector ) { m_pcCamParsCollector = pcCamParsCollector; } 302 305 #endif 306 #if H_3D_ANNEX_SELECTION_FIX 307 Void setProfileIdc() 308 { 309 if (m_targetOptLayerSetIdx != -1 ) 310 { 311 TComVPS* vps = getPrefetchedVPS(); 312 Int lsIdx = vps->olsIdxToLsIdx( m_targetOptLayerSetIdx ); 313 Int lIdx = -1; 314 for (Int j = 0; j < vps->getNumLayersInIdList( lsIdx ); j++ ) 315 { 316 if ( vps->getLayerSetLayerIdList( lsIdx, j ) == getLayerId() ) 317 { 318 lIdx = j; 319 break; 320 } 321 } 322 assert( lIdx != -1 ); 323 324 Int profileIdc = vps->getPTL( vps->getProfileTierLevelIdx( m_targetOptLayerSetIdx, lIdx ) )->getGeneralPTL()->getProfileIdc(); 325 assert( profileIdc == 1 || profileIdc == 6 || profileIdc == 8 ); 326 m_profileIdc = profileIdc; 327 }; 328 } 329 Bool decProcAnnexI() { assert( m_profileIdc != -1 ); return ( m_profileIdc == 8); } 330 #endif 331 303 332 #endif 304 333 protected: -
branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp
r1169 r1170 40 40 #include "SEIwrite.h" 41 41 #include "../TLibCommon/TypeDef.h" 42 42 #if H_3D_ANNEX_SELECTION_FIX 43 #include "TEncTop.h" 44 #endif 43 45 //! \ingroup TLibEncoder 44 46 //! \{ 47 45 48 46 49 #if ENC_DEC_TRACE … … 899 902 WRITE_FLAG( sps3dExt->getInterSdcFlag( d ) ? 1 : 0 , "inter_sdc_flag" ); 900 903 #if SEC_DEPTH_INTRA_SKIP_MODE_K0033 901 WRITE_FLAG( sps3dExt->getDepthIntraSkipFlag( d ) ? 1 : 0 , " depth_intra_skip_flag" );904 WRITE_FLAG( sps3dExt->getDepthIntraSkipFlag( d ) ? 1 : 0 , "intra_skip_flag" ); 902 905 #else 903 906 WRITE_FLAG( sps3dExt->getIntraSingleFlag( d ) ? 1 : 0 , "intra_single_flag" ); … … 1913 1916 } 1914 1917 #endif 1918 1919 #if HHI_INTER_COMP_PRED_K0052 1920 #if H_3D 1921 if( getEncTop()->decProcAnnexI() ) 1922 { 1923 if ( pcSlice->getInCmpPredAvailFlag() ) 1924 { 1925 WRITE_FLAG( pcSlice->getInCompPredFlag(), "in_comp_pred_flag" ); 1926 } 1927 } 1928 #endif 1929 #endif 1915 1930 if(pcSlice->getSPS()->getUseSAO()) 1916 1931 { … … 2043 2058 } 2044 2059 #if H_3D_IC 2060 #if H_3D_ANNEX_SELECTION_FIX 2061 else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) 2062 && !pcSlice->getIsDepth() && vps->getNumRefListLayers( layerId ) > 0 2063 && getEncTop()->decProcAnnexI() 2064 ) 2065 #else 2045 2066 else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth() && vps->getNumRefListLayers( layerId ) > 0 ) 2067 #endif 2046 2068 { 2047 2069 WRITE_FLAG( pcSlice->getApplyIC() ? 1 : 0, "slice_ic_enable_flag" ); -
branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncCavlc.h
r1163 r1170 68 68 TComSlice* m_pcSlice; 69 69 UInt m_uiCoeffCost; 70 70 #if H_3D_ANNEX_SELECTION_FIX 71 TEncTop* m_encTop; 72 #endif 71 73 Void codeShortTermRefPicSet ( TComSPS* pcSPS, TComReferencePictureSet* pcRPS, Bool calledFromSliceHeader, Int idx ); 72 74 Bool findMatchingLTRP ( TComSlice* pcSlice, UInt *ltrpsIndex, Int ltrpPOC, Bool usedFlag ); … … 185 187 Void codeDFFlag ( UInt uiCode, const Char *pSymbolName ); 186 188 Void codeDFSvlc ( Int iCode, const Char *pSymbolName ); 187 189 #if H_3D_ANNEX_SELECTION_FIX 190 TEncTop* getEncTop() { return m_encTop; }; 191 Void setEncTop( TEncTop* et ) { m_encTop = et; }; 192 #endif 188 193 }; 189 194 -
branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncCfg.h
r1166 r1170 78 78 Int m_interViewRefPosL[2][MAX_NUM_REF_PICS]; 79 79 #endif 80 #if HHI_INTER_COMP_PRED_K0052 81 Bool m_interCompPredFlag; 82 #endif 80 83 GOPEntry() 81 84 : m_POC(-1) … … 94 97 #if H_MV 95 98 , m_numActiveRefLayerPics(0) 99 #endif 100 #if HHI_INTER_COMP_PRED_K0052 101 #if H_3D 102 , m_interCompPredFlag(false) 103 #endif 96 104 #endif 97 105 { … … 408 416 Bool m_bUseQTL; 409 417 #endif 418 #if H_3D_ANNEX_SELECTION_FIX 419 Int m_profileIdc; 420 #endif 421 410 422 #endif 411 423 public: … … 421 433 , m_isDepth(false) 422 434 , m_bUseVSO(false) 435 #if H_3D_ANNEX_SELECTION_FIX 436 , m_profileIdc( -1 ) 437 #endif 423 438 #endif 424 439 #endif … … 957 972 Bool getUseQTL () { return m_bUseQTL; } 958 973 #endif 974 #if H_3D_ANNEX_SELECTION_FIX 975 Void setProfileIdc( Int a ) { assert( a == 1 || a == 6 || a == 8 ); m_profileIdc = a; } 976 Bool decProcAnnexI() { assert( m_profileIdc != -1 ); return ( m_profileIdc == 8); } 977 #endif 978 959 979 #endif // H_3D 960 980 }; -
branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncEntropy.cpp
r1169 r1170 306 306 307 307 #if H_MV_ENC_DEC_TRAC 308 #if ENC_DEC_TRACE 308 309 UInt uiLPelX = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ]; 309 310 UInt uiTPelY = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ]; … … 314 315 DTRACE_TU("log2TrafoSize", g_uiMaxCUWidth>>uiDepth) 315 316 DTRACE_TU("trafoDepth" , uiDepth) 317 #endif 316 318 #endif 317 319 -
branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncGOP.cpp
r1169 r1170 885 885 Int numDirectRefLayers = vps ->getNumDirectRefLayers( getLayerId() ); 886 886 #endif 887 #if HHI_INTER_COMP_PRED_K0052 888 pcSlice->setIvPicLists( m_ivPicLists ); 889 890 Int gopNum = (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid; 891 GOPEntry gopEntry = m_pcCfg->getGOPEntry( gopNum ); 892 #else 887 893 GOPEntry gopEntry = m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid ); 894 #endif 888 895 889 896 Bool interLayerPredLayerIdcPresentFlag = false; … … 922 929 assert( pcSlice->getNumActiveRefLayerPics() == gopEntry.m_numActiveRefLayerPics ); 923 930 931 #if HHI_INTER_COMP_PRED_K0052 932 #if H_3D 933 if ( m_pcEncTop->decProcAnnexI() ) 934 { 935 pcSlice->deriveInCmpPredAndCpAvailFlag(); 936 if ( pcSlice->getInCmpPredAvailFlag() ) 937 { 938 pcSlice->setInCompPredFlag( gopEntry.m_interCompPredFlag ); 939 } 940 else 941 { 942 if (gopEntry.m_interCompPredFlag ) 943 { 944 if ( gopNum == MAX_GOP) 945 { 946 printf( "\nError: FrameI_l%d cannot enable inter-component prediction.\n", pcSlice->getVPS()->getLayerIdInVps( getLayerId() ) ); 947 } 948 else 949 { 950 printf( "\nError: Frame%d_l%d cannot enable inter-component prediction.\n", gopNum, pcSlice->getVPS()->getLayerIdInVps( getLayerId() ) ); 951 } 952 953 exit(EXIT_FAILURE); 954 } 955 } 956 pcSlice->init3dToolParameters(); 957 pcSlice->checkInCompPredRefLayers(); 958 } 959 960 961 // This needs to be done after initilizaiton of 3D tool parameters. 962 pcSlice->setMaxNumMergeCand ( m_pcCfg->getMaxNumMergeCand() + ( ( pcSlice->getMpiFlag( ) || pcSlice->getIvMvPredFlag( ) || pcSlice->getViewSynthesisPredFlag( ) ) ? 1 : 0 )); 963 #endif 964 #endif 965 924 966 pcSlice->createInterLayerReferencePictureSet( m_ivPicLists, m_refPicSetInterLayer0, m_refPicSetInterLayer1 ); 925 967 pcSlice->setNumRefIdx(REF_PIC_LIST_0,min(gopEntry.m_numRefPicsActive,( pcSlice->getRPS()->getNumberOfPictures() + (Int) m_refPicSetInterLayer0.size() + (Int) m_refPicSetInterLayer1.size()) ) ); … … 968 1010 } 969 1011 #endif 1012 #if !HHI_INTER_COMP_PRED_K0052 970 1013 #if H_3D 971 1014 pcSlice->setIvPicLists( m_ivPicLists ); … … 973 1016 assert( !m_pcEncTop->getIsDepth() || ( pcSlice->getTexturePic() != 0 ) ); 974 1017 #endif 1018 #endif 975 1019 #endif 976 1020 #if H_3D_IC -
branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp
r1133 r1170 215 215 rpcSlice->setPicOutputFlag( true ); 216 216 rpcSlice->setPOC( pocCurr ); 217 #if !HHI_INTER_COMP_PRED_K0052 217 218 #if H_3D 218 rpcSlice->init3dToolParameters(); 219 rpcSlice->init3dToolParameters(); 220 #endif 219 221 #endif 220 222 #if H_3D_IC … … 610 612 rpcSlice->setSliceSegmentMode ( m_pcCfg->getSliceSegmentMode() ); 611 613 rpcSlice->setSliceSegmentArgument ( m_pcCfg->getSliceSegmentArgument() ); 614 #if !HHI_INTER_COMP_PRED_K0052 612 615 #if H_3D_IV_MERGE 613 616 rpcSlice->setMaxNumMergeCand ( m_pcCfg->getMaxNumMergeCand() + ( ( rpcSlice->getMpiFlag( ) || rpcSlice->getIvMvPredFlag( ) || rpcSlice->getViewSynthesisPredFlag( ) ) ? 1 : 0 )); 614 617 #else 615 618 rpcSlice->setMaxNumMergeCand ( m_pcCfg->getMaxNumMergeCand() ); 619 #endif 620 #else 621 #if !H_3D 622 rpcSlice->setMaxNumMergeCand ( m_pcCfg->getMaxNumMergeCand() ); 623 #endif 616 624 #endif 617 625 xStoreWPparam( pPPS->getUseWP(), pPPS->getWPBiPred() ); -
branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncTop.cpp
r1169 r1170 91 91 m_aICEnableNum = NULL; 92 92 #endif 93 #if H_3D_ANNEX_SELECTION_FIX 94 m_cCavlcCoder.setEncTop(this); 95 #endif 93 96 } 94 97 … … 364 367 } 365 368 #endif 369 366 370 // initialize processing unit classes 367 371 m_cGOPEncoder. init( this );
Note: See TracChangeset for help on using the changeset viewer.
