Ticket #6824: 6824-v2.patch

mythtv/libs/libmythtv/NuppelVideoPlayer.cpp

@@ -942 +942 @@
                           (player_ctx->IsPBP() && !player_ctx->IsPrimaryPBP());
             SetDecoder(new AvFormatDecoder(this, *player_ctx->playingInfo,
                                            using_null_videoout,
-                                           allow_libmpeg2, noaccel));
+                                           allow_libmpeg2, noaccel,
+                                           player_ctx->GetSpecialDecode()));
         }
         player_ctx->UnlockPlayingInfo(__FILE__, __LINE__);
         if (GetDecoder())

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -84 +84 @@
                              int *nblks, int *sfreq);
 static int encode_frame(bool dts, unsigned char* data, int len,
                         short *samples, int &samples_size);
+static QSize get_video_dim(const AVCodecContext &ctx)
+{
+    return QSize(ctx.width >> ctx.lowres, ctx.height >> ctx.lowres);
+}
+static float get_aspect(const AVCodecContext &ctx)
+{
+    float aspect_ratio = 0.0f;
+
+    if (ctx.sample_aspect_ratio.num && ctx.height)
+    {
+        aspect_ratio = av_q2d(ctx.sample_aspect_ratio) * (float) ctx.width;
+        aspect_ratio /= (float) ctx.height;
+    }
+
+    if (aspect_ratio <= 0.0f || aspect_ratio > 6.0f)
+    {
+        if (ctx.height)
+            aspect_ratio = (float)ctx.width / (float)ctx.height;
+        else
+            aspect_ratio = 4.0f / 3.0f;
+    }
+
+    return aspect_ratio;
+}
 
 int get_avf_buffer_xvmc(struct AVCodecContext *c, AVFrame *pic);
 int get_avf_buffer(struct AVCodecContext *c, AVFrame *pic);
@@ -476 +500 @@
                                  const ProgramInfo &pginfo,
                                  bool use_null_videoout,
                                  bool allow_libmpeg2,
-                                 bool no_hardware_decode)
+                                 bool no_hardware_decode,
+                                 AVSpecialDecode special_decoding)
     : DecoderBase(parent, pginfo),
       d(new AvFormatDecoderPrivate(allow_libmpeg2)),
       is_db_ignored(gCoreContext->IsDatabaseIgnored()),
@@ -495 +520 @@
       using_null_videoout(use_null_videoout),
       video_codec_id(kCodec_NONE),
       no_hardware_decoders(no_hardware_decode),
+      special_decode(special_decoding),
       maxkeyframedist(-1),
       // Closed Caption & Teletext decoders
       ccd608(new CC608Decoder(parent->GetCC608Reader())),
@@ -536 +562 @@
         CC708Window::forceWhiteOnBlackText = true;
 
     no_dts_hack = false;
+
+    int x = gContext->GetNumSetting("CommFlagFast", 0);
+    if (x)
+        special_decode = (AVSpecialDecode) x;
+    VERBOSE(VB_IMPORTANT, "commflagging_speedups: " << special_decode);
 }
 
 AvFormatDecoder::~AvFormatDecoder()
@@ -1385 +1416 @@
             <<") type ("<<codec_type_string(enc->codec_type)
             <<").");
 
-    float aspect_ratio = 0.0;
-
     if (ringBuffer && ringBuffer->isDVD())
         directrendering = false;
 
-    if (selectedStream)
-    {
-        fps = normalized_fps(stream, enc);
-
-        if (enc->sample_aspect_ratio.num)
-            aspect_ratio = av_q2d(enc->sample_aspect_ratio);
-        else if (stream->sample_aspect_ratio.num)
-            aspect_ratio = av_q2d(stream->sample_aspect_ratio);
-        else
-            aspect_ratio = 1.0f;
-
-        if (aspect_ratio <= 0.0f || aspect_ratio > 6.0f)
-            aspect_ratio = 1.0f;
-
-        aspect_ratio *= (float)enc->width / (float)enc->height;
-
-        current_width  = enc->width;
-        current_height = enc->height;
-        current_aspect = aspect_ratio;
-    }
-
     enc->opaque = (void *)this;
     enc->get_buffer = get_avf_buffer;
     enc->release_buffer = release_avf_buffer;
