From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 6 Jun 2017 12:21:42 +0000 (+0200)
Subject: descrambler: use already prepared key_changed() fcn
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38129afc77c2f00c01e437ed350ed26499027c65;p=thirdparty%2Ftvheadend.git

descrambler: use already prepared key_changed() fcn
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 7dc5095c6..48345a7ce 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -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);