Ticket #5324: mythtv-vid-20.diff

libs/libmythtv/openglvideo.cpp

@@ -1199 +1199 @@
 + field_calc + deint_end_bot
 };
 
+static const QString yadif_setup =
+"TEMP a,b,c,e,f,g,h,j,k,l;\n"
+"TEMP a1,b1,f1,g1,h1,i1,j1,l1,m1,n1;\n"
+"ALIAS d1 = f;\n"
+"ALIAS k1 = g;\n"
+"ALIAS c1 = prev;\n"
+"ALIAS e1 = mov;\n"
+"ALIAS p0 = res;\n"
+"ALIAS p1 = c;\n"
+"ALIAS p3 = h;\n"
+"ALIAS spred1 = a;\n"
+"ALIAS spred2 = b;\n"
+"ALIAS spred3 = c;\n"
+"ALIAS spred4 = e;\n"
+"ALIAS spred5 = f;\n"
+"ALIAS sscore = g;\n"
+"ALIAS score1 = h;\n"
+"ALIAS score2 = j;\n"
+"ALIAS score3 = k;\n"
+"ALIAS score4 = l;\n"
+"ALIAS if1 = a1;\n"
+"ALIAS if2 = b1;\n"
+"TEMP p2, p4;\n"
+"ALIAS diff1 = a;\n"
+"ALIAS diff2 = b;\n"
+"TEMP diff0;\n";
+
+static const QString yadif_spatial_sample =
+"ADD tmp, tex, {%5, %3, 0.0, 0.0};\n"
+"TEX e1, tmp, texture[1], %1;\n"
+"ADD tmp, tmp, {%5, 0.0, 0.0, 0.0};\n"
+"TEX f1, tmp, texture[1], %1;\n"
+"ADD tmp, tmp, {%5, 0.0, 0.0, 0.0};\n"
+"TEX g1, tmp, texture[1], %1;\n"
+"SUB tmp, tmp, {0.0, %4, 0.0, 0.0};\n"
+"TEX n1, tmp, texture[1], %1;\n"
+"SUB tmp, tmp, {%5, 0.0, 0.0, 0.0};\n"
+"TEX m1, tmp, texture[1], %1;\n"
+"SUB tmp, tmp, {%5, 0.0, 0.0, 0.0};\n"
+"TEX l1, tmp, texture[1], %1;\n"
+
+"SUB tmp, tex, {%5, %3, 0.0, 0.0};\n"
+"TEX j1, tmp, texture[1], %1;\n"
+"SUB tmp, tmp, {%5, 0.0, 0.0, 0.0};\n"
+"TEX i1, tmp, texture[1], %1;\n"
+"SUB tmp, tmp, {%5, 0.0, 0.0, 0.0};\n"
+"TEX h1, tmp, texture[1], %1;\n"
+"ADD tmp, tmp, {0.0, %4, 0.0, 0.0};\n"
+"TEX a1, tmp, texture[1], %1;\n"
+"ADD tmp, tmp, {%5, 0.0, 0.0, 0.0};\n"
+"TEX b1, tmp, texture[1], %1;\n"
+"ADD tmp, tmp, {%5, 0.0, 0.0, 0.0};\n"
+"TEX c1, tmp, texture[1], %1;\n";
+
+static const QString yadif_calc =
+"LRP p0, 0.5, c, h;\n"
+"MOV p1, f;\n"
+"LRP p2, 0.5, d, i;\n"
+"MOV p3, g;\n"
+"LRP p4, 0.5, e, j;\n"
+
+"SUB diff0, d, i;\n"
+"ABS diff0, diff0;\n"
+"SUB tmp, a, f;\n"
+"ABS tmp, tmp;\n"
+"SUB diff1, b, g;\n"
+"ABS diff1, diff1;\n"
+"LRP diff1, 0.5, diff1, tmp;\n"
+"SUB tmp, k, f;\n"
+"ABS tmp, tmp;\n"
+"SUB diff2, g, l;\n"
+"ABS diff2, diff2;\n"
+"LRP diff2, 0.5, diff2, tmp;\n"
+"MAX diff0, diff0, diff1;\n"
+"MAX diff0, diff0, diff2;\n"
+
+// mode < 2
+"SUB tmp, p0, p1;\n"
+"SUB other, p4, p3;\n"
+"MIN spred1, tmp, other;\n"
+"MAX spred2, tmp, other;\n"
+"SUB tmp, p2, p1;\n"
+"SUB other, p2, p3;\n"
+"MAX spred1, spred1, tmp;\n"
+"MAX spred1, spred1, other;\n"
+"MIN spred2, spred2, tmp;\n"
+"MIN spred2, spred2, other;\n"
+"MAX spred1, spred2, -spred1;\n"
+"MAX diff0, diff0, spred1;\n"
+
+// spatial prediction
+"LRP spred1, 0.5, d1, k1;\n"
+"LRP spred2, 0.5, c1, l1;\n"
+"LRP spred3, 0.5, b1, m1;\n"
+"LRP spred4, 0.5, e1, j1;\n"
+"LRP spred5, 0.5, f1, i1;\n"
+
+"SUB sscore, c1, j1;\n"
+"ABS sscore, sscore;\n"
+"SUB tmp, d1, k1;\n"
+"ABS tmp, tmp;\n"
+"ADD sscore, sscore, tmp;\n"
+"SUB tmp, e1, l1;\n"
+"ABS tmp, tmp;\n"
+"ADD sscore, sscore, tmp;\n"
+"SUB sscore, sscore, 1.0;\n"
+
+"SUB score1, b1, k1;\n"
+"ABS score1, score1;\n"
+"SUB tmp, c1, l1;\n"
+"ABS tmp, tmp;\n"
+"ADD score1, score1, tmp;\n"
+"SUB tmp, d1, m1;\n"
+"ABS tmp, tmp;\n"
+"ADD score1, score1, tmp;\n"
+
+"SUB score2, a1, l1;\n"
+"ABS score2, score2;\n"
+"SUB tmp, b1, m1;\n"
+"ABS tmp, tmp;\n"
+"ADD score2, score2, tmp;\n"
+"SUB tmp, c1, n1;\n"
+"ABS tmp, tmp;\n"
+"ADD score2, score2, tmp;\n"
+
+"SUB score3, d1, i1;\n"
+"ABS score3, score3;\n"
+"SUB tmp, e1, j1;\n"
+"ABS tmp, tmp;\n"
+"ADD score3, score3, tmp;\n"
+"SUB tmp, f1, k1;\n"
+"ABS tmp, tmp;\n"
+"ADD score3, score3, tmp;\n"
+
+"SUB score4, e1, h1;\n"
+"ABS score4, score4;\n"
+"SUB tmp, f1, i1;\n"
+"ABS tmp, tmp;\n"
+"ADD score4, score4, tmp;\n"
+"SUB tmp, g1, j1;\n"
+"ABS tmp, tmp;\n"
+"ADD score4, score4, tmp;\n"
+"SUB if1, sscore, score1;\n"
+"SUB if2, score1, score2;\n"
+"CMP if2, if1, -1.0, if2;\n"
+"CMP spred1, if1, spred1, spred2;\n"
+"CMP spred1, if2, spred1, spred3;\n"
+"CMP sscore, if1, sscore, score1;\n"
+"CMP sscore, if2, sscore, score2;\n"
+"SUB if1, sscore, score3;\n"
+"SUB if2, score3, score4;\n"
+"CMP if2, if1, -1.0, if2;\n"
+"CMP spred1, if1, spred1, spred4;\n"
+"CMP spred1, if2, spred1, spred5;\n"
+"ADD spred4, p2, diff0;\n"
+"SUB spred5, p2, diff0;\n"
+"SUB if1, spred4, spred1;\n"
+"SUB if2, spred1, spred5;\n"
+"CMP spred1, if1, spred4, spred1;\n"
+"CMP spred1, if2, spred5, spred1;\n";
+
+static const QString yadif[2] = {
+yadif_setup +
+"TEMP d;\n"
+"ALIAS i = current;\n"
+"TEX current, tex, texture[1], %1;\n"
+"TEX d, tex, texture[2], %1;\n"
+"ADD tmp, tex, {0.0, %3, 0.0, 0.0};\n"
+"TEX a, tmp, texture[2], %1;\n"
+"TEX f, tmp, texture[1], %1;\n"
+"TEX k, tmp, texture[0], %1;\n"
+"ADD tmp, tex, {0.0, %4, 0.0, 0.0};\n"
+"TEX c, tmp, texture[2], %1;\n"
+"TEX h, tmp, texture[1], %1;\n"
+"SUB tmp, tex, {0.0, %3, 0.0, 0.0};\n"
+"TEX b, tmp, texture[2], %1;\n"
+"TEX g, tmp, texture[1], %1;\n"
+"TEX l, tmp, texture[0], %1;\n"
+"SUB tmp, tex, {0.0, %4, 0.0, 0.0};\n"
+"TEX e, tmp, texture[2], %1;\n"
+"TEX j, tmp, texture[1], %1;\n"
++ yadif_spatial_sample
++ yadif_calc
++ field_calc +
+"CMP res, prev, current, spred1;\n"
+,
+yadif_setup +
+"TEMP i;\n"
+"ALIAS d = current;\n"
+"TEX current, tex, texture[1], %1;\n"
+"TEX i, tex, texture[0], %1;\n"
+"ADD tmp, tex, {0.0, %3, 0.0, 0.0};\n"
+"TEX a, tmp, texture[2], %1;\n"
+"TEX f, tmp, texture[1], %1;\n"
+"TEX k, tmp, texture[0], %1;\n"
+"ADD tmp, tex, {0.0, %4, 0.0, 0.0};\n"
+"TEX c, tmp, texture[1], %1;\n"
+"TEX h, tmp, texture[0], %1;\n"
+"SUB tmp, tex, {0.0, %3, 0.0, 0.0};\n"
+"TEX b, tmp, texture[2], %1;\n"
+"TEX g, tmp, texture[1], %1;\n"
+"TEX l, tmp, texture[0], %1;\n"
+"SUB tmp, tex, {0.0, %4, 0.0, 0.0};\n"
+"TEX e, tmp, texture[1], %1;\n"
+"TEX j, tmp, texture[0], %1;\n"
++ yadif_spatial_sample
++ yadif_calc
++ field_calc +
+"CMP res, prev, spred1, current;\n"
+};
+
 QString OpenGLVideo::GetProgramString(OpenGLFilterType name,
                                       QString deint, FrameScanType field)
 {
@@ -1240 +1451 @@
                     deint_bit = kerneldeint[tmp_field];
                     if (!tmp_field) { need_tex = false; }
                 }