@@ -1482 +1490 @@
                 .arg(codec_id_string(enc->codec_id)));
     }
 
+    if (special_decode)
+    {
+        if (special_decode & kAVSpecialDecode_SingleThreaded)
+            enc->thread_count = 1;
+
+        enc->flags |= CODEC_FLAG2_FAST;
+
+        if ((CODEC_ID_MPEG2VIDEO == codec->id) ||
+            (CODEC_ID_MPEG1VIDEO == codec->id))
+        {
+            if (special_decode & kAVSpecialDecode_FewBlocks)
+            {
+                uint total_blocks = (enc->height+15) / 16;
+                enc->skip_top     = (total_blocks+3) / 4;
+                enc->skip_bottom  = (total_blocks+3) / 4;
+            }
+
+            if (special_decode & kAVSpecialDecode_LowRes)
+                enc->lowres = 2; // 1 = 1/2 size, 2 = 1/4 size
+        }
+        else if (CODEC_ID_H264 == codec->id)
+        {
+            if (special_decode & kAVSpecialDecode_NoLoopFilter)
+            {
+                enc->flags &= ~CODEC_FLAG_LOOP_FILTER;
+                enc->skip_loop_filter = AVDISCARD_ALL;
+            }
+        }
+
+        if (special_decode & kAVSpecialDecode_NoDecode)
+        {
+            enc->skip_idct = AVDISCARD_ALL;
+        }
+    }
+
     if (selectedStream)
     {
-        uint width  = enc->width;
-        uint height = enc->height;
+        fps = normalized_fps(stream, enc);
+        QSize dim    = get_video_dim(*enc);
+        int   width  = current_width  = dim.width();
+        int   height = current_height = dim.height();
+        float aspect = current_aspect = get_aspect(*enc);
 
-        if (width == 0 && height == 0)
+        if (!width || !height)
         {
             VERBOSE(VB_PLAYBACK, LOC + "InitVideoCodec "
                     "invalid dimensions, resetting decoder.");
-            width = 640;
+            width  = 640;
             height = 480;
-            fps = 29.97;
-            aspect_ratio = 4.0 / 3;
+            fps    = 29.97f;
+            aspect = 4.0f / 3.0f;
         }
 
         GetNVP()->SetVideoParams(width, height, fps,
-                                 keyframedist, aspect_ratio, kScan_Detect,
+                                 keyframedist, aspect, kScan_Detect,
                                  dvd_video_codec_changed);
         if (LCD *lcd = LCD::Get())
         {
@@ -1911 +1957 @@
                 d->DestroyMPEG2();
                 m_h264_parser->Reset();
 
-                uint width  = max(enc->width, 16);
-                uint height = max(enc->height, 16);
+                QSize dim = get_video_dim(*enc);
+                uint width  = max(dim.width(),  16);
+                uint height = max(dim.height(), 16);
                 QString dec = "ffmpeg";
                 uint thread_count = 1;
 
@@ -2922 +2969 @@
             SequenceHeader *seq = reinterpret_cast<SequenceHeader*>(
                 const_cast<uint8_t*>(bufptr));
 
-            uint  width  = seq->width();
-            uint  height = seq->height();
+            uint  width  = seq->width()  >> context->lowres;
+            uint  height = seq->height() >> context->lowres;
             float aspect = seq->aspect(context->sub_id == 1);
             float seqFPS = seq->fps();
 
-            bool changed = (seqFPS > fps+0.01) || (seqFPS < fps-0.01);
+            bool changed = (seqFPS > fps+0.01f) || (seqFPS < fps-0.01f);
             changed |= (width  != (uint)current_width );
             changed |= (height != (uint)current_height);
             changed |= fabs(aspect - current_aspect) > eps;
@@ -2951 +2998 @@
 
                 // fps debugging info
                 float avFPS = normalized_fps(stream, context);
-                if ((seqFPS > avFPS+0.01) || (seqFPS < avFPS-0.01))
+                if ((seqFPS > avFPS+0.01f) || (seqFPS < avFPS-0.01f))
                 {
                     VERBOSE(VB_PLAYBACK, LOC +
                             QString("avFPS(%1) != seqFPS(%2)")
@@ -3025 +3072 @@
             continue;
         }
 
-        float aspect_ratio;
-        if (context->sample_aspect_ratio.num == 0)
-            aspect_ratio = 0.0f;
-        else
-            aspect_ratio = av_q2d(context->sample_aspect_ratio) *
-                context->width / context->height;
-
-        if (aspect_ratio <= 0.0f || aspect_ratio > 6.0f)
-            aspect_ratio = (float)context->width / context->height;
-
-        uint  width  = context->width;
-        uint  height = context->height;
+        float aspect_ratio = get_aspect(*context);
+        QSize dim    = get_video_dim(*context);
+        uint  width  = dim.width();
+        uint  height = dim.height();
         float seqFPS = normalized_fps(stream, context);
 
-        bool changed = (seqFPS > fps+0.01) || (seqFPS < fps-0.01);
+        bool changed = (seqFPS > fps+0.01f) || (seqFPS < fps-0.01f);
         changed |= (width  != (uint)current_width );
         changed |= (height != (uint)current_height);
         changed |= fabs(aspect_ratio - current_aspect) > eps;
@@ -3061 +3100 @@
 
             // fps debugging info
             float avFPS = normalized_fps(stream, context);
-            if ((seqFPS > avFPS+0.01) || (seqFPS < avFPS-0.01))
+            if ((seqFPS > avFPS+0.01f) || (seqFPS < avFPS-0.01f))
             {
                 VERBOSE(VB_PLAYBACK, LOC +
                         QString("avFPS(%1) != seqFPS(%2)")
@@ -3200 +3239 @@
         tmppicture.linesize[1] = picframe->pitches[1];
         tmppicture.linesize[2] = picframe->pitches[2];
 
+        QSize dim = get_video_dim(*context);
         sws_ctx = sws_getCachedContext(sws_ctx, context->width,
                                        context->height, context->pix_fmt,
                                        context->width, context->height,
@@ -3210 +3250 @@
             VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to allocate sws context");
             return false;
         }
-        sws_scale(sws_ctx, mpa_pic.data, mpa_pic.linesize, 0, context->height,
+        sws_scale(sws_ctx, mpa_pic.data, mpa_pic.linesize, 0, dim.height(),
                   tmppicture.data, tmppicture.linesize);
 
 
@@ -4380 +4420 @@
 
             if (!d->HasMPEG2Dec())
             {
-                int current_width = curstream->codec->width;
+                int current_width = curstream->codec->width; // TODO CHECKME
                 int video_width = GetNVP()->GetVideoSize().width();
                 if (dvd_xvmc_enabled && GetNVP() && GetNVP()->getVideoOutput())
                 {

mythtv/libs/libmythtv/avformatdecoder.h

@@ -2 +2 @@
 #define AVFORMATDECODER_H_
 
 #include <QString>
+#include <QMap>
 #include <QList>
 
 #include "programinfo.h"
@@ -79 +80 @@
     static void GetDecoders(render_opts &opts);
     AvFormatDecoder(NuppelVideoPlayer *parent, const ProgramInfo &pginfo,
                     bool use_null_video_out, bool allow_libmpeg2 = true,
-                    bool no_hardware_decode = false);
+                    bool no_hardware_decode = false,
+                    AVSpecialDecode av_special_decode = kAVSpecialDecode_None);
    ~AvFormatDecoder();
 
     void CloseCodecs();
@@ -264 +266 @@
     bool using_null_videoout;
     MythCodecID video_codec_id;
     bool no_hardware_decoders;
+    AVSpecialDecode special_decode;
 
     int maxkeyframedist;
 

mythtv/libs/libmythtv/playercontext.cpp

@@ -37 +37 @@
 PlayerContext::PlayerContext(const QString &inUseID) :
     recUsage(inUseID), nvp(NULL), nvpUnsafe(false), recorder(NULL),
     tvchain(NULL), buffer(NULL), playingInfo(NULL),
-    playingLen(0), nohardwaredecoders(false), last_cardid(-1), last_framerate(30.0f),
+    playingLen(0), specialDecode(kAVSpecialDecode_None),
+    nohardwaredecoders(false), last_cardid(-1), last_framerate(30.0f),
     // Fast forward state
     ff_rew_state(0), ff_rew_index(0), ff_rew_speed(0),
     // Other state

mythtv/libs/libmythtv/playercontext.h

@@ -119 +119 @@
     void SetPIPState(PIPState change) { pipState = change; }
     void SetNVPChangingBuffers(bool val) { nvpUnsafe = val; }
     void SetNoHardwareDecoders(void) { nohardwaredecoders = true; }
+    void SetSpecialDecode(AVSpecialDecode sp) { specialDecode = sp; }
 
     // Gets
     QRect    GetStandAlonePIPRect(void);
@@ -131 +132 @@
     QString  GetPlayMessage(void) const;
     TVState  GetState(void) const;
     bool     GetPlayingInfoMap(InfoMap &infoMap) const;
+    AVSpecialDecode GetSpecialDecode(void) const { return specialDecode; }
 
     // Boolean Gets
     bool IsPIPSupported(void) const;
@@ -169 +171 @@
     RingBuffer         *buffer;
     ProgramInfo        *playingInfo; ///< Currently playing info
     long long           playingLen;  ///< Initial CalculateLength()
+    AVSpecialDecode     specialDecode;
     bool                nohardwaredecoders; // < Disable use of VDPAU decoding
     int                 last_cardid; ///< CardID of current/last recorder
     float               last_framerate; ///< Estimated framerate from recorder

mythtv/libs/libmythtv/videoouttypes.h

@@ -109 +109 @@
     kError_Switch_Renderer = 0x04, // Current renderer is not preferred choice
 } VideoErrorState;
 
+typedef enum AVSpecialDecode
+{
+    kAVSpecialDecode_None           = 0x00,
+    kAVSpecialDecode_LowRes         = 0x01,
+    kAVSpecialDecode_SingleThreaded = 0x02,
+    kAVSpecialDecode_FewBlocks      = 0x04,
+    kAVSpecialDecode_NoLoopFilter   = 0x08,
+    kAVSpecialDecode_NoDecode       = 0x10,
+} AVSpecialDecode;
+
 inline bool is_interlaced(FrameScanType scan)
 {
     return (kScan_Interlaced == scan) || (kScan_Intr2ndField == scan);

mythtv/programs/mythcommflag/main.cpp

@@ -172 +172 @@
 
     MythCommFlagPlayer *cfp = new MythCommFlagPlayer();
     PlayerContext *ctx = new PlayerContext("seektable rebuilder");
+    ctx->SetSpecialDecode(kAVSpecialDecode_NoDecode);
     ctx->SetPlayingInfo(program_info);
     ctx->SetRingBuffer(tmprbuf);
     ctx->SetNVP(cfp);
@@ -756 +757 @@
     MythCommFlagPlayer *cfp = new MythCommFlagPlayer();
 
     PlayerContext *ctx = new PlayerContext(kFlaggerInUseID);
+
+    AVSpecialDecode sp = (AVSpecialDecode)
+        (kAVSpecialDecode_LowRes         |
+         kAVSpecialDecode_SingleThreaded |
+         kAVSpecialDecode_NoLoopFilter);
+
+#if 0 /* blank detector needs to be only sample center for this optimization. */
+    if ((COMM_DETECT_BLANKS  == commDetectMethod) ||
+        (COMM_DETECT_2_BLANK == commDetectMethod))
+    {
+        sp = (AVSpecialDecode) (sp | kAVSpecialDecode_FewBlocks);
+    }
+#endif
+
+    ctx->SetSpecialDecode(sp);
+
     ctx->SetPlayingInfo(program_info);
     ctx->SetRingBuffer(tmprbuf);
     ctx->SetNVP(cfp);