Ticket #4872: detectLetterboxV11.patch

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -29 +29 @@
 #include "mythdbcon.h"
 #include "dialogbox.h"
 #include "NuppelVideoPlayer.h"
+#include "DetectLetterbox.h"
 #include "audiooutput.h"
 #include "recordingprofile.h"
 #include "osdtypes.h"
@@ -272 +273 @@
       // Debugging variables
       output_jmeter(NULL)
 {
+
+    // Playback (output) zoom control
+    detect_letter_box = new DetectLetterbox(this);
+
     vbimode = VBIMode::Parse(gContext->GetSetting("VbiFormat"));
 
     commrewindamount = gContext->GetNumSetting("CommRewindAmount",0);
@@ -1404 +1409 @@
     buffer->timecode = timecode;
 
     videoOutput->ReleaseFrame(buffer);
+
+    detect_letter_box->Detect(buffer);
 }
 
 /** \fn NuppelVideoPlayer::DiscardVideoFrame(VideoFrame*)
@@ -2877 +2884 @@
     // handle scan type changes
     AutoDeint(frame);
 
+    detect_letter_box->SwitchTo(frame);
+
     FrameScanType ps = m_scan;
     if (kScan_Detect == m_scan || kScan_Ignore == m_scan)
         ps = kScan_Progressive;
@@ -5273 +5282 @@
 {
     if (videoOutput)
     {
+        detect_letter_box->SetDetectLetterbox(false);
         videoOutput->ToggleAdjustFill(adjustfillMode);
         ReinitOSD();
     }

libs/libmythtv/DetectLetterbox.cpp

@@ +1 @@
+// -*- Mode: c++ -*-
+
+// Qt headers
+#include <QApplication>
+#include <QKeyEvent>
+
+// MythTV headers
+#include "DetectLetterbox.h"
+#include "NuppelVideoPlayer.h"
+#include "videoouttypes.h"
+#include "videoout_xv.h"
+
+DetectLetterbox::DetectLetterbox(NuppelVideoPlayer* const nvp)
+{
+    int dbAdjustFill = gContext->GetNumSetting("AdjustFill", 0);
+    isDetectLetterbox = dbAdjustFill >= kAdjustFill_AutoDetect_DefaultOff;
+    detectLetterboxDefaultMode = (AdjustFillMode) max((int) kAdjustFill_Off,
+                                 dbAdjustFill - kAdjustFill_AutoDetect_DefaultOff);
+    detectLetterboxSwitchFrame = -1;
+    detectLetterboxPossibleHalfFrame = -1;
+    detectLetterboxPossibleFullFrame = -1;
+    detectLetterboxDetectedMode = nvp->GetAdjustFill();
+    detectLetterboxLimit = gContext->GetNumSetting("DetectLeterboxLimit", 75);
+    nupple_video_player = nvp;
+}
+
+DetectLetterbox::~DetectLetterbox()
+{
+}
+
+/** \fn DetectLetterbox::Detect(VideoFrame*)
+ *  \brief Detects if this frame is or is not letterboxed
+ *
+ *  If a change is detected detectLetterboxSwitchFrame and
+ *  detectLetterboxDetectedMode are set.
+ */
+void DetectLetterbox::Detect(VideoFrame *frame)
+{
+    unsigned char *buf = frame->buf;
+    int *pitches = frame->pitches;
+    int *offsets = frame->offsets;
+    const int width = frame->width;
+    const int height = frame->height;
+    const long long frameNumber = frame->frameNumber;
+    const int NUMBER_OF_DETECTION_LINES = 3; // How many lines are we looking at
+    const int THRESHOLD = 5; // Y component has to not vary more than this in the bars
+    const int HORIZONTAL_THRESHOLD = 4; // How tolerant are we that the image has horizontal edges
+
+    // If the black bars is larger than this limit we switch to Half or Full Mode
+    //    const int fullLimit = (int) (((height - width * 9 / 16) / 2) * detectLetterboxLimit / 100);
+    //    const int halfLimit = (int) (((height - width * 9 / 14) / 2) * detectLetterboxLimit / 100);
+    // If the black bars is larger than this limit we switch to Half or Full Mode
+    const int fullLimit = (int) ((height * (1 - nupple_video_player->GetVideoAspect() * 9 / 16) / 2) * detectLetterboxLimit / 100);
+    const int halfLimit = (int) ((height * (1 - nupple_video_player->GetVideoAspect() * 9 / 14) / 2) * detectLetterboxLimit / 100);
+
+    const int xPos[] = {width / 4, width / 2, width * 3 / 4};    // Lines to scan for black letterbox edge
+    int topHits = 0, bottomHits = 0, minTop = 0, minBottom = 0, maxTop = 0, maxBottom = 0;
+    int topHit[] = {0, 0, 0}, bottomHit[] = {0, 0, 0};
+
+    if (!GetDetectLetterbox())
+        return;
+
+    if (!nupple_video_player->getVideoOutput())
+        return;
+
+    switch (frame->codec) {
+        case FMT_YV12:
+            if (frameNumber == 1)
+                VERBOSE(VB_PLAYBACK, QString("Detect Letterbox: YV12 frame format detected"));
+            break;
+        default:
+            VERBOSE(VB_PLAYBACK, QString("Detect Letterbox: The source is not a supported frame format (was %1)").arg(frame->codec));
+            isDetectLetterbox = false;
+            return;
+    }
+
+    if (frameNumber < 0)
+    {
+        VERBOSE(VB_PLAYBACK, QString("Detect Letterbox: Strange frame number %1").arg(frameNumber));
+        return;
+    }
+
+    if (nupple_video_player->GetVideoAspect() > 1.5)
+    {
+        if (detectLetterboxDetectedMode != detectLetterboxDefaultMode)
+        {
+            VERBOSE(VB_PLAYBACK, QString("Detect Letterbox: The source is already in widescreen (aspect: %1)").arg(nupple_video_player->GetVideoAspect()));
+            detectLetterboxLock.lock();
+            detectLetterboxConsecutiveCounter = 0;
+            detectLetterboxDetectedMode = detectLetterboxDefaultMode;
+            detectLetterboxSwitchFrame = frameNumber;
+            detectLetterboxLock.unlock();
+        }
+        else
+        {
+            detectLetterboxConsecutiveCounter++;
+        }
+        VERBOSE(VB_PLAYBACK, QString("Detect Letterbox: The source is already in widescreen (aspect: %1)").arg(nupple_video_player->GetVideoAspect()));
+        isDetectLetterbox = false;
+        return;
+    }
+
+    // Establish the level of light in the edge
+    int averageY = 0;
+    for (int detectionLine = 0; detectionLine < NUMBER_OF_DETECTION_LINES; detectionLine++)
+    {
+        averageY += buf[offsets[0] + 5 * pitches[0]            + xPos[detectionLine]];
+        averageY += buf[offsets[0] + (height - 6) * pitches[0] + xPos[detectionLine]];
+    }
+    averageY /= NUMBER_OF_DETECTION_LINES * 2;
+    if (averageY > 64) // To bright to be a letterbox border
+        averageY = 0;
+
+    // Scan the detection lines
+    for (int y = 5; y < height / 4; y++) // skip first pixels incase of noise in the edge
+    {
+        for (int detectionLine = 0; detectionLine < NUMBER_OF_DETECTION_LINES; detectionLine++)
+        {
+            int Y = buf[offsets[0] +  y     * pitches[0] +  xPos[detectionLine]];
+            int U = buf[offsets[1] + (y>>1) * pitches[1] + (xPos[detectionLine]>>1)];
+            int V = buf[offsets[2] + (y>>1) * pitches[2] + (xPos[detectionLine]>>1)];
+            if ((!topHit[detectionLine]) &&
+                ( Y > averageY + THRESHOLD || Y < averageY - THRESHOLD ||
+                  U < 128 - 32 || U > 128 + 32 ||
+                  V < 128 - 32 || V > 128 + 32 ))
+            {
+                topHit[detectionLine] = y;
+                topHits++;
+                if (!minTop)
+                    minTop = y;
+                maxTop = y;
+            }
+
+            Y = buf[offsets[0] + (height-y-1     ) * pitches[0] + xPos[detectionLine]];
+            U = buf[offsets[1] + (height-y-1 >> 1) * pitches[1] + (xPos[detectionLine]>>1)];
+            V = buf[offsets[2] + (height-y-1 >> 1) * pitches[2] + (xPos[detectionLine]>>1)];
+            if ((!bottomHit[detectionLine]) &&
+                ( Y > averageY + THRESHOLD || Y < averageY - THRESHOLD ||
+                  U < 128 - 32 || U > 128 + 32 ||
+                  V < 128 - 32 || V > 128 + 32 ))
+            {
+                bottomHit[detectionLine] = y;
+                bottomHits++;
+                if (!minBottom)
+                    minBottom = y;
+                maxBottom = y;
+            }
+        }
+
+        if (topHits == NUMBER_OF_DETECTION_LINES && bottomHits == NUMBER_OF_DETECTION_LINES)
+        {
+            break;
+        }
+    }
+    if (topHits != NUMBER_OF_DETECTION_LINES) maxTop = height / 4;
+    if (!minTop) minTop = height / 4;
+    if (bottomHits != NUMBER_OF_DETECTION_LINES) maxBottom = height / 4;
+    if (!minBottom) minBottom = height / 4;
+
+    bool horizontal = ((minTop && maxTop - minTop < HORIZONTAL_THRESHOLD) &&
+                       (minBottom && maxBottom - minBottom < HORIZONTAL_THRESHOLD));
+
+    if (detectLetterboxSwitchFrame > frameNumber) // user is reversing
+    {
+        detectLetterboxLock.lock();
+        detectLetterboxDetectedMode = nupple_video_player->GetAdjustFill();
+        detectLetterboxSwitchFrame = -1;
+        detectLetterboxPossibleHalfFrame = -1;
+        detectLetterboxPossibleFullFrame = -1;
+        detectLetterboxLock.unlock();
+    }
+
+    if (minTop < halfLimit || minBottom < halfLimit)
+        detectLetterboxPossibleHalfFrame = -1;
+    if (minTop < fullLimit || minBottom < fullLimit)
+        detectLetterboxPossibleFullFrame = -1;
+
+    if (detectLetterboxDetectedMode != kAdjustFill_Full)
+    {
+        if (detectLetterboxPossibleHalfFrame == -1 &&
+            minTop > halfLimit && minBottom > halfLimit) {
+            detectLetterboxPossibleHalfFrame = frameNumber;
+        }
+    }
+    else
+    {
+        if (detectLetterboxPossibleHalfFrame == -1 &&
+            minTop < fullLimit && minBottom < fullLimit) {
+            detectLetterboxPossibleHalfFrame = frameNumber;
+        }
+    }
+    if (detectLetterboxPossibleFullFrame == -1 && minTop > fullLimit && minBottom > fullLimit)
+        detectLetterboxPossibleFullFrame = frameNumber;
+
+    if ( maxTop < halfLimit || maxBottom < halfLimit) // Not to restrictive when switching to off
+    {
+        // No Letterbox
+        if (detectLetterboxDetectedMode != detectLetterboxDefaultMode)
+        {
+            VERBOSE(VB_PLAYBACK, QString("Detect Letterbox: Non Letterbox detected on line: %1 (limit: %2)").arg(min(maxTop, maxBottom)).arg(halfLimit));
+            detectLetterboxLock.lock();
+            detectLetterboxConsecutiveCounter = 0;
+            detectLetterboxDetectedMode = detectLetterboxDefaultMode;
+            detectLetterboxSwitchFrame = frameNumber;
+            detectLetterboxLock.unlock();
+        }
+        else
+        {
+            detectLetterboxConsecutiveCounter++;
+        }
+    }
+    else if (horizontal && minTop > halfLimit && minBottom > halfLimit &&
+             maxTop < fullLimit && maxBottom < fullLimit)
+    {
+        // Letterbox (with narrow bars)
+        if (detectLetterboxDetectedMode != kAdjustFill_Half)
+        {
+            VERBOSE(VB_PLAYBACK, QString("Detect Letterbox: Narrow Letterbox detected on line: %1 (limit: %2) frame: %3").arg(minTop).arg(halfLimit).arg(detectLetterboxPossibleHalfFrame));
+            detectLetterboxLock.lock();
+            detectLetterboxConsecutiveCounter = 0;
+            if (detectLetterboxDetectedMode == kAdjustFill_Full &&
+                detectLetterboxSwitchFrame != -1) {
+                // Do not change switch frame if switch to Full mode has not been executed yet
+            }
+            else
+                detectLetterboxSwitchFrame = detectLetterboxPossibleHalfFrame;
+            detectLetterboxDetectedMode = kAdjustFill_Half;
+            detectLetterboxLock.unlock();
+        }
+        else
+        {
+            detectLetterboxConsecutiveCounter++;
+        }
+    }
+    else if (horizontal && minTop > fullLimit && minBottom > fullLimit)
+    {
+        // Letterbox
+        detectLetterboxPossibleHalfFrame = -1;
+        if (detectLetterboxDetectedMode != kAdjustFill_Full)
+        {
+            VERBOSE(VB_PLAYBACK, QString("Detect Letterbox: Detected Letterbox on line: %1 (limit: %2) frame: %2").arg(minTop).arg(fullLimit).arg(detectLetterboxPossibleFullFrame));
+            detectLetterboxLock.lock();
+            detectLetterboxConsecutiveCounter = 0;
+            detectLetterboxDetectedMode = kAdjustFill_Full;
+            detectLetterboxSwitchFrame = detectLetterboxPossibleFullFrame;
+            detectLetterboxLock.unlock();
+        }
+        else
+        {
+            detectLetterboxConsecutiveCounter++;
+        }
+    }
+    else
+    {
+        if (detectLetterboxConsecutiveCounter <= 3)
+            detectLetterboxConsecutiveCounter = 0;
+    }
+}
+
+/** \fn DetectLetterbox::SwitchTo(VideoFrame*)
+ *  \brief Switch to the mode detected by DetectLetterbox
+ *
+ *  Switch fill mode if a switch was detected for this frame.
+ */
+void DetectLetterbox::SwitchTo(VideoFrame *frame)
+{
+    if (!GetDetectLetterbox())
+        return;
+
+    if (detectLetterboxSwitchFrame != -1)
+    {
+        detectLetterboxLock.lock();
+        if (detectLetterboxSwitchFrame <= frame->frameNumber &&
+            detectLetterboxConsecutiveCounter > 3)
+        {
+            if (nupple_video_player->GetAdjustFill() != detectLetterboxDetectedMode)
+            {
+                VERBOSE(VB_PLAYBACK, QString("Detect Letterbox: Switched to %1 on frame %2 (%3)").arg(detectLetterboxDetectedMode).arg(frame->frameNumber).arg(detectLetterboxSwitchFrame));
+                nupple_video_player->getVideoOutput()->ToggleAdjustFill(detectLetterboxDetectedMode);
+                nupple_video_player->ReinitOSD();
+            }
+            detectLetterboxSwitchFrame = -1;
+        }
+        else if (detectLetterboxSwitchFrame <= frame->frameNumber)
+            VERBOSE(VB_PLAYBACK, QString("Detect Letterbox: Not Switched to %1 on frame %2 (%3) Not enough consecutive detections (%4)").arg(detectLetterboxDetectedMode).arg(frame->frameNumber).arg(detectLetterboxSwitchFrame).arg(detectLetterboxConsecutiveCounter));
+
+        detectLetterboxLock.unlock();
+    }
+}
+
+void DetectLetterbox::SetDetectLetterbox(bool detect)
+{
+    isDetectLetterbox = detect;
+    detectLetterboxSwitchFrame = -1;
+    detectLetterboxDetectedMode = nupple_video_player->GetAdjustFill();
+}
+
+bool DetectLetterbox::GetDetectLetterbox()
+{
+    return isDetectLetterbox;
+}
+
+/* vim: set expandtab tabstop=4 shiftwidth=4: */

libs/libmythtv/libmythtv.pro

@@ -363 +363 @@
     # Misc. frontend
     HEADERS += guidegrid.h              infostructs.h
     HEADERS += ttfont.h
+    HEADERS += DetectLetterbox.h
     SOURCES += guidegrid.cpp            infostructs.cpp
     SOURCES += ttfont.cpp
+    SOURCES += DetectLetterbox.cpp
 
     using_mheg {
         # DSMCC stuff

libs/libmythtv/tv_play.h

@@ -35 +35 @@
 class OSD;
 class RemoteEncoder;
 class NuppelVideoPlayer;
+class DetectLetterbox;
 class RingBuffer;
 class ProgramInfo;
 class MythDialog;

libs/libmythtv/DetectLetterbox.h

@@ +1 @@
+// -*- Mode: c++ -*-
+
+#include "NuppelVideoPlayer.h"
+
+using namespace std;
+
+class NuppelVideoPlayer;
+
+class MPUBLIC DetectLetterbox
+{
+public:
+    DetectLetterbox(NuppelVideoPlayer* const nvp);
+    ~DetectLetterbox();
+    void SetDetectLetterbox(bool detect);
+    bool GetDetectLetterbox();
+    void Detect(VideoFrame *frame);
+    void SwitchTo(VideoFrame *frame);
+
+private:
+    bool isDetectLetterbox;
+
+    AdjustFillMode detectLetterboxDefaultMode;
+    AdjustFillMode detectLetterboxDetectedMode; // Wich mode was last detected
+    long long detectLetterboxSwitchFrame; // On wich frame was the mode switch detected
+    long long detectLetterboxPossibleHalfFrame;
+    long long detectLetterboxPossibleFullFrame;
+    int detectLetterboxConsecutiveCounter;
+
+    NuppelVideoPlayer *nupple_video_player;
+
+    int detectLetterboxLimit;
+    QMutex detectLetterboxLock;
+};
+
+/* vim: set expandtab tabstop=4 shiftwidth=4: */

libs/libmythtv/NuppelVideoPlayer.h

@@ -49 +49 @@
 struct SwsContext;
 class InteractiveTV;
 class NSAutoreleasePool;
+class DetectLetterbox;
 
 struct TextContainer
 {
@@ -162 +163 @@
     void SetBookmark(void);
     void SetKeyframeDistance(int keyframedistance);
     void SetVideoParams(int w, int h, double fps, int keydist,
-                        float a = 1.33333, FrameScanType scan = kScan_Ignore, 
+                        float a = 1.33333, FrameScanType scan = kScan_Ignore,
                         bool video_codec_changed = false);
     void SetFileLength(int total, int frames);
     void Zoom(ZoomDirection direction);
@@ -402 +403 @@
         { tc_wrap[TC_AUDIO] = 0LL; return tc_wrap[TC_AUDIO]; }
     long long ResyncAudioTimecodeOffset(void)
         { tc_wrap[TC_AUDIO] = LONG_LONG_MIN; return 0L; }
-    long long GetAudioTimecodeOffset(void) const 
+    long long GetAudioTimecodeOffset(void) const
         { return tc_wrap[TC_AUDIO]; }
     void SaveAudioTimecodeOffset(long long v)
         { savedAudioTimecodeOffset = v; }
@@ -416 +417 @@
     void ActivateDVDButton(void);
     void GoToDVDMenu(QString str);
     void GoToDVDProgram(bool direction);
-    void HideDVDButton(bool hide) 
+    void HideDVDButton(bool hide)
     {
         hidedvdbutton = hide;
     }
 
+    // Playback (output) zoom automation
+    DetectLetterbox *detect_letter_box;
+
     // Position Map Stuff
     bool PosMapFromEnc(unsigned long long          start,
                        QMap<long long, long long> &posMap);
@@ -619 +623 @@
     long long rewindtime;
     QString m_recusage;
 
-    // -- end state stuff -- 
+    // -- end state stuff --
 
 
     // Input Video Attributes
@@ -627 +631 @@
     QSize    video_dim;       ///< Video (input) buffer width & height
     double   video_frame_rate;///< Video (input) Frame Rate (often inaccurate)
     float    video_aspect;    ///< Video (input) Apect Ratio
-    float    forced_video_aspect; 
+    float    forced_video_aspect;
     /// Video (input) Scan Type (interlaced, progressive, detect, ignore...)
     FrameScanType m_scan;
     /// Set when the user selects a scan type, overriding the detected one
@@ -783 +787 @@
     float      next_play_speed;
     bool       next_normal_speed;
 
-    float      play_speed;    
-    bool       normal_speed;  
+    float      play_speed;
+    bool       normal_speed;
     int        frame_interval;///< always adjusted for play_speed
 
-    int        ffrew_skip;    
+    int        ffrew_skip;
 
     // Audio and video synchronization stuff
     VideoSync *videosync;
@@ -811 +815 @@
     short int *warplbuff;
     short int *warprbuff;
     int        warpbuffsize;
- 
+
     // Time Code stuff
     int        prevtc;        ///< 32 bit timecode if last VideoFrame shown
     int        tc_avcheck_framecounter;

libs/libmythtv/tv_play.cpp

@@ -30 +30 @@
 #include "guidegrid.h"
 //#include "progfind.h"
 #include "NuppelVideoPlayer.h"
+#include "DetectLetterbox.h"
 #include "programinfo.h"
 #include "udpnotify.h"
 #include "vsync.h"
@@ -952 +953 @@
             pthread_detach(ddMapLoader);
         }
     }
-    
+
     if (osdMenuEntries)
         delete osdMenuEntries;
 
@@ -5115 +5116 @@
         return;
     }
 
-    
+
     VERBOSE(VB_PLAYBACK, LOC +
             QString("PxPToggleType() converting from %1 to %2 -- begin")
             .arg(before).arg(after));
@@ -9453 +9454 @@
     {
         ToggleAdjustFill(actx, (AdjustFillMode) action.right(1).toInt());
     }
+    else if (action == "AUTODETECT_FILL")
+    {
+        actx->nvp->detect_letter_box->SetDetectLetterbox(!actx->nvp->detect_letter_box->GetDetectLetterbox());
+    }
     else if (action == "GUIDE")
         EditSchedule(actx, kScheduleProgramGuide);
     else if (action == "FINDER")
@@ -9564 +9569 @@
 void TV::ShowOSDTreeMenu(const PlayerContext *ctx)
 {
     int osdMenuCount = osdMenuEntries->GetCount();
-    
+
     if (treeMenu)
     {
         for (uint i = 0; i < player.size(); i++)
@@ -9964 +9969 @@
     ctx->UnlockDeleteNVP(__FILE__, __LINE__);
 
     OSDGenericTree *af_item = new OSDGenericTree(treeMenu, tr("Adjust Fill"));
+    OSDGenericTree *subitem = new OSDGenericTree(af_item, tr("Auto Detect"),
+                                 "AUTODETECT_FILL",
+                                 (ctx->nvp->detect_letter_box->GetDetectLetterbox()) ? 1 : 0,
+                                 NULL, "ADJUSTFILLGROUP");
+
     for (int i = kAdjustFill_Off; i < kAdjustFill_END; i++)
     {
         bool sel = (i != kAdjustFill_Off) ? (adjustfill == i) :

libs/libmythtv/videoouttypes.h

@@ -54 +54 @@
     kAdjustFill_Half,
     kAdjustFill_Full,
     kAdjustFill_Stretch,
-    kAdjustFill_END
+    kAdjustFill_END,
+    kAdjustFill_AutoDetect_DefaultOff = 16,
+    kAdjustFill_AutoDetect_DefaultHalf
 } AdjustFillMode;
 
 typedef enum LetterBoxColour
@@ -234 +236 @@
         case kAdjustFill_Toggle:
         case kAdjustFill_Off:
         case kAdjustFill_END: break;
+        case kAdjustFill_AutoDetect_DefaultOff: ret = QObject::tr("Auto Detect (Default Off)");    break;
+        case kAdjustFill_AutoDetect_DefaultHalf: ret = QObject::tr("Auto Detect (Default Half)");    break;
     }
 
     ret.detach();

libs/libmythtv/videooutbase.cpp

@@ -222 +222 @@
  *         vo->ReleaseFrame(frame); // enqueues frame in "used" queue
  *     }
  * }
- *  
+ *
  * // In the displaying thread
  * while (playing)
  * {
@@ -257 +257 @@
  *        update an OSD for example.
  *
  *  The VideoBuffers class handles the buffer tracking,
- *  see it for more details on the states a buffer can 
+ *  see it for more details on the states a buffer can
  *  take before it becomes available for reuse.
  *
  * \see VideoBuffers, NuppelVideoPlayer
@@ -265 +265 @@
 
 /**
  * \fn VideoOutput::VideoOutput()
- * \brief This constructor for VideoOutput must be followed by an 
+ * \brief This constructor for VideoOutput must be followed by an
  *        Init(int,int,float,WId,int,int,int,int,WId) call.
  */
 VideoOutput::VideoOutput() :
@@ -364 +364 @@
     if (db_vdisp_profile)
         db_vdisp_profile->SetInput(windows[0].GetVideoDim());
 
+/*
+    aspectoverride  = db_aspectoverride;
+    // If autodection is enabled. Start in the defaultmode
+    adjustfill      = db_adjustfill >= kAdjustFill_AutoDetect_DefaultOff ?
+        (AdjustFillMode) (db_adjustfill - kAdjustFill_AutoDetect_DefaultOff) : db_adjustfill;
+*/
+
+    VideoAspectRatioChanged(aspect); // apply aspect ratio and letterbox mode
+
     return mainSuccess;
 }
 
@@ -410 +419 @@
  * \return true if successful, false otherwise.
  * \param overridefilter optional, explicitly use this nondefault deint filter
  */
-bool VideoOutput::SetupDeinterlace(bool interlaced, 
+bool VideoOutput::SetupDeinterlace(bool interlaced,
                                    const QString& overridefilter)
 {
     PIPState pip_state = windows[0].GetPIPState();
@@ -434 +443 @@
 
     m_deinterlacing = interlaced;
 
-    if (m_deinterlacing) 
+    if (m_deinterlacing)
     {
         m_deinterlaceBeforeOSD = true;
 
         VideoFrameType itmp = FMT_YV12;
         VideoFrameType otmp = FMT_YV12;
         int btmp;
-        
+
         if (db_vdisp_profile)
             m_deintfiltername = db_vdisp_profile->GetFilteredDeint(overridefilter);
         else
@@ -474 +483 @@
             }
         }
 
-        if (m_deintFilter == NULL) 
+        if (m_deintFilter == NULL)
         {
             VERBOSE(VB_IMPORTANT,QString("Couldn't load deinterlace filter %1")
                     .arg(m_deintfiltername));
@@ -518 +527 @@
  *   All adaptive full framerate deinterlacers require an extra
  *   ProcessFrame() call.
  *
- *  \return true if deint name contains doubleprocess 
+ *  \return true if deint name contains doubleprocess
  */
 bool VideoOutput::IsExtraProcessingRequired(void) const
 {
@@ -592 +601 @@
         db_vdisp_profile->SetInput(windows[0].GetVideoDim());
 
     BestDeint();
-    
+
     DiscardFrames(true);
 
     return true;
@@ -622 +631 @@
  * \fn VideoOutput::StopEmbedding(void)
  * \brief Tells video output to stop embedding video in an existing window.
  * \sa EmbedInWidget(WId, int, int, int, int)
- */ 
+ */
 void VideoOutput::StopEmbedding(void)
 {
     windows[0].StopEmbedding();
@@ -943 +952 @@
     const QSize pipVideoDim    = pipplayer->GetVideoBufferSize();
 
     // If PiP is not initialized to values we like, silently ignore the frame.
-    if ((video_aspect <= 0) || (pipVideoAspect <= 0) || 
+    if ((video_aspect <= 0) || (pipVideoAspect <= 0) ||
         (frame->height <= 0) || (frame->width <= 0) ||
         !pipimage || !pipimage->buf || pipimage->codec != FMT_YV12)
     {
@@ -986 +995 @@
 #else
             img_resample(pip_scaling_context, &img_out, &img_in);
 #endif
-          
+
             if (pipActive)
             {
                 AVPicture img_padded;
@@ -999 +1008 @@
                                pip_display_size.height(),
                                pip_display_size.width(),
                                PIX_FMT_YUV420P, 10, 10, 10, 10, color);
-                
+
                 pipbuf = pip_tmp_buf2;
             }
             else
@@ -1025 +1034 @@
 
     uint pip_height = pip_tmp_image.height;
     uint height[3] = { pip_height, pip_height>>1, pip_height>>1 };
-    
+
     for (int p = 0; p < 3; p++)
     {
         for (uint h = 2; h < height[p]; h++)
         {
-            memcpy((frame->buf + frame->offsets[p]) + (h + yoff2[p]) * 
+            memcpy((frame->buf + frame->offsets[p]) + (h + yoff2[p]) *
                    frame->pitches[p] + xoff2[p],
                    (pip_tmp_image.buf + pip_tmp_image.offsets[p]) + h *
                    pip_tmp_image.pitches[p], pip_tmp_image.pitches[p]);
@@ -1222 +1231 @@
  *  converted to greyscale.
  *
  * \return 1 if changed, -1 on error and 0 otherwise
- */ 
+ */
 int VideoOutput::DisplayOSD(VideoFrame *frame, OSD *osd, int stride,
                             int revision)
 {
@@ -1286 +1295 @@
 /**
  * \fn VideoOutput::CopyFrame(VideoFrame*, const VideoFrame*)
  * \brief Copies frame data from one VideoFrame to another.
- * 
+ *
  *  Note: The frames must have the same width, height, and format.
  * \param to   The destination frame.
- * \param from The source frame 
+ * \param from The source frame
  */
 void VideoOutput::CopyFrame(VideoFrame *to, const VideoFrame *from)
 {
@@ -1310 +1319 @@
         memcpy(to->buf + to->offsets[1], from->buf + from->offsets[1],
                from->pitches[1] * (from->height>>1));
         memcpy(to->buf + to->offsets[2], from->buf + from->offsets[2],
-               from->pitches[2] * (from->height>>1));        
+               from->pitches[2] * (from->height>>1));
     }
     else
     {

programs/mythfrontend/globalsettings.cpp

@@ -2428 +2428 @@
 {
     HostComboBox *gc = new HostComboBox("AdjustFill");
     gc->setLabel(QObject::tr("Zoom"));
+    gc->addSelection(toString(kAdjustFill_AutoDetect_DefaultOff), QString::number(kAdjustFill_AutoDetect_DefaultOff));
+    gc->addSelection(toString(kAdjustFill_AutoDetect_DefaultHalf), QString::number(kAdjustFill_AutoDetect_DefaultHalf));
     for (int m = kAdjustFill_Off; m < kAdjustFill_END; m++)
         gc->addSelection(toString((AdjustFillMode)m), QString::number(m));
     gc->setHelpText(QObject::tr(