VDPAU: Avoid an extra call to VideoDisplayProfile

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

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -1825,7 +1825,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
 #ifdef USING_VDPAU
                     MythCodecID vdpau_mcid;
                     vdpau_mcid = VideoOutputVDPAU::GetBestSupportedCodec(
-                        width, height,
+                        width, height, dec,
                         mpeg_version(enc->codec_id),
                         !FlagIsSet(kDecodeAllowGPU));
 

diff --git a/mythtv/libs/libmythtv/videoout_vdpau.cpp b/mythtv/libs/libmythtv/videoout_vdpau.cpp
@@ -918,21 +918,18 @@ QStringList VideoOutputVDPAU::GetAllowedRenderers(
 }
 
 MythCodecID VideoOutputVDPAU::GetBestSupportedCodec(
-    uint width,       uint height,
+    uint width, uint height, const QString &decoder,
     uint stream_type, bool no_acceleration)
 {
     bool use_cpu = no_acceleration;
-    VideoDisplayProfile vdp;
-    vdp.SetInput(QSize(width, height));
-    QString dec = vdp.GetDecoder();
 
     MythCodecID test_cid = (MythCodecID)(kCodec_MPEG1_VDPAU + (stream_type-1));
     use_cpu |= !codec_is_vdpau_hw(test_cid);
     if (test_cid == kCodec_MPEG4_VDPAU)
         use_cpu |= !MythRenderVDPAU::IsMPEG4Available();
     if (test_cid == kCodec_H264_VDPAU)
         use_cpu |= !MythRenderVDPAU::H264DecoderSizeSupported(width, height);
-    if ((dec != "vdpau") || getenv("NO_VDPAU") || use_cpu)
+    if ((decoder != "vdpau") || getenv("NO_VDPAU") || use_cpu)
         return (MythCodecID)(kCodec_MPEG1 + (stream_type-1));
 
     return test_cid;

diff --git a/mythtv/libs/libmythtv/videoout_vdpau.h b/mythtv/libs/libmythtv/videoout_vdpau.h
@@ -52,6 +52,7 @@ class VideoOutputVDPAU : public VideoOutput
     static QStringList GetAllowedRenderers(MythCodecID myth_codec_id,
                                     const QSize &video_dim);
     static MythCodecID GetBestSupportedCodec(uint width, uint height,
+                                             const QString &decoder,
                                              uint stream_type,
                                              bool no_acceleration);
     virtual bool IsPIPSupported(void) const { return true;  }