[dvblast-devel] tsdecrypt

[Georgi Chorbadzhiyski]

Around 01/24/2012 02:56 PM, Georgi Chorbadzhiyski scribbled:
> Around 01/24/2012 02:53 PM, Doychin Dokov scribbled:
>> -Y does include the ECM PIDs in the output, but clears the CA descriptors
>> from the PMT. Tsdecrypt uses the PMT to realize what the ECM PID is, and
>> thus says it's unknown.
> 
> Hmm, this must be a regression since 2.0. Because I have 2.0 working as expected.
> 

Ok, this one from f576e3d seems suspicious:

@@ -1169,8 +1175,7 @@ static void CopyDescriptors( uint8_t *p_descs, uint8_t *p_current_descs )
         uint8_t i_tag = desc_get_tag( p_current_desc );

         j++;
-        /* A descrambled stream is not supposed to carry CA descriptors. */
-        if ( i_ca_handle && i_tag == 0x9 ) continue;
+        if ( b_enable_ecm && i_tag == 0x9 ) continue;

Could you try the attached patch on top of current git I think it should fix the problem.

-- 
Georgi Chorbadzhiyski
http://georgi.unixsol.org/
-------------- next part --------------
>From cf873f2848375b2be958c5d03477f7bdf6cddd36 Mon Sep 17 00:00:00 2001
From: Georgi Chorbadzhiyski <gf at unixsol.org>
Date: Tue, 24 Jan 2012 15:05:36 +0200
Subject: [PATCH] demux: If ECM forwarding is enabled do not remove CA
 descriptors from PMT.

---
 demux.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/demux.c b/demux.c
index 0ab24c2..e3bfb26 100644
--- a/demux.c
+++ b/demux.c
@@ -1175,7 +1175,7 @@ static void CopyDescriptors( uint8_t *p_descs, uint8_t *p_current_descs )
         uint8_t i_tag = desc_get_tag( p_current_desc );
 
         j++;
-        if ( b_enable_ecm && i_tag == 0x9 ) continue;
+        if ( !b_enable_ecm && i_tag == 0x9 ) continue;
 
         p_desc = descs_get_desc( p_descs, k );
         if ( p_desc == NULL ) continue; /* This shouldn't happen */
-- 
1.7.5.1