]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
descrambler: use already prepared key_changed() fcn
authorJaroslav Kysela <perex@perex.cz>
Tue, 6 Jun 2017 12:21:42 +0000 (14:21 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 6 Jun 2017 12:21:42 +0000 (14:21 +0200)
src/descrambler/descrambler.c

index 7dc5095c6023c8ba2f1defe555cf02d33b41841c..48345a7ced4d0bc772e4566fb8058da66a1ed78c 100644 (file)
@@ -1037,8 +1037,7 @@ next:
             descrambler_data_cut(dr, 188);
           }
         }
-      } else if (tk->key_index != (ki & 0x40) &&
-                 tk->key_start + dr->dr_ecm_key_margin < mclk()) {
+      } else if (key_changed(dr, tk, ki, mclk())) {
         tvhtrace(LS_DESCRAMBLER, "stream key[%d] changed to %s for service \"%s\"",
                                 tk->key_pid, (ki & 0x40) ? "odd" : "even",
                                 ((mpegts_service_t *)t)->s_dvb_svcname);