Advertisement
Guest User

Untitled

a guest
Apr 13th, 2012
40
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.75 KB | None | 0 0
  1. diff --git a/mythtv/libs/libmythtv/videoout_xv.cpp b/mythtv/libs/libmythtv/videoout_xv.cpp
  2. index f2f5827..1d80e0d 100644
  3. --- a/mythtv/libs/libmythtv/videoout_xv.cpp
  4. +++ b/mythtv/libs/libmythtv/videoout_xv.cpp
  5. @@ -147,6 +147,7 @@ VideoOutputXv::VideoOutputXv()
  6. xv_port(-1), xv_hue_base(0),
  7. xv_colorkey(0), xv_draw_colorkey(false),
  8. xv_chroma(0), xv_set_defaults(false),
  9. + xv_use_picture_controls(true),
  10.  
  11. chroma_osd(NULL)
  12. {
  13. @@ -610,6 +611,8 @@ bool VideoOutputXv::InitXVideo()
  14. .arg(adaptor_name));
  15.  
  16. xv_hue_base = VideoOutput::CalcHueBase(adaptor_name);
  17. + xv_use_picture_controls =
  18. + adaptor_name != "Intel(R) Textured Video";
  19.  
  20. bool foundimageformat = false;
  21. int ids[] = { GUID_YV12_PLANAR, GUID_I420_PLANAR, GUID_IYUV_PLANAR, };
  22. @@ -854,7 +857,9 @@ bool VideoOutputXv::InitSetupBuffers(void)
  23. if (xv_port && (VideoOutputSubType() >= XVideo))
  24. save_port_attributes(xv_port);
  25.  
  26. - InitPictureAttributes();
  27. + // Initialize the picture controls if we need to..
  28. + if (xv_use_picture_controls)
  29. + InitPictureAttributes();
  30.  
  31. return true;
  32. }
  33. diff --git a/mythtv/libs/libmythtv/videoout_xv.h b/mythtv/libs/libmythtv/videoout_xv.h
  34. index 8ba0317..c8297f2 100644
  35. --- a/mythtv/libs/libmythtv/videoout_xv.h
  36. +++ b/mythtv/libs/libmythtv/videoout_xv.h
  37. @@ -153,6 +153,7 @@ class VideoOutputXv : public VideoOutput
  38. bool xv_set_defaults;
  39. buffer_map_t xv_buffers;
  40. bool xv_need_bobdeint_repaint;
  41. + bool xv_use_picture_controls;
  42. QMap<PictureAttribute,int> xv_attribute_min;
  43. QMap<PictureAttribute,int> xv_attribute_max;
  44. QMap<PictureAttribute,int> xv_attribute_def;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement