Skip to content

Commit

Permalink
libmythtv: Move hardware decoder context classes into 'decoders'
Browse files Browse the repository at this point in the history
- along with the base class
  • Loading branch information
mark-kendall committed Nov 1, 2019
1 parent 66024f5 commit 379ed52
Show file tree
Hide file tree
Showing 18 changed files with 17 additions and 17 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
32 changes: 16 additions & 16 deletions mythtv/libs/libmythtv/libmythtv.pro
Expand Up @@ -69,8 +69,8 @@ macx {
LIBS += -framework VideoToolBox
LIBS += -framework IOSurface
DEFINES += USING_VTB
HEADERS += opengl/mythvtbinterop.h mythvtbcontext.h
SOURCES += opengl/mythvtbinterop.cpp mythvtbcontext.cpp
HEADERS += opengl/mythvtbinterop.h decoders/mythvtbcontext.h
SOURCES += opengl/mythvtbinterop.cpp decoders/mythvtbcontext.cpp

using_firewire:using_backend {
QMAKE_CXXFLAGS += -F$${CONFIG_MAC_AVC}
Expand Down Expand Up @@ -375,8 +375,8 @@ using_frontend {
SOURCES += decoders/mythcodeccontext.cpp

using_mmal {
HEADERS += mythmmalcontext.h opengl/mythmmalinterop.h
SOURCES += mythmmalcontext.cpp opengl/mythmmalinterop.cpp
HEADERS += decoders/mythmmalcontext.h opengl/mythmmalinterop.h
SOURCES += decoders/mythmmalcontext.cpp opengl/mythmmalinterop.cpp
LIBS += -L/opt/vc/lib -lmmal -lvcsm
LIBS += -lEGL
DEFINES += USING_MMAL
Expand Down Expand Up @@ -457,11 +457,11 @@ using_frontend {
using_vdpau {
DEFINES += USING_VDPAU
HEADERS += opengl/mythvdpauinterop.h
HEADERS += mythvdpaucontext.h
HEADERS += mythvdpauhelper.h
HEADERS += decoders/mythvdpaucontext.h
HEADERS += decoders/mythvdpauhelper.h
SOURCES += opengl/mythvdpauinterop.cpp
SOURCES += mythvdpaucontext.cpp
SOURCES += mythvdpauhelper.cpp
SOURCES += decoders/mythvdpaucontext.cpp
SOURCES += decoders/mythvdpauhelper.cpp
LIBS += -lvdpau
}

Expand All @@ -485,24 +485,24 @@ using_frontend {

using_vaapi:using_opengl_video {
DEFINES += USING_VAAPI
HEADERS += mythvaapicontext.h opengl/mythvaapiinterop.h
SOURCES += mythvaapicontext.cpp opengl/mythvaapiinterop.cpp
HEADERS += decoders/mythvaapicontext.h opengl/mythvaapiinterop.h
SOURCES += decoders/mythvaapicontext.cpp opengl/mythvaapiinterop.cpp
LIBS += -lva -lva-x11 -lva-glx -lEGL
}

using_nvdec {
DEFINES += USING_NVDEC
HEADERS += opengl/mythnvdecinterop.h
HEADERS += mythnvdeccontext.h
HEADERS += decoders/mythnvdeccontext.h
SOURCES += opengl/mythnvdecinterop.cpp
SOURCES += mythnvdeccontext.cpp
SOURCES += decoders/mythnvdeccontext.cpp
INCLUDEPATH += ../../external/nv-codec-headers/include
}

using_mediacodec {
DEFINES += USING_MEDIACODEC
HEADERS += mythmediacodeccontext.h opengl/mythmediacodecinterop.h
SOURCES += mythmediacodeccontext.cpp opengl/mythmediacodecinterop.cpp
HEADERS += decoders/mythmediacodeccontext.h opengl/mythmediacodecinterop.h
SOURCES += decoders/mythmediacodeccontext.cpp opengl/mythmediacodecinterop.cpp
}

# Misc. frontend
Expand Down Expand Up @@ -672,8 +672,8 @@ using_backend {
HEADERS += recorders/v4l2encsignalmonitor.h
SOURCES += recorders/v4l2encsignalmonitor.cpp

HEADERS += mythv4l2m2mcontext.h
SOURCES += mythv4l2m2mcontext.cpp
HEADERS += decoders/mythv4l2m2mcontext.h
SOURCES += decoders/mythv4l2m2mcontext.cpp
DEFINES += USING_V4L2
}

Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/globalsettings.cpp
Expand Up @@ -47,7 +47,7 @@
#include "AirPlay/mythraopconnection.h"
#endif
#ifdef USING_VAAPI
#include "mythvaapicontext.h"
#include "decoders/mythvaapicontext.h"
#endif

//Use for playBackGroup, to be remove at one point
Expand Down

0 comments on commit 379ed52

Please sign in to comment.