Ticket #4070: 4070-v1.patch

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -215 +215 @@
       yuv_scaler(NULL),             yuv_frame_scaled(NULL),
       yuv_scaler_in_size(0,0),      yuv_scaler_out_size(0,0),
       // Filters
-      videoFilterList(""),
+      videoFiltersForProgram(""),   videoFiltersOverride(""),
       postfilt_width(0),            postfilt_height(0),
       videoFilters(NULL),           FiltMan(new FilterManager()),
       // Commercial filtering
@@ -264 +264 @@
     vbimode = VBIMode::Parse(gContext->GetSetting("VbiFormat"));
 
     if (info)
-    {
-        m_playbackinfo = new ProgramInfo(*info);
-        m_playbackinfo->MarkAsInUse(true, m_recusage);
-    }
+        SetPlaybackInfo(new ProgramInfo(*info));
 
     commrewindamount = gContext->GetNumSetting("CommRewindAmount",0);
     commnotifyamount = gContext->GetNumSetting("CommNotifyAmount",0);
@@ -296 +293 @@
     if (audioOutput)
         delete audioOutput;
 
-    if (m_playbackinfo)
-    {
-        m_playbackinfo->MarkAsInUse(false);
-        delete m_playbackinfo;
-    }
+    SetPlaybackInfo(NULL);
 
     if (weMadeBuffer)
         delete ringBuffer;
@@ -506 +499 @@
     return video_actually_paused;
 }
 
+void NuppelVideoPlayer::SetPlaybackInfo(ProgramInfo *pginfo)
+{
+    if (m_playbackinfo)
+    {
+        m_playbackinfo->MarkAsInUse(false);
+        delete m_playbackinfo;
+        videoFiltersForProgram = QString::null;
+    }
+
+    m_playbackinfo = pginfo;
+
+    if (m_playbackinfo)
+    {
+        m_playbackinfo->MarkAsInUse(true, m_recusage);
+        videoFiltersForProgram =
+            QDeepCopy<QString>(m_playbackinfo->chanOutputFilters);
+    }
+}
+
 void NuppelVideoPlayer::SetPrebuffering(bool prebuffer)
 {
     prebuffering_lock.lock();
@@ -529 +541 @@
 
 bool NuppelVideoPlayer::InitVideo(void)
 {
-    InitFilters();
     if (using_null_videoout)
     {
         videoOutput = new VideoOutputNull();
@@ -610 +621 @@
 
     SetCaptionsEnabled(gContext->GetNumSetting("DefaultCCMode"), false);
 
+    InitFilters();
+
     return true;
 }
 
@@ -633 +646 @@
 
 void NuppelVideoPlayer::ReinitVideo(void)
 {
-    InitFilters();
-
     vidExitLock.lock();
     videofiltersLock.lock();
 
@@ -676 +687 @@
         DisableCaptions(textDisplayMode, false);
         SetCaptionsEnabled(true, false);
     }
+
+    InitFilters();
 }
 
 QString NuppelVideoPlayer::ReinitAudio(void)
@@ -1118 +1131 @@
     VideoFrameType otmp = FMT_YV12;
     int btmp;
 
+    QString filters = "";
+    if (videoOutput)
+        filters = videoOutput->GetFilters();
+
+    if (!videoFiltersForProgram.isEmpty())
+    {
+        if (videoFiltersForProgram[0] != '+')
+        {
+            filters = QDeepCopy<QString>(videoFiltersForProgram);
+        }
+        else
+        {
+            if ((filters.length() > 1) && (filters.right(1) != ","))
+                filters += ",";
+            filters += QDeepCopy<QString>(videoFiltersForProgram.mid(1));
+        }
+    }
+
+    if (!videoFiltersOverride.isEmpty())
+        filters = QDeepCopy<QString>(videoFiltersOverride);
+
     videofiltersLock.lock();
 
     if (videoFilters)
@@ -1125 +1159 @@
 
     postfilt_width = video_width;
     postfilt_height = video_height;
-    videoFilters = FiltMan->LoadFilters(videoFilterList, itmp, otmp,
+    videoFilters = FiltMan->LoadFilters(filters, itmp, otmp,
                                         postfilt_width, postfilt_height, btmp);
 
+    VERBOSE(VB_PLAYBACK, LOC + QString("LoadFilters('%1'..) -> ")
+            .arg(filters)<<videoFilters);
+
     videofiltersLock.unlock();
 }
 
@@ -2877 +2914 @@
 
     bool newIsDummy = livetvchain->GetCardType(newid) == "DUMMY";
 
-    if (m_playbackinfo)
-    {
-        m_playbackinfo->MarkAsInUse(false);
-        delete m_playbackinfo;
-    }
+    SetPlaybackInfo(pginfo);
 
-    m_playbackinfo = pginfo;
-    m_playbackinfo->MarkAsInUse(true, m_recusage);
-
     ringBuffer->Pause();
     ringBuffer->WaitForPause();
 
@@ -2996 +3026 @@
     long long nextpos = livetvchain->GetJumpPos();
     bool newIsDummy = livetvchain->GetCardType(newid) == "DUMMY";
     
-    if (m_playbackinfo)
-    {
-        m_playbackinfo->MarkAsInUse(false);
-        delete m_playbackinfo;
-    }
+    SetPlaybackInfo(pginfo);
 
-    m_playbackinfo = pginfo;
-    m_playbackinfo->MarkAsInUse(true, m_recusage);
-
     ringBuffer->Pause();
     ringBuffer->WaitForPause();
 

libs/libmythtv/tv_play.h

@@ -229 +229 @@
     void StartOSD(void);
     void StopStuff(bool stopRingbuffers, bool stopPlayers, bool stopRecorders);
     
-    QString GetFiltersForChannel(void);
-
     void ToggleChannelFavorite(void);
     void ChangeChannel(int direction);
     void ChangeChannel(uint chanid, const QString &channum);

libs/libmythtv/NuppelVideoPlayer.h

@@ -139 +139 @@
     void SetRingBuffer(RingBuffer *rbuf)      { ringBuffer = rbuf; }
     void SetLiveTVChain(LiveTVChain *tvchain) { livetvchain = tvchain; }
     void SetLength(int len)                   { totalLength = len; }
-    void SetVideoFilters(QString &filters)    { videoFilterList = filters; }
+    void SetVideoFilters(const QString &override)
+        { videoFiltersOverride = QDeepCopy<QString>(override); }
     void SetFramesPlayed(long long played)    { framesPlayed = played; }
     void SetEof(void)                         { eof = true; }
     void SetPipPlayer(NuppelVideoPlayer *pip)
@@ -414 +415 @@
     void AutoDeint(VideoFrame*);
 
     // Private Sets
+    void SetPlaybackInfo(ProgramInfo *pginfo);
     void SetPrebuffering(bool prebuffer);
 
     // Private Gets
@@ -702 +704 @@
 
     // Filters
     QMutex   videofiltersLock;
-    QString  videoFilterList;
+    QString  videoFiltersForProgram;
+    QString  videoFiltersOverride;
     int      postfilt_width;  ///< Post-Filter (output) width
     int      postfilt_height; ///< Post-Filter (output) height
     FilterChain   *videoFilters;

libs/libmythtv/tv_play.cpp

@@ -1514 +1514 @@
         return;
     }
 
-    QString filters = "";
-    
-    
     nvp = new NuppelVideoPlayer("player", playbackinfo);
     nvp->SetParentWidget(myWindow);
     nvp->SetParentPlayer(this);
@@ -1533 +1530 @@
 
     nvp->SetAudioStretchFactor(normal_speed);
 
-    filters = GetFiltersForChannel();
-    nvp->SetVideoFilters(filters);
-
     if (embedWinID > 0)
         nvp->EmbedInWidget(embedWinID, embedBounds.x(), embedBounds.y(),
                            embedBounds.width(), embedBounds.height());
@@ -1550 +1544 @@
         udpnotify = NULL;
 }
 
-
-QString TV::GetFiltersForChannel()
-{
-    QString filters;
-    QString chanFilters;
-    
-    QString chan_name;
-
-    pbinfoLock.lock();    
-    if (playbackinfo) // Recordings have this info already.
-        chanFilters = playbackinfo->chanOutputFilters;
-    pbinfoLock.unlock();    
-
-    if ((chanFilters.length() > 1) && (chanFilters[0] != '+'))
-    {
-        filters = chanFilters;
-    }
-    else
-    {
-        filters = baseFilters;
-
-        if ((filters.length() > 1) && (filters.right(1) != ","))
-            filters += ",";
-
-        filters += chanFilters.mid(1);
-    }
-    
-    VERBOSE(VB_CHANNEL, LOC +
-            QString("Output filters for this channel are: '%1'").arg(filters));
-    return filters;
-}
-
 void TV::SetupPipPlayer(void)
 {
     if (pipnvp)
@@ -7375 +7337 @@
 
         chain->JumpTo(-1, 1);
 
-        QString filters = GetFiltersForChannel();
-        activenvp->SetVideoFilters(filters);
         activenvp->Play(normal_speed, true, false);
         activerbuffer->IgnoreLiveEOF(false);
     }

libs/libmythtv/videooutbase.cpp

@@ -367 +367 @@
         osd->DisableFade();
 }
 
+QString VideoOutput::GetFilters(void) const
+{
+    return db_vdisp_profile->GetFilters();
+}
+
 void VideoOutput::SetVideoFrameRate(float playback_fps)
 {
     db_vdisp_profile->SetOutput(playback_fps);

libs/libmythtv/videooutbase.h

@@ -207 +207 @@
 
     /// \brief returns QRect of PIP based on PIPLocation
     virtual QRect GetPIPRect(int location, NuppelVideoPlayer *pipplayer = NULL);
+
+    QString GetFilters(void) const;
+
   protected:
     void InitBuffers(int numdecode, bool extra_for_pause, int need_free,
                      int needprebuffer_normal, int needprebuffer_small,