Changeset 990 in SHVCSoftware

Timestamp:

21 Jan 2015, 19:42:00 (10 years ago)

Author:

seregin

Message:

fix for the ticket #51

Location:

branches/SHM-dev

Files:

• cfg/encoder_intra_main.cfg (modified) (1 diff)
• cfg/encoder_intra_main10.cfg (modified) (1 diff)
• cfg/encoder_lowdelay_main.cfg (modified) (1 diff)
• cfg/encoder_lowdelay_main10.cfg (modified) (1 diff)
• cfg/encoder_randomaccess_main.cfg (modified) (1 diff)
• cfg/encoder_randomaccess_main10.cfg (modified) (1 diff)
• source/App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)

branches/SHM-dev/cfg/encoder_intra_main.cfg

@@ -6 +6 @@
 #Profile                      : main
 NumProfileTierLevel           : 3
-#Profile for the whole bitstream
-Profile0                      : scalable-main        
-#Profile for the base layer --- this will be ignored when BL is not HEVC
-Profile1                      : main
-#Profile for the enhancement layer
-Profile2                      : scalable-main
+Profile0                      : main                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                    #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                    #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main       # Scalable profile
 
 #======== Unit definition ================

branches/SHM-dev/cfg/encoder_intra_main10.cfg

@@ -6 +6 @@
 #Profile                      : main10
 NumProfileTierLevel           : 3
-#Profile for the whole bitstream
-Profile0                      : scalable-main10       
-#Profile for the base layer --- this will be ignored when BL is not HEVC
-Profile1                      : main10
-#Profile for the enhancement layer
-Profile2                      : scalable-main10
+Profile0                      : main10                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                      #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main10                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                      #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main10       # Scalable profile
 
 #======== Unit definition ================

branches/SHM-dev/cfg/encoder_lowdelay_main.cfg

@@ -6 +6 @@
 #Profile                       : main
 NumProfileTierLevel           : 3
-#Profile for the whole bitstream
-Profile0                      : scalable-main        
-#Profile for the base layer --- this will be ignored when BL is not HEVC
-Profile1                      : main
-#Profile for the enhancement layer
-Profile2                      : scalable-main
+Profile0                      : main                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                    #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                    #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main       # Scalable profile
 
 #======== Unit definition ================

branches/SHM-dev/cfg/encoder_lowdelay_main10.cfg

@@ -6 +6 @@
 #Profile                      : main10
 NumProfileTierLevel           : 3
-#Profile for the whole bitstream
-Profile0                      : scalable-main10
-#Profile for the base layer --- this will be ignored when BL is not HEVC
-Profile1                      : main10
-#Profile for the enhancement layer
-Profile2                      : scalable-main10
+Profile0                      : main10                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                      #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main10                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                      #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main10       # Scalable profile
 
 #======== Unit definition ================

branches/SHM-dev/cfg/encoder_randomaccess_main.cfg

@@ -6 +6 @@
 #Profile                      : main
 NumProfileTierLevel           : 3
-#Profile for the whole bitstream
-Profile0                      : scalable-main       
-#Profile for the base layer --- this will be ignored when BL is not HEVC
-Profile1                      : main
-#Profile for the enhancement layer
-Profile2                      : scalable-main
+Profile0                      : main                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                    #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                    #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main       # Scalable profile
 
 #======== Unit definition ================

branches/SHM-dev/cfg/encoder_randomaccess_main10.cfg

@@ -6 +6 @@
 #Profile                      : main10
 NumProfileTierLevel           : 3
-#Profile for the whole bitstream
-Profile0                      : scalable-main10       
-#Profile for the base layer --- this will be ignored when BL is not HEVC
-Profile1                      : main10
-#Profile for the enhancement layer
-Profile2                      : scalable-main10
+Profile0                      : main10                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                      #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main10                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                      #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main10       # Scalable profile
 
 #======== Unit definition ================

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -2605 +2605 @@
     }
     ii++;
+  }
+  if (m_numLayers > 1 && m_numPTLInfo > 1 && !m_nonHEVCBaseLayerFlag)
+  {
+    assert(m_profileList[0] <= Profile::MULTIVIEWMAIN);  //Profile IDC of PTL in VPS shall be one of single-layer profile IDCs
+    assert(m_profileList[0] == m_profileList[1]);        //Profile IDC of VpsProfileTierLevel[ 0 ] and VpsProfileTierLevel[ 1 ] shall be the same when BL is HEVC compatible
+    assert(m_levelList[0] >= m_levelList[1]);            //Level IDC of VpsProfileTierLevel[ 0 ] should not be less than level IDC of VpsProfileTierLevel[ 1 ]. 
+                                                         //NOTE that this is not conformance constraint but it would be nice if our encoder can prevent inefficient level IDC assignment
+    if (m_levelList[0] == m_levelList[1]) printf("Warning: Level0 is set the same as Level1\n");
   }
 #else