1 files changed, 36 insertions, 2 deletions
diff --git a/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc b/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc
index 46a8d78976..ef1c1841ad 100644
--- a/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc
+++ b/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -78,6 +78,9 @@ namespace gr {
           case C9_10:
             kbch = 58192;
             break;
+          case C2_9_VLSNR:
+            kbch = 14208;
+            break;
           case C13_45:
             kbch = 18528;
             break;
@@ -152,7 +155,7 @@ namespace gr {
             break;
         }
       }
-      else {
+      else if (framesize == FECFRAME_SHORT) {
         switch (rate) {
           case C1_4:
             kbch = 3072;
@@ -205,6 +208,37 @@ namespace gr {
           case C32_45:
             kbch = 11352;
             break;
+          case C1_5_VLSNR_SF2:
+            kbch = 2512;
+            break;
+          case C11_45_VLSNR_SF2:
+            kbch = 3792;
+            break;
+          case C1_5_VLSNR:
+            kbch = 3072;
+            break;
+          case C4_15_VLSNR:
+            kbch = 4152;
+            break;
+          case C1_3_VLSNR:
+            kbch = 5232;
+            break;
+          default:
+            kbch = 0;
+            break;
+        }
+      }
+      else {
+        switch (rate) {
+          case C1_5_MEDIUM:
+            kbch = 5660;
+            break;
+          case C11_45_MEDIUM:
+            kbch = 7740;
+            break;
+          case C1_3_MEDIUM:
+            kbch = 10620;
+            break;
           default:
             kbch = 0;
             break;