+                else if (deint == "openglyadif" ||
+                         deint == "opengldoublerateyadif")
+                {
+                    deint_bit = yadif[tmp_field];
+                    need_tex = false;
+                }
                 else
                 {
                     VERBOSE(VB_PLAYBACK, LOC +
@@ -1279 +1496 @@
     ret.replace("%1", temp);
 
     float lineHeight = 1.0f;
+    float colWidth   = 1.0f;
 
     if (!textureRects &&
        (inputTextureSize.height() > 0))
     {
         lineHeight /= inputTextureSize.height();
+        colWidth   /= inputTextureSize.width();
     }
 
     float fieldSize = 1.0f / (lineHeight * 2.0);
@@ -1291 +1510 @@
     ret.replace("%2", temp.setNum(fieldSize, 'f', 8));
     ret.replace("%3", temp.setNum(lineHeight, 'f', 8));
     ret.replace("%4", temp.setNum(lineHeight * 2.0, 'f', 8));
+    ret.replace("%5", temp.setNum(colWidth, 'f', 8));
 
     ret += "END";
 

libs/libmythtv/videodisplayprofile.cpp

@@ -689 +689 @@
         return QObject::tr("Linear blend (2x, HW)");
     else if ("opengldoubleratefieldorder" == short_name)
         return QObject::tr("Interlaced (2x, Hw)");
+    else if ("opengldoublerateyadif" == short_name)
+        return QObject::tr("Yadif (2x, Hw)");
+    else if ("openglyadif" == short_name)
+        return QObject::tr("Yadif (Hw)");
+
     return "";
 }
 
@@ -1245 +1250 @@
         msg = kLinearBlendMsg + " " + kUsingOpenGL;
     else if (deint == "openglkerneldeint")
         msg = kKernelMsg + " " + kUsingOpenGL;
+    else if (deint == "openglyadif")
+        msg = kYadifMsg + " " + kUsingOpenGL;
     else if (deint == "opengldoubleratelinearblend")
         msg = kLinearBlendMsg + " " + kUsingOpenGLWorkaround;
     else if (deint == "opengldoublerateonefield")
@@ -1261 +1268 @@
         msg = kYadifMsg;
     else if (deint == "yadifdoubleprocessdeint")
         msg = kYadifMsg + " " +  kDoubleRateMsg;
+    else if (deint == "opengldoublerateyadif")
+        msg = kYadifMsg + " " +  kUsingOpenGLWorkaround;
     else
         msg = QObject::tr("'%1' has not been documented yet.").arg(deint);
 
@@ -1435 +1444 @@
 "openglkerneldeint"
 "openglonefield"
 "openglbobdeint"
+"openglyadif"
 "opengldoubleratelinearblend"
 "opengldoublerateonefield"
 "opengldoubleratekerneldeint"
 "opengldoubleratefieldorder"
+"opengldoublerateyadif"
 */
 
 void VideoDisplayProfile::init_statics(void)
@@ -1488 +1499 @@
     safe_deint["opengl"] += "opengllinearblend";
     safe_deint["opengl"] += "openglonefield";
     safe_deint["opengl"] += "openglkerneldeint";
-
     safe_deint["opengl"] += "bobdeint";
     safe_deint["opengl"] += "openglbobdeint";
     safe_deint["opengl"] += "opengldoubleratelinearblend";
     safe_deint["opengl"] += "opengldoublerateonefield";
     safe_deint["opengl"] += "opengldoubleratekerneldeint";
     safe_deint["opengl"] += "opengldoubleratefieldorder";
+    safe_deint["opengl"] += "opengldoublerateyadif";
+    safe_deint["opengl"] += "openglyadif";
 
     safe_osd["xv-blit"]     += "softblend";
     safe_osd["xvmc-blit"]   += "chromakey";