PrivateDecoders: Use the PlayerFlags.

MythTV · Dec 7, 2011 · 2427bc2 · 2427bc2
1 parent c66767d
commit 2427bc2
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -1896,11 +1896,10 @@ int AvFormatDecoder::ScanStreams(bool novideo)
                 if (selectedTrack[kTrackTypeVideo].av_stream_index < 0)
                     selectedTrack[kTrackTypeVideo] = si;
 
-                if (!FlagIsSet(kVideoIsNull) && FlagIsSet(kDecodeAllowEXT) &&
+                if (!FlagIsSet(kVideoIsNull) &&
                    (selectedTrack[kTrackTypeVideo].av_stream_index == (int) i))
                 {
-                    private_dec = PrivateDecoder::Create(
-                                    dec, !FlagIsSet(kDecodeAllowGPU), enc);
+                    private_dec = PrivateDecoder::Create(dec, playerFlags, enc);
                     if (private_dec)
                         thread_count = 1;
                 }

diff --git a/mythtv/libs/libmythtv/privatedecoder.cpp b/mythtv/libs/libmythtv/privatedecoder.cpp
@@ -20,19 +20,19 @@ void PrivateDecoder::GetDecoders(render_opts &opts)
 }
 
 PrivateDecoder* PrivateDecoder::Create(const QString &decoder,
-                                       bool no_hardware_decode,
+                                       PlayerFlags flags,
                                        AVCodecContext *avctx)
 {
 #if defined(Q_OS_MACX)
     PrivateDecoderVDA *vda = new PrivateDecoderVDA();
-    if (vda && vda->Init(decoder, no_hardware_decode, avctx))
+    if (vda && vda->Init(decoder, flags, avctx))
         return vda;
     delete vda;
 #endif
 
 #ifdef USING_CRYSTALHD
     PrivateDecoderCrystalHD *chd = new PrivateDecoderCrystalHD();
-    if (chd && chd->Init(decoder, no_hardware_decode, avctx))
+    if (chd && chd->Init(decoder, flags, avctx))
         return chd;
     delete chd;
 #endif

diff --git a/mythtv/libs/libmythtv/privatedecoder.h b/mythtv/libs/libmythtv/privatedecoder.h
@@ -9,19 +9,20 @@ extern "C" {
 
 #include "videodisplayprofile.h"
 #include "mythcodecid.h"
+#include "mythplayer.h"
 
 class PrivateDecoder
 {
   public:
     static void GetDecoders(render_opts &opts);
     static PrivateDecoder* Create(const QString &decoder,
-                                  bool no_hardware_decode,
+                                  PlayerFlags flags,
                                   AVCodecContext *avctx);
     PrivateDecoder() { }
     virtual ~PrivateDecoder() { }
     virtual QString GetName(void) = 0;
     virtual bool Init(const QString &decoder,
-                      bool no_hardware_decode,
+                      PlayerFlags flags,
                       AVCodecContext *avctx) = 0;
     virtual bool Reset(void) = 0;
     virtual int  GetFrame(AVStream *stream,

diff --git a/mythtv/libs/libmythtv/privatedecoder_crystalhd.cpp b/mythtv/libs/libmythtv/privatedecoder_crystalhd.cpp
@@ -87,12 +87,11 @@ PrivateDecoderCrystalHD::~PrivateDecoderCrystalHD()
 }
 
 bool PrivateDecoderCrystalHD::Init(const QString &decoder,
-                                   bool no_hardware_decode,
+                                   PlayerFlags flags,
                                    AVCodecContext *avctx)
 {
-    if ((decoder != "crystalhd") || no_hardware_decode || !avctx)
-        return false;
-    if (getenv("NO_CRYSTALHD"))
+    if ((decoder != "crystalhd") || !(flags & kDecodeAllowEXT) ||
+        !avctx || getenv("NO_CRYSTALHD"))
         return false;
 
     static bool debugged = false;

diff --git a/mythtv/libs/libmythtv/privatedecoder_crystalhd.h b/mythtv/libs/libmythtv/privatedecoder_crystalhd.h
@@ -54,7 +54,7 @@ class PrivateDecoderCrystalHD : public PrivateDecoder
     virtual ~PrivateDecoderCrystalHD();
     virtual QString GetName(void) { return QString("crystalhd"); }
     virtual bool Init(const QString &decoder,
-                      bool no_hardware_decode,
+                      PlayerFlags flags,
                       AVCodecContext *avctx);
     virtual bool Reset(void);
     virtual int  GetFrame(AVStream *stream,

diff --git a/mythtv/libs/libmythtv/privatedecoder_vda.cpp b/mythtv/libs/libmythtv/privatedecoder_vda.cpp
@@ -134,11 +134,11 @@ PrivateDecoderVDA::~PrivateDecoderVDA()
 }
 
 bool PrivateDecoderVDA::Init(const QString &decoder,
-                             bool no_hardware_decode,
+                             PlayerFlags flags,
                              AVCodecContext *avctx)
 {
     if ((decoder != "vda") || (avctx->codec_id != CODEC_ID_H264) ||
-        no_hardware_decode || !avctx)
+        !(flags & kDecodeAllowEXT) || !avctx)
         return false;
 
     m_lib = VDALibrary::GetVDALibrary();

diff --git a/mythtv/libs/libmythtv/privatedecoder_vda.h b/mythtv/libs/libmythtv/privatedecoder_vda.h
@@ -58,7 +58,7 @@ class PrivateDecoderVDA : public PrivateDecoder
     virtual ~PrivateDecoderVDA();
     virtual QString GetName(void) { return "vda"; }
     virtual bool Init(const QString &decoder,
-                      bool no_hardware_decode,
+                      PlayerFlags flags,
                       AVCodecContext *avctx);
     virtual bool Reset(void);
     virtual int  GetFrame(AVStream *stream,