API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Mar 14th, 2012
43
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.05 KB | None | 0 0
raw download clone embed print report
  1. jyaimac:mythtv jyavenard$ cat newprofiles.diff
  2. diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
  3. index 1799ab8..25a4c49 100644
  4. --- a/mythtv/libs/libmythbase/mythversion.h
  5. +++ b/mythtv/libs/libmythbase/mythversion.h
  6. @@ -12,7 +12,7 @@
  7. /// Update this whenever the plug-in API changes.
  8. /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
  9. /// libmythui class methods used by plug-ins.
  10. -#define MYTH_BINARY_VERSION "0.25.20120307-2"
  11. +#define MYTH_BINARY_VERSION "0.25.20120314-2"
  12.  
  13. /** \brief Increment this whenever the MythTV network protocol changes.
  14. *
  15. diff --git a/mythtv/libs/libmythtv/privatedecoder_vda.h b/mythtv/libs/libmythtv/privatedecoder_vda.h
  16. index 4c6d291..ec16525 100644
  17. --- a/mythtv/libs/libmythtv/privatedecoder_vda.h
  18. +++ b/mythtv/libs/libmythtv/privatedecoder_vda.h
  19. @@ -17,7 +17,7 @@
  20. class VDALibrary
  21. {
  22. public:
  23. - static VDALibrary* GetVDALibrary(void);
  24. + static MTV_PUBLIC VDALibrary* GetVDALibrary(void);
  25. VDALibrary();
  26. bool IsValid(void) const { return m_valid; }
  27.  
  28. diff --git a/mythtv/libs/libmythtv/videodisplayprofile.cpp b/mythtv/libs/libmythtv/videodisplayprofile.cpp
  29. index 799f3c8..4736c9e 100644
  30. --- a/mythtv/libs/libmythtv/videodisplayprofile.cpp
  31. +++ b/mythtv/libs/libmythtv/videodisplayprofile.cpp
  32. @@ -1094,6 +1094,74 @@ void VideoDisplayProfile::CreateVDPAUProfiles(const QString &hostname)
  33. "vdpauskipchroma,vdpaucolorspace=auto");
  34. }
  35.  
  36. +#if defined(Q_OS_MACX)
  37. +void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname)
  38. +{
  39. + (void) QObject::tr("VDA High Quality", "Sample: VDA high quality");
  40. + DeleteProfileGroup("VDA High Quality", hostname);
  41. + uint groupid = CreateProfileGroup("VDA High Quality", hostname);
  42. + CreateProfile(groupid, 1, ">", 0, 0, "", 0, 0,
  43. + "vda", 2, true, "opengl", "opengl2", true,
  44. + "greedyhdoubleprocessdeint", "greedyhdeint",
  45. + "");
  46. + CreateProfile(groupid, 1, ">", 0, 0, "", 0, 0,
  47. + "ffmpeg", 2, true, "opengl", "opengl2", true,
  48. + "greedyhdoubleprocessdeint", "greedyhdeint",
  49. + "");
  50. +
  51. + (void) QObject::tr("VDA Normal", "Sample: VDA average quality");
  52. + DeleteProfileGroup("VDA Normal", hostname);
  53. + groupid = CreateProfileGroup("VDA Normal", hostname);
  54. + CreateProfile(groupid, 1, ">", 0, 0, "", 0, 0,
  55. + "vda", 2, true, "opengl", "opengl2", true,
  56. + "opengldoubleratekerneldeint", "openglkerneldeint",
  57. + "");
  58. + CreateProfile(groupid, 2, ">", 0, 0, "", 0, 0,
  59. + "ffmpeg", 2, true, "opengl", "opengl2", true,
  60. + "opengldoubleratekerneldeint", "openglkerneldeint",
  61. + "");
  62. +
  63. + (void) QObject::tr("VDA Slim", "Sample: VDA low power GPU");
  64. + DeleteProfileGroup("VDA Slim", hostname);
  65. + groupid = CreateProfileGroup("VDA Slim", hostname);
  66. + CreateProfile(groupid, 1, ">", 0, 0, "", 0, 0,
  67. + "vda", 2, true, "opengl", "opengl2", true,
  68. + "opengldoubleratelinearblend", "opengllinearblend",
  69. + "");
  70. + CreateProfile(groupid, 2, ">", 0, 0, "", 0, 0,
  71. + "ffmpeg", 2, true, "opengl", "opengl2", true,
  72. + "opengldoubleratelinearblend", "opengllinearblend",
  73. + "");
  74. +}
  75. +#endif
  76. +
  77. +void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname)
  78. +{
  79. + (void) QObject::tr("OpenGL High Quality", "Sample: OpenGL high quality");
  80. + DeleteProfileGroup("OpenGL High Quality", hostname);
  81. + uint groupid = CreateProfileGroup("OpenGL High Quality", hostname);
  82. + CreateProfile(groupid, 1, ">", 0, 0, "", 0, 0,
  83. + "ffmpeg", 2, true, "opengl", "opengl2", true,
  84. + "greedyhdoubleprocessdeint", "greedyhdeint",
  85. + "");
  86. +
  87. + (void) QObject::tr("OpenGL Normal", "Sample: OpenGL average quality");
  88. + DeleteProfileGroup("OpenGL Normal", hostname);
  89. + groupid = CreateProfileGroup("OpenGL Normal", hostname);
  90. + CreateProfile(groupid, 1, ">", 0, 0, "", 0, 0,
  91. + "ffmpeg", 2, true, "opengl", "opengl2", true,
  92. + "opengldoubleratekerneldeint", "openglkerneldeint",
  93. + "");
  94. +
  95. + (void) QObject::tr("OpenGL Slim", "Sample: OpenGL low power GPU");
  96. + DeleteProfileGroup("OpenGL Slim", hostname);
  97. + groupid = CreateProfileGroup("OpenGL Slim", hostname);
  98. + CreateProfile(groupid, 1, ">", 0, 0, "", 0, 0,
  99. + "ffmpeg", 1, true, "opengl", "opengl2", true,
  100. + "opengldoubleratelinearblend", "opengllinearblend",
  101. + "");
  102. +}
  103. +
  104. void VideoDisplayProfile::CreateProfiles(const QString &hostname)
  105. {
  106. CreateNewProfiles(hostname);
  107. diff --git a/mythtv/libs/libmythtv/videodisplayprofile.h b/mythtv/libs/libmythtv/videodisplayprofile.h
  108. index 70d9ba0..3df92bf 100644
  109. --- a/mythtv/libs/libmythtv/videodisplayprofile.h
  110. +++ b/mythtv/libs/libmythtv/videodisplayprofile.h
  111. @@ -150,6 +150,10 @@ class MTV_PUBLIC VideoDisplayProfile
  112. static void CreateProfiles(const QString &hostname);
  113. static void CreateNewProfiles(const QString &hostname);
  114. static void CreateVDPAUProfiles(const QString &hostname);
  115. +#if defined(Q_OS_MACX)
  116. + static void CreateVDAProfiles(const QString &hostname);
  117. +#endif
  118. + static void CreateOpenGLProfiles(const QString &hostname);
  119.  
  120. static QStringList GetVideoRenderers(const QString &decoder);
  121. static QString GetVideoRendererHelp(const QString &renderer);
  122. diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
  123. index efde374..b98a6c3 100644
  124. --- a/mythtv/programs/mythfrontend/globalsettings.cpp
  125. +++ b/mythtv/programs/mythfrontend/globalsettings.cpp
  126. @@ -39,6 +39,10 @@
  127. #include "mythdirs.h"
  128. #include "mythuihelper.h"
  129.  
  130. +#if defined(Q_OS_MACX)
  131. +#include "privatedecoder_vda.h"
  132. +#endif
  133. +
  134. static HostCheckBox *DecodeExtraAudio()
  135. {
  136. HostCheckBox *gc = new HostCheckBox("DecodeExtraAudio");
  137. @@ -1150,6 +1154,27 @@ PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str) :
  138. profiles = VideoDisplayProfile::GetProfiles(host);
  139. }
  140.  
  141. +#if defined(Q_OS_MACX)
  142. + if (VDALibrary::GetVDALibrary() != NULL)
  143. + {
  144. + if (!profiles.contains("VDA Normal") &&
  145. + !profiles.contains("VDA High Quality") &&
  146. + !profiles.contains("VDA Slim"))
  147. + {
  148. + VideoDisplayProfile::CreateVDAProfiles(host);
  149. + profiles = VideoDisplayProfile::GetProfiles(host);
  150. + }
  151. + }
  152. +#endif
  153. +
  154. + if (!profiles.contains("OpenGL Normal") &&
  155. + !profiles.contains("OpenGL High Quality") &&
  156. + !profiles.contains("OpenGL Slim"))
  157. + {
  158. + VideoDisplayProfile::CreateOpenGLProfiles(host);
  159. + profiles = VideoDisplayProfile::GetProfiles(host);
  160. + }
  161. +
  162. QString profile = VideoDisplayProfile::GetDefaultProfileName(host);
  163. if (!profiles.contains(profile))
  164. {
  165. jyaimac:mythtv jyavenard$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!