Skip to content
Browse files

Disable Picture-In-Picture and Picture-By-Picture

This was broken by recent threading changes. Unfortunately there is a
large chunk of code in the TV class that needs cleaning up before it can
be properly fixed, hence I'm disabling for the time being rather than
add workarounds.

I'll 'rebuild' PiP/PBP once the main playback thread issues have been
resolved.

(Manually) Cherry picked from 27e125f
  • Loading branch information...
1 parent 6318d52 commit d0976dab0f5eef1473cb11900774aea478d27f02 Mark Kendall committed
View
2 mythtv/libs/libmythtv/videoout_d3d.h
@@ -43,7 +43,7 @@ class VideoOutputD3D : public VideoOutput
MythPlayer *pipplayer,
PIPLocation loc);
void RemovePIP(MythPlayer *pipplayer);
- bool IsPIPSupported(void) const { return true; }
+ bool IsPIPSupported(void) const { return false; /*true*/}
virtual MythPainter *GetOSDPainter(void) { return (MythPainter*)m_osd_painter; }
private:
View
2 mythtv/libs/libmythtv/videoout_opengl.h
@@ -46,7 +46,7 @@ class VideoOutputOpenGL : public VideoOutput
void MoveResizeWindow(QRect new_rect);
virtual void RemovePIP(MythPlayer *pipplayer);
- virtual bool IsPIPSupported(void) const { return true; }
+ virtual bool IsPIPSupported(void) const { return false/*true*/; }
virtual bool hasFullScreenOSD(void) const { return true; }
virtual bool IsSyncLocked(void) const { return true; }
virtual bool ApproveDeintFilter(const QString& filtername) const;
View
2 mythtv/libs/libmythtv/videoout_vdpau.h
@@ -55,7 +55,7 @@ class VideoOutputVDPAU : public VideoOutput
static MythCodecID GetBestSupportedCodec(uint width, uint height,
uint stream_type,
bool no_acceleration);
- virtual bool IsPIPSupported(void) const { return true; }
+ virtual bool IsPIPSupported(void) const { return false;/*true; */}
virtual bool IsPBPSupported(void) const { return false; }
virtual bool NeedExtraAudioDecode(void) const
{ return codec_is_vdpau(video_codec_id); }
View
6 mythtv/libs/libmythtv/videoout_xv.h
@@ -91,10 +91,8 @@ class VideoOutputXv : public VideoOutput
int SetPictureAttribute(PictureAttribute attribute, int newValue);
void InitPictureAttributes(void);
- virtual bool IsPIPSupported(void) const
- { return XVideo == VideoOutputSubType(); }
- virtual bool IsPBPSupported(void) const
- { return XVideo == VideoOutputSubType(); }
+ virtual bool IsPIPSupported(void) const { return false; }
+ virtual bool IsPBPSupported(void) const { return false; }
virtual bool NeedExtraAudioDecode(void) const
{ return XVideoMC <= VideoOutputSubType(); }
virtual bool hasHWAcceleration(void) const

0 comments on commit d0976da

Please sign in to comment.
Something went wrong with that request. Please try again.