Changeset 146 in 3DVCSoftware

Timestamp:

22 Oct 2012, 14:26:21 (12 years ago)

Author:

tech

Message:

Clean up:

• set WVSO as default
• removed printf line
• removed tabs from config-files

Location:

branches/HTM-4.1-dev2-LG

Files:

• CommonTestConditionsCfgs/baseCfg_2view+depth.cfg (modified) (1 diff)
• CommonTestConditionsCfgs/baseCfg_3view+depth.cfg (modified) (1 diff)
• cfg/encoder_mvd.cfg (modified) (1 diff)
• source/App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

branches/HTM-4.1-dev2-LG/CommonTestConditionsCfgs/baseCfg_2view+depth.cfg

@@ -205 +205 @@
 #========== view synthesis optimization (VSO) ==========
 VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) I(s0.25 s0.5 s0.75)]  # VSO configuration string
-WVSO                      : 1                                                                 # use of WVSO (Depth distortion metric with a weighted depth fidelity term) 
-VSOWeight                 : 10                                                                # weight of VSO ( in SAD case, cf. squared in SSE case )
-VSDWeight                 : 1                                                                 # weight of VSD ( in SAD case, cf. squared in SSE case )
-DWeight                   : 1                                                                 # weight of depth distortion itself ( in SAD case, cf. squared in SSE case )
+WVSO                      : 1                                    # use of WVSO (Depth distortion metric with a weighted depth fidelity term) 
+VSOWeight                 : 10                                   # weight of VSO ( in SAD case, cf. squared in SSE case )
+VSDWeight                 : 1                                    # weight of VSD ( in SAD case, cf. squared in SSE case )
+DWeight                   : 1                                    # weight of depth distortion itself ( in SAD case, cf. squared in SSE case )
 
 #============ Misc. ================

branches/HTM-4.1-dev2-LG/CommonTestConditionsCfgs/baseCfg_3view+depth.cfg

@@ -209 +209 @@
 #========== view synthesis optimization (VSO) ==========
 VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) B(oo2) I(s0.25 s0.5 s0.75 s1.25 s1.5 s1.75)][cx2 B(cc1) I(s1.25 s1.5 s1.75)] # VSO configuration string
-WVSO                      : 1                                                                 # use of WVSO (Depth distortion metric with a weighted depth fidelity term) 
-VSOWeight                 : 10                                                                # weight of VSO ( in SAD case, cf. squared in SSE case )
-VSDWeight                 : 1                                                                 # weight of VSD ( in SAD case, cf. squared in SSE case )
-DWeight                   : 1                                                                 # weight of depth distortion itself ( in SAD case, cf. squared in SSE case )
+WVSO                       : 1                                     # use of WVSO (Depth distortion metric with a weighted depth fidelity term) 
+VSOWeight                  : 10                                    # weight of VSO ( in SAD case, cf. squared in SSE case )
+VSDWeight                  : 1                                     # weight of VSD ( in SAD case, cf. squared in SSE case )
+DWeight                    : 1                                     # weight of depth distortion itself ( in SAD case, cf. squared in SSE case )
 
 #============ Misc. ================

branches/HTM-4.1-dev2-LG/cfg/encoder_mvd.cfg

@@ -209 +209 @@
 VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) B(oo2) I(s0.25 s0.5 s0.75 s1.25 s1.5 s1.75)][cx2 B(cc1) I(s1.25 s1.5 s1.75)] # VSO configuration string (3 view) 
 VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0)        I(s0.25 s0.5 s0.75)]                                                   # VSO configuration string (2 view) 
-WVSO                      : 1                                                                 # use of WVSO (Depth distortion metric with a weighted depth fidelity term) 
-VSOWeight                 : 10                                                                # weight of VSO ( in SAD case, cf. squared in SSE case )
-VSDWeight                 : 1                                                                 # weight of VSD ( in SAD case, cf. squared in SSE case )
-DWeight                   : 1                                                                 # weight of depth distortion itself ( in SAD case, cf. squared in SSE case )
+WVSO                      : 1                                    # use of WVSO (Depth distortion metric with a weighted depth fidelity term) 
+VSOWeight                 : 10                                   # weight of VSO ( in SAD case, cf. squared in SSE case )
+VSDWeight                 : 1                                    # weight of VSD ( in SAD case, cf. squared in SSE case )
+DWeight                   : 1                                    # weight of depth distortion itself ( in SAD case, cf. squared in SSE case )
 
 

branches/HTM-4.1-dev2-LG/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -361 +361 @@
 #endif
 #if LGE_WVSO_A0119
-  ("WVSO",                            m_bUseWVSO                , false         , "Use depth fidelity term for VSO" )
+  ("WVSO",                            m_bUseWVSO                , true          , "Use depth fidelity term for VSO" )
   ("VSOWeight",                       m_iVSOWeight              , 10            , "Synthesized View Distortion Change weight" )
   ("VSDWeight",                       m_iVSDWeight              , 1             , "View Synthesis Distortion estimate weight" )

branches/HTM-4.1-dev2-LG/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1239 +1239 @@
   READ_CODE( 2, uiCode, "weighted_bipred_idc" );      // Use of Bi-Directional Weighting Prediction (B_SLICE)
   pcPPS->setWPBiPredIdc( uiCode );
-printf("TDecCavlc::parsePPS():\tm_bUseWeightPred=%d\tm_uiBiPredIdc=%d\n", pcPPS->getUseWP(), pcPPS->getWPBiPredIdc());
+//printf("TDecCavlc::parsePPS():\tm_bUseWeightPred=%d\tm_uiBiPredIdc=%d\n", pcPPS->getUseWP(), pcPPS->getWPBiPredIdc());
 
 #if H0388