Skip to content

Commit

Permalink
remove FFDECSA code
Browse files Browse the repository at this point in the history
- the code is almost unmaintained and horrible
- no proper support for ARM CPUs
- it is not much optimized for the current TVH's code
  • Loading branch information
perexg committed Mar 23, 2018
1 parent 9b9fbe5 commit 4e7f837
Show file tree
Hide file tree
Showing 15 changed files with 3 additions and 2,546 deletions.
18 changes: 1 addition & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Tvheadend streaming server.
# Copyright (C) 2007-2009 Andreas Öman
# Copyright (C) 2012-2015 Adam Sutton
# Copyright (C) 2012-2017 Jaroslav Kysela
# Copyright (C) 2012-2018 Jaroslav Kysela
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -603,22 +603,6 @@ SRCS-TSDEBUG = \
SRCS-${CONFIG_TSDEBUG} += $(SRCS-TSDEBUG)
I18N-C += $(SRCS-TSDEBUG)

# FFdecsa
ifneq ($(CONFIG_DVBCSA),yes)
FFDECSA-$(CONFIG_CAPMT) = yes
FFDECSA-$(CONFIG_CWC) = yes
FFDECSA-$(CONFIG_CONSTCW) = yes
endif

ifeq ($(FFDECSA-yes),yes)
SRCS-yes += src/descrambler/ffdecsa/ffdecsa_interface.c \
src/descrambler/ffdecsa/ffdecsa_int.c
SRCS-${CONFIG_MMX} += src/descrambler/ffdecsa/ffdecsa_mmx.c
SRCS-${CONFIG_SSE2} += src/descrambler/ffdecsa/ffdecsa_sse2.c
${BUILDDIR}/src/descrambler/ffdecsa/ffdecsa_mmx.o : CFLAGS += -mmmx
${BUILDDIR}/src/descrambler/ffdecsa/ffdecsa_sse2.o : CFLAGS += -msse2
endif

# crypto algorithms
SRCS-${CONFIG_SSL} += src/descrambler/algo/libaesdec.c
SRCS-${CONFIG_SSL} += src/descrambler/algo/libaes128dec.c
Expand Down
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ OPTIONS=(
"tvhcsa:auto"
"bundle:no"
"pngquant:no"
"dvbcsa:no"
"kqueue:no"
"dbus_1:auto"
"android:no"
Expand Down Expand Up @@ -648,10 +647,11 @@ fi
#
if enabled cwc || enabled cccam || enabled capmt || enabled constcw; then
enable tvhcsa
enable dvbcsa
if enabled dvbcsa; then
(check_cc_header "dvbcsa/dvbcsa" dvbcsa_h &&\
check_cc_lib dvbcsa dvbcsa_l) ||\
die "Failed to find dvbcsa support (use --disable-dvbcsa)"
die "Failed to find dvbcsa library"
LDFLAGS="$LDFLAGS -ldvbcsa"
fi
fi
Expand Down

0 comments on commit 4e7f837

Please sign in to comment.