Navigation Menu

Skip to content

Commit

Permalink
CrystalHD: Remove
Browse files Browse the repository at this point in the history
- never knowingly used in anger...
- if anyone is desperate for its return, it is now supported in FFmpeg
  • Loading branch information
mark-kendall committed Feb 6, 2019
1 parent c81da87 commit aef44a9
Show file tree
Hide file tree
Showing 10 changed files with 2 additions and 1,091 deletions.
8 changes: 0 additions & 8 deletions mythtv/configure
Expand Up @@ -131,7 +131,6 @@ Advanced options (experts only):
--disable-xnvctrl disable xNVCtrl support
--disable-xrandr disable X11 resolution switching
--disable-vdpau disable NVidia VDPAU hardware acceleration.
--disable-crystalhd disable Broadcom CrystalHD hardware decoder support
--disable-vaapi disable VAAPI hardware accelerated video decoding
--disable-vaapi2 disable VAAPI2 hardware accelerated video decoding
--disable-nvdec disable NVDEC (CUVID) hardware accelerated video decoding
Expand Down Expand Up @@ -1401,7 +1400,6 @@ EXTERNAL_LIBRARY_LIST="
"

HWACCEL_AUTODETECT_LIBRARY_LIST="
crystalhd
dxva2
vdpau
"
Expand Down Expand Up @@ -1950,7 +1948,6 @@ MYTHTV_CONFIG_LIST='
bindings_perl
bindings_python
bindings_php
crystalhd
cygwin
darwin
disable_mmx_for_debugging
Expand Down Expand Up @@ -2273,7 +2270,6 @@ rdft_select="fft"
# decoders / encoders

# hardware accelerators
crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32"
dxva2_extralibs="-luser32"

Expand Down Expand Up @@ -5737,7 +5733,6 @@ check_header dxva.h
check_header dxva2api.h -D_WIN32_WINNT=0x0600
check_header fcntl.h
check_header io.h
check_header libcrystalhd/libcrystalhd_if.h
check_header mach/mach_time.h
check_header malloc.h
check_header net/udplite.h
Expand Down Expand Up @@ -6211,8 +6206,6 @@ enabled vdpau &&
enabled vdpau &&
check_lib vdpau_x11 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau -lX11

enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd

enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
enabled debug && add_cxxflags -g"$debuglevel"

Expand Down Expand Up @@ -7396,7 +7389,6 @@ if enabled x11 ; then
echo "VAAPI support ${vaapi-no}"
echo "VAAPI2 support ${vaapi2-no}"
echo "NVDEC support ${nvdec-no}"
echo "CrystalHD support ${crystalhd-no}"
echo "OpenMAX support ${openmax-no}"
if enabled openmax ; then
echo "OpenMAX Broadcom ${openmax_broadcom-no}"
Expand Down
7 changes: 0 additions & 7 deletions mythtv/libs/libmythtv/libmythtv.pro
Expand Up @@ -372,13 +372,6 @@ using_frontend {
SOURCES += privatedecoder.cpp
SOURCES += mythcodeccontext.cpp

using_crystalhd {
DEFINES += USING_CRYSTALHD
HEADERS += privatedecoder_crystalhd.h
SOURCES += privatedecoder_crystalhd.cpp
LIBS += -lcrystalhd
}

using_openmax {
DEFINES += USING_OPENMAX
HEADERS += privatedecoder_omx.h
Expand Down
19 changes: 2 additions & 17 deletions mythtv/libs/libmythtv/privatedecoder.cpp
Expand Up @@ -4,21 +4,13 @@
#include "privatedecoder_omx.h"
#endif

#ifdef USING_CRYSTALHD
#include "privatedecoder_crystalhd.h"
#endif

void PrivateDecoder::GetDecoders(render_opts &opts)
{
#ifdef USING_OPENMAX
PrivateDecoderOMX::GetDecoders(opts);
#endif

#ifdef USING_CRYSTALHD
PrivateDecoderCrystalHD::GetDecoders(opts);
#endif

#if !(defined(Q_OS_MACX) || USING_OPENMAX || USING_CRYSTALHD)
#if !(USING_OPENMAX)
Q_UNUSED(opts);
#endif
}
Expand All @@ -34,14 +26,7 @@ PrivateDecoder* PrivateDecoder::Create(const QString &decoder,
delete omx;
#endif

#ifdef USING_CRYSTALHD
PrivateDecoderCrystalHD *chd = new PrivateDecoderCrystalHD();
if (chd && chd->Init(decoder, flags, avctx))
return chd;
delete chd;
#endif

#if !(defined(Q_OS_MACX) || USING_OPENMAX || USING_CRYSTALHD)
#if !(USING_OPENMAX)
Q_UNUSED(decoder);
Q_UNUSED(flags);
Q_UNUSED(avctx);
Expand Down

0 comments on commit aef44a9

Please sign in to comment.