Changeset 637 in 3DVCSoftware for branches/HTM-8.2-dev0-KWU/cfg

Timestamp:

17 Oct 2013, 20:17:10 (11 years ago)

Author:

kwu-htm

Message:

Clean up and revised according to the guideline.

Location:

branches/HTM-8.2-dev0-KWU/cfg/3D-HEVC

Files:

• baseCfg_3view+depth.cfg (modified) (2 diffs)
• fullCfg.cfg (modified) (2 diffs)

branches/HTM-8.2-dev0-KWU/cfg/3D-HEVC/baseCfg_3view+depth.cfg

@@ -229 +229 @@
 
 #============ Rate Control URQ ======================
+<<<<<<< .mine
+#RateCtrl                         : 0                # 0: Disable rate control 1: Enable rate control with total target
+#DepthMADPred                       : 0                # 0: Disable Depth based MAD prediction for extended view 1: Enable Depth based MAD prediction for extended view
+#TargetBitAssign                    : 0                 # Manual assignment of target bit-rate
+#ViewWiseTargetBits                 : 952 315 360       # View-wise target bit-rate setting
+#TargetBitrate                       : 1500             # input target bitrate when RateCtrl is enable
+#NumLCUInUnit                        : 1                # Number of LCU in an Unit. Fraction is not allowed
+=======
 #RateCtrl                           : 0                # 0: Disable rate control 1: Enable rate control with total target
 #DepthMADPred                       : 0                # 0: Disable Depth based MAD prediction for extended view 1: Enable Depth based MAD prediction for extended view
@@ -235 +243 @@
 #TargetBitrate                      : 1500             # input target bitrate when RateCtrl is enable
 #NumLCUInUnit                       : 1                # Number of LCU in an Unit. Fraction is not allowed
+>>>>>>> .r636
 
 #========== multiview coding tools ==========

branches/HTM-8.2-dev0-KWU/cfg/3D-HEVC/fullCfg.cfg

@@ -235 +235 @@
 
 #============ Rate Control URQ ======================
+<<<<<<< .mine
+#RateCtrl                         : 0                # 0: Disable rate control 1: Enable rate control with total target
+#DepthMADPred                       : 0                # 0: Disable Depth based MAD prediction for extended view 1: Enable Depth based MAD prediction for extended view
+#TargetBitAssign                    : 0                 # Manual assignment of target bit-rate
+#ViewWiseTargetBits                 : 952 315 360       # View-wise target bit-rate setting
+#TargetBitrate                       : 1500             # input target bitrate when RateCtrl is enable
+#NumLCUInUnit                        : 1                # Number of LCU in an Unit. Fraction is not allowed
+=======
 #RateCtrl                           : 0                # 0: Disable rate control 1: Enable rate control with total target
 #DepthMADPred                       : 0                # 0: Disable Depth based MAD prediction for extended view 1: Enable Depth based MAD prediction for extended view
@@ -241 +249 @@
 #TargetBitrate                      : 1500             # input target bitrate when RateCtrl is enable
 #NumLCUInUnit                       : 1                # Number of LCU in an Unit. Fraction is not allowed
+>>>>>>> .r636
 
 #========== multiview coding tools ==========