Commit graph

1748 commits

Author SHA1 Message Date
Jaroslav Kysela
84842c951c cwc: Allow updating of EMMs only from one channel at a time
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-04-10 20:57:35 +02:00
Jaroslav Kysela
98dd35342f cwc: Use "per stream" update id for Cryptoworks and Viaccess CA composed emms
This fixes possible shared EMM messages composing issues when multiple
streams are sending EMMs to the card reader. Just make sure, that both
parts of compose messages are from one "stream".

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-04-10 20:57:33 +02:00
Andreas Öman
7604e83047 Merge pull request #69 from perexg/fixes-dvrallcfg
Allow restriction for one DVR configuration mapped to one user
2012-04-10 10:39:32 -07:00
Andreas Öman
7dcf7d15f0 Merge pull request #70 from perexg/fixes-mux-copy
Improve copy operation for satellite muxes - allow specify the dst LNB cfg
2012-04-10 10:38:57 -07:00
Andreas Öman
5777a1fe30 Merge pull request #84 from perexg/fixes-emm
cwc: improve EMM handling for multiple readers with same CAS system
2012-04-10 10:29:34 -07:00
Andreas Öman
6c1c0aa9b0 Merge pull request #83 from perexg/fixes-cryptoworks
cwc: Add EMM support for the Cryptoworks system
2012-04-10 10:28:53 -07:00
Jaroslav Kysela
30eb130fc1 cwc: Cryptoworks - removed debug lines introduced in last commit 2012-04-10 14:39:45 +02:00
Jaroslav Kysela
a06ee6d175 cwc: Cryptoworks - re-compose the EMM-S (shared) messages
The newcamd server expects composed EMM-S messages from 0x84 (EMM-SH)
and 0x84 (EMM-SB).

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-04-10 14:35:28 +02:00
Jaroslav Kysela
a9bb7c3106 cwc: improve EMM handling for multiple readers with same CAS system
Add CAID filter to identify the correct reader for EMM messages. Previous
code sent all EMMs to all readers with different CAIDs but same CAS system.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-04-10 11:25:40 +02:00
Jaroslav Kysela
da4c28b981 cwc: Add EMM support for the Cryptoworks system
Add initial EMM support for Cryptoworks. Also add Irdeto CAID numbers
for Czech providers to the src/psi.c table.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-04-10 10:30:17 +02:00
Andreas Öman
acf35abca2 Merge pull request #82 from fmeerkoetter/clang_cleanup
Cleanup warnings reported by clang
2012-04-01 13:32:22 -07:00
Frank Meerkötter
dc3bbe1c23 fix warning about unused variable 2012-04-01 00:02:36 +02:00
Frank Meerkötter
8d65d26893 fix "comparison of unsigned expression < 0 is always false" 2012-03-31 23:45:40 +02:00
Frank Meerkötter
05fa4d341a fix pointless self-assign 2012-03-31 23:44:40 +02:00
Andreas Öman
78e88f62c5 Merge pull request #81 from stefansaraev/cadescr-4aee
fix ca descr parsing for caid 4aee
2012-03-30 13:04:40 -07:00
Stefan Saraev
ce1477cfc4 fix ca descr parsing for caid 4aee 2012-03-29 21:20:55 +03:00
Jaroslav Kysela
dc74a18b28 Javascript fix the improved mux-copy operation. The previous version
did not work with the DVB-T tuners (without satconf).

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-03-26 10:53:43 +02:00
Jaroslav Kysela
6097dcd6d1 Fix crash when cfg->dvr_config_name is NULL (default config)
As suggested by opdenkamp - the cfg->dvr_config_name may be NULL
in some cases. Add more restrictive checks in extjs_dvr() .

This patch fixes the second location for the user check.
2012-03-21 09:34:23 +01:00
Jaroslav Kysela
e4b88cfc39 Fix crash when cfg->dvr_config_name is NULL (default config)
As suggested by opdenkamp - the cfg->dvr_config_name may be NULL
in some cases. Add more restrictive checks in extjs_dvr() .
2012-03-21 09:31:33 +01:00
Andreas Öman
85e23bb4cb Merge pull request #79 from perexg/fixes-dvbtables
dvb_tables: fix extended event parsing
2012-03-20 12:57:27 -07:00
Jaroslav Kysela
f5ceace980 dvb_tables: fix extended event parsing
The ext_desc / ext_item strings are just copied without language handling.
This patch uses standard dvb_get_string_with_len() function. It's safer
and the language conversions are handled correctly.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-03-20 19:58:23 +01:00
Andreas Öman
2ae9425253 Merge pull request #78 from john-tornblom/subtitle_comhem_fixes
Subtitle fixes (comhem)
2012-03-19 13:36:59 -07:00
John Törnblom
afc6029beb fix subtitle issues on comhem. Sometimes the subtitles would get stuck on the screen, sometimes only half of them delivered to the client. 2012-03-18 23:02:51 +01:00
John Törnblom
ca1bf59182 Merge remote branch 'upstream/master' into upstream 2012-03-14 07:45:33 +01:00
Andreas Öman
a76f365a60 Merge pull request #74 from john-tornblom/streaming_mkv_fixes
Streaming mkv fixes
2012-03-13 19:52:50 -07:00
Andreas Öman
c7fb491a43 Merge pull request #75 from terual/master
Null pointer passed as an argument
2012-03-13 19:52:07 -07:00
Andreas Öman
6751e053cb Merge pull request #45 from mikrohard/memory_leaks
Fix memory leak in queue size protection
2012-03-13 06:33:20 -07:00
Bart Lauret
be49ddd007 Null pointer passed as an argument
in line 181 in strcmp(ae->ae_password, password)
2012-03-13 08:42:33 +01:00
Andreas Öman
e6cf570807 Merge pull request #73 from john-tornblom/epg_mem_leaks
Plug memory leaks
2012-03-11 11:17:43 -07:00
John Törnblom
cac15666af Cosmetics 2012-03-11 18:29:49 +01:00
John Törnblom
36af656f2e Fixed crash when subscribing to a channel or service would fail 2012-03-11 18:18:03 +01:00
John Törnblom
96966d1e12 added missing free() to epg_event_destroy 2012-03-11 18:17:09 +01:00
John Törnblom
47bc9b2d8f Removed a call to pkt_ref_inc. I am not sure if this is OK or not. other parts of tvheadend don't seem to do it (like file recorder) so I guess it should work. 2012-03-11 18:13:05 +01:00
John Törnblom
86cd61f219 unlock mutex earlier 2012-03-11 18:10:45 +01:00
John Törnblom
d204718cf9 Log timeouts as warnings 2012-03-11 18:08:45 +01:00
Andreas Öman
8656cd331e Merge pull request #66 from amet/master
change CWS_NETMSGSIZE to 362
2012-03-08 12:17:23 -08:00
amet
5f00b7309a change CWS_NETMSGSIZE to 362 2012-03-08 14:13:48 +04:00
John Törnblom
72be167545 Merge branch 'upstream', remote branch 'upstream/master' into upstream 2012-03-08 10:54:48 +01:00
John Törnblom
07df79f2ee sanity checks for mkv muxer 2012-03-08 10:53:07 +01:00
Andreas Öman
3c341d8b44 Merge pull request #65 from terual/master
Added missing free()s
2012-03-07 06:15:50 -08:00
Bart Lauret
07c618aaa4 added missing free()s 2012-03-07 15:12:48 +01:00
Andreas Öman
405f766e1f Merge pull request #64 from john-tornblom/streaming_mkv_fixes
Some streaming mkv fixes
2012-03-07 05:17:55 -08:00
John Törnblom
841ab9087f skip seekhead for live streams and append epg tags whenever they change. 2012-03-06 18:07:49 +01:00
John Törnblom
19ad4c1262 avoid calling lseek on sockets as a socket is not seekable. 2012-03-06 14:48:58 +01:00
John Törnblom
6e02f496bf for streaming, use the smallest possible cluster size (one cluster per keyframe). 2012-03-06 14:48:10 +01:00
John Törnblom
e6826dca0e Made the maximum cluster size smaller for live streams and even smaller for live audio only streams 2012-03-06 13:57:45 +01:00
John Törnblom
3cea8ad970 Check for null pointers 2012-03-05 17:52:38 +01:00
John Törnblom
115089def3 Log when a http streams starts and stops 2012-03-05 17:51:52 +01:00
John Törnblom
839b164d7b Add meta tags to webstream 2012-03-05 17:34:38 +01:00
John Törnblom
ea617c8e24 fix offset for metainfo when metatags are present. not sure how these values add up but mkvalidator claims they are correct 2012-03-05 17:34:10 +01:00