Changeset 970 in 3DVCSoftware
- Timestamp:
- 5 Jul 2014, 10:00:42 (10 years ago)
- Location:
- branches/HTM-11.1-dev0/source/Lib/TLibCommon
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-11.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp
r969 r970 7016 7016 } 7017 7017 #if H_3D_SPIVMP 7018 #if H_3D_FIX_DBBP_IVMP7019 7018 for(Int iLoopCan = ( (m_pcSlice->getIsDepth() || getDBBPFlag(0)) ? 0 : 1 ); iLoopCan < ( 2 - m_pcSlice->getIsDepth() ); iLoopCan ++) 7020 #else7021 for(Int iLoopCan = ( 1 - m_pcSlice->getIsDepth() ); iLoopCan < ( 2 - m_pcSlice->getIsDepth() ); iLoopCan ++)7022 #endif7023 7019 #else 7024 7020 for(Int iLoopCan = 0; iLoopCan < 2; iLoopCan ++) -
branches/HTM-11.1-dev0/source/Lib/TLibCommon/TComPrediction.cpp
r967 r970 521 521 Int RefPOCL0 = pcCU->getSlice()->getRefPic(REF_PIC_LIST_0, pcCU->getCUMvField(REF_PIC_LIST_0)->getRefIdx(PartAddr))->getPOC(); 522 522 Int RefPOCL1 = pcCU->getSlice()->getRefPic(REF_PIC_LIST_1, pcCU->getCUMvField(REF_PIC_LIST_1)->getRefIdx(PartAddr))->getPOC(); 523 #if MTK_ALIGN_SW_WD_BI_PRED_ARP_H0085523 #if H_3D_ARP 524 524 if(!pcCU->getARPW(PartAddr) && RefPOCL0 == RefPOCL1 && pcCU->getCUMvField(REF_PIC_LIST_0)->getMv(PartAddr) == pcCU->getCUMvField(REF_PIC_LIST_1)->getMv(PartAddr)) 525 525 #else -
branches/HTM-11.1-dev0/source/Lib/TLibCommon/TypeDef.h
r969 r970 102 102 // MTK_NBDV_TN_FIX_E0172 fix the issue of DV derivation from the temporal neighboring blocks, issue 7 in JCT3V-E0172 103 103 // MTK_TEXTURE_MRGCAND_BUGFIX_E0182 Bug fix for TEXTURE MERGING CANDIDATE , JCT3V-E0182 104 104 105 #define H_3D_ARP 1 // Advanced residual prediction (ARP), JCT3V-D0177 105 106 // QC_MTK_INTERVIEW_ARP_F0123_F0108 JCT3V-F0123; JCT3V-F0108 … … 108 109 // MTK_ARP_FLAG_CABAC_SIMP_G0061 Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061 109 110 // MTK_ARP_REF_SELECTION_G0053 ARP Reference picture selection in JCT3V-G0053 111 // MTK_ALIGN_SW_WD_BI_PRED_ARP_H0085 Align the SW and WD for the bi-prediction ARP PUs by disallowing non-normative fast bi-prediction for ARP PUs, JCT3V-H0085 110 112 111 113 … … 119 121 // MTK_IC_FLAG_CABAC_SIMP_G0061 120 122 // SEC_IC_ARP_SIG_G0072, Disabling IC when ARP is enabled, option 1 in JCT3V-G0072, part 2 in JCT3V-G0121 123 // MTK_LOW_LATENCY_IC_ENCODING_H0086 Low-latency IC encoding in JCT3V-H0086 121 124 122 125 … … 128 131 // NBDV_DEFAULT_VIEWIDX_BUGFIX Bug fix for invalid default view index for NBDV 129 132 // NTT_DoNBDV_VECTOR_CLIP_E0141 disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209 133 // SEC_VER_DONBDV_H0103 Vertical DV Restriction for DoNBDV 130 134 #endif 131 135 … … 161 165 // SEC_DEPTH_DV_DERIVAITON_G0074, Simplification of DV derivation for depth, JCT3V-G0074 162 166 // QC_DEPTH_MERGE_SIMP_G0127 Remove DV candidate and shifting candidate for depth coding 163 167 // QC_IV_PRED_CONSTRAINT_H0137 Constraint on inter-view (motion) prediction tools 168 // ETRIKHU_BUGFIX_H0083 bug-fix for DV candidate pruning 169 // ETRIKHU_CLEANUP_H0083 cleaned-up source code for constructing merging candidate list 170 // ETRIKHU_CLEANUP_H0083_MISSING missing guard macros added by GT 171 // SHARP_SIMPLE_MERGE_H0062 Restrict 3D-HEVC merge cand in small PUs 172 // MTK_DIS_SPBIP8X4_H0205 Disable bi-prediction for 8x4 and 4x8 sub PU and remove the SPIVMP 2Nx2N restriction 173 // SEC_ADAPT_DISABLE_IVMP Disalbing IVMP merge candidates when IC is enabled, JCT3V-H0070 164 174 165 175 #define H_3D_TMVP 1 // QC_TMVP_C0047 … … 196 206 // HS_TSINGHUA_SDC_SPLIT_G0111 197 207 // QC_PKU_SDC_SPLIT_G0123 Intra SDC Split 208 // HS_DMM_SDC_PREDICTOR_UNIFY_H0108 Unification of DMM and SDC predictor derivation 209 // LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135 Use only one context for CABAC of dim_not_present_flag 210 // QC_SIMP_DELTADC_CODING_H0131 Simplify detaDC entropy coding 211 // MTK_DMM_SIMP_CODE_H0092 Remove CABAC context for DMM1 mode coding 212 // MTK_DELTA_DC_FLAG_ONE_CONTEXT_H0084_H0100_H0113 Use only one context for CABAC of delta_dc_flag as in JCTVC-H0084, JCTVC-H0100 and JCTVC-H0113 213 // MTK_SDC_FLAG_FIX_H0095 Remove conditional check of PCM flag based on SDC flag, JCTVC-H0095 214 // SEC_NO_RESI_DLT_H0105 215 // MTK_DLT_CODING_FIX_H0091 216 198 217 199 218 #define H_3D_INTER_SDC 1 // INTER SDC, Inter simplified depth coding … … 205 224 // QC_SPIVMP_MPI_G0119 Sub-PU level MPI merge candidate 206 225 // Simplification on Sub-PU level temporal interview motion prediction 207 226 // MPI_SUBPU_DEFAULT_MV_H0077_H0099_H0111_H0133 208 227 209 228 #define H_3D_DBBP 1 // DBBP: Depth-based Block Partitioning and Merging 229 // MTK_DBBP_AMP_REM_H0072 230 // RWTH_DBBP_NO_SPU_H0057 231 // SEC_DBBP_FILTERING_H0104 232 // MTK_DBBP_SIGNALING_H0094 233 // H_3D_FIX_DBBP_IVMP Fix . Enable IVMP is always disabled, when DBBP is enabled. The original intention is to disable Sub-PU IVMP when DBBP is enabled, not to disable IVMP itself. 234 210 235 211 236 #define H_3D_DDD 1 // Disparity derived depth coding … … 315 340 /////////////////////////////////// HTM-11.0 Integrations ////////////////////////////// 316 341 ///////////////////////////////////////////////////////////////////////////////////////// 317 #if H_3D318 #define H_3D_FIX_DBBP_IVMP 1 // Fix . Enable IVMP is always disabled, when DBBP is enabled. The original intention is to disable Sub-PU IVMP when DBBP is enabled, not to disable IVMP itself.319 320 #define MTK_ALIGN_SW_WD_BI_PRED_ARP_H0085 1 // Align the SW and WD for the bi-prediction ARP PUs by disallowing non-normative fast bi-prediction for ARP PUs, JCT3V-H0085321 #define MTK_LOW_LATENCY_IC_ENCODING_H0086 1 // Low-latency IC encoding in JCT3V-H0086322 #endif323 324 342 #if H_MV 325 343 #define H0044_POC_LSB_NOT_PRESENT 1 ///< JCT3V-H0044: Add constraint checking on the value of poc_reset_idc and poc_lsb_val … … 342 360 // #define H_MV_HLS_7_POC_P0041_FIXES 0 // (POC/P0041/Fixes) For each non-IRAP picture that has discardable_flag equal to 1 to have NUT value indicating that it is a sub-layer non-reference picture. 343 361 // #define H_MV_HLS_7_POC_P0056_4 0 // (POC/P0056/layer tree poc) #4 Proposal 1: If the POC reset approach is adopted as the basis for multi-layer POC derivation, it is proposed to derive the POC anchor picture from the previous TID0 picture (that is not a RASL picture, a RADL picture or a sub-layer non-reference picture and not with discardable_flag equal to 1) of the current layer or any of its reference layer. This is asserted to improve loss resilience and reduce bit rate overhead. Decision: Adopt Proposal 1 (with the suggested modifications Ewith text provided as P0297). 344 345 346 // OTHERS347 // #define H_MV_HLS_7_HRD_P0138_6 0 // (HRD/P0138/HRD parameters for bitstreams excluding) #6 Decision: Adopt (as revised in updated contribution, with the specification of a flag in the BP SEI (HRD/P0192/sub-DPB) #12 Establish sub-DPBs based on the representation format indicated at the VPS level. It was suggested that the expressed shared capacity limit would need to be less than or equal to the sum of the individual capacity limits. Decision: Adopt as modified. Further study is encouraged on profile/level constraint selections.348 362 349 363 // SEI related … … 362 376 //#define H_MV_HLS_7_SEI_P0123_25 0 // (SEI/P0123/Alpha channel info) #25 Add alpha channel information SEI message Decision: Adopt. Constrain the bit depth indicated to be equal to the coded bit depth of the aux picture. 363 377 364 365 378 // Auxiliary picture related 366 379 //#define H_MV_HLS_8_AUX_NODOC_40 0 // #40 (AUX /NODOC/primary pic) Clarify that an auxiliary picture can be associated with more than one primary picture. Consider if the language associating an alpha auxiliary picture with a primary picture in the semantics of dimension_id[ ][ ] near the AuxId derivation could be moved to the alpha SEI message. … … 381 394 //#define H_MV_HLS_7_OTHER_P0187_1 0 // (OTHER/P0187/NoOutputOfPriorPicsFlag) #1 Inference of NoOutputOfPriorPicsFlag and proposes to take into account colour format and bit depth for the inference in addition to spatial resolution 382 395 383 // O thers396 // OTHERS 384 397 //#define H_MV_HLS_8_HSB_Q0041_03 0 // #3 (HS /Q0041/hybrid scalability) The proposed text was endorsed, with non-editorial open issues considered as follows 385 398 :// #define H_MV_HLS_7_OTHER_P0187_1 0 // (OTHER/P0187/NoOutputOfPriorPicsFlag) #1 Inference of NoOutputOfPriorPicsFlag and proposes to take into account colour format and bit depth for the inference in addition to spatial resolution 386 399 //#define H_MV_HLS_8_MIS_Q0078_24 0 // #24 (MISC /Q0078/scan and pic type) , Items 3 b,c and 4, clarifying which pictures in an output layer sets are applied the values of general_progressive_source_flag, general_interlaced_source_flag, general_non_packed_constraint_flag and general_frame_only_constraint_flag. 387 400 //#define H_MV_HLS_7_HRD_P0138_6 0 // (HRD/P0138/HRD parameters for bitstreams excluding) #6 Decision: Adopt (as revised in updated contribution, with the specification of a flag in the BP SEI (HRD/P0192/sub-DPB) #12 Establish sub-DPBs based on the representation format indicated at the VPS level. It was suggested that the expressed shared capacity limit would need to be less than or equal to the sum of the individual capacity limits. Decision: Adopt as modified. Further study is encouraged on profile/level constraint selections. 388 401 389 402 #define H_MV_HLS_8_SYN_Q0041_03 1 // #3 Syntax only (HS /Q0041/hybrid scalability) The proposed text was endorsed, with non-editorial open issues considered as follows
Note: See TracChangeset for help on using the changeset viewer.