Merge branch 'master' of github.com:MythTV/mythtv

MythTV · Dec 9, 2010 · a05c8c4 · a05c8c4
2 parents 9860f1d + ebf9778
commit a05c8c4
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 273 deletions.
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -54,11 +54,6 @@ extern const uint8_t *ff_find_start_code(const uint8_t *p, const uint8_t *end, u
 extern void ff_read_frame_flush(AVFormatContext *s);
 #include "libavformat/avio.h"
 #include "libswscale/swscale.h"
-#if CONFIG_LIBMPEG2EXTERNAL
-#include <mpeg2dec/mpeg2.h>
-#else
-#include "../libmythmpeg2/mpeg2.h"
-#endif
 #include "ivtv_myth.h"
 }
 

diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
@@ -64,11 +64,6 @@ using_live: LIBS += -L../libmythlivemedia -lmythlivemedia-$$LIBVERSION
 using_hdhomerun: LIBS += -L../libmythhdhomerun -lmythhdhomerun-$$LIBVERSION
 using_backend: LIBS += -lmp3lame
 LIBS += $$EXTRA_LIBS $$QMAKE_LIBS_DYNLOAD
-!contains( CONFIG_LIBMPEG2EXTERNAL, yes) {
-        DEPENDPATH  += ../libmythmpeg2
-        LIBS += -L../libmythmpeg2 -lmythmpeg2-$$LIBVERSION
-        TARGETDEPS += ../libmythmpeg2/libmythmpeg2-$${MYTH_LIB_EXT}
-}
 
 TARGETDEPS += ../libmyth/libmyth-$${MYTH_SHLIB_EXT}
 TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
@@ -280,10 +275,10 @@ using_frontend {
     # A/V decoders
     HEADERS += decoderbase.h
     HEADERS += nuppeldecoder.h          avformatdecoder.h
-    HEADERS += privatedecoder.h         privatedecoder_mpeg2.h
+    HEADERS += privatedecoder.h
     SOURCES += decoderbase.cpp
     SOURCES += nuppeldecoder.cpp        avformatdecoder.cpp
-    SOURCES += privatedecoder.cpp       privatedecoder_mpeg2.cpp
+    SOURCES += privatedecoder.cpp
 
     using_crystalhd {
         DEFINES += USING_CRYSTALHD

diff --git a/mythtv/libs/libmythtv/privatedecoder.cpp b/mythtv/libs/libmythtv/privatedecoder.cpp
@@ -1,5 +1,4 @@
 #include "privatedecoder.h"
-#include "privatedecoder_mpeg2.h"
 
 #if defined(Q_OS_MACX)
 #include "privatedecoder_vda.h"
@@ -11,8 +10,6 @@
 
 void PrivateDecoder::GetDecoders(render_opts &opts)
 {
-    PrivateDecoderMPEG2::GetDecoders(opts);
-
 #if defined(Q_OS_MACX)
     PrivateDecoderVDA::GetDecoders(opts);
 #endif
@@ -26,11 +23,6 @@ PrivateDecoder* PrivateDecoder::Create(const QString &decoder,
                                        bool no_hardware_decode,
                                        AVCodecContext *avctx)
 {
-    PrivateDecoderMPEG2 *mpeg2 = new PrivateDecoderMPEG2();
-    if (mpeg2 && mpeg2->Init(decoder, no_hardware_decode, avctx))
-        return mpeg2;
-    delete mpeg2;
-
 #if defined(Q_OS_MACX)
     PrivateDecoderVDA *vda = new PrivateDecoderVDA();
     if (vda && vda->Init(decoder, no_hardware_decode, avctx))

diff --git a/mythtv/libs/libmythtv/privatedecoder_mpeg2.cpp b/mythtv/libs/libmythtv/privatedecoder_mpeg2.cpp
diff --git a/mythtv/libs/libmythtv/privatedecoder_mpeg2.h b/mythtv/libs/libmythtv/privatedecoder_mpeg2.h
diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
@@ -600,7 +600,7 @@ void SubtitleScreen::DisplayCC608Subtitles(void)
 
         if (cc && (cc->text != QString::null))
         {
-            int width  = font.width(cc->text) + pad_width * 2;
+            int width  = font.width(cc->text) + pad_width;
             int x = teletextmode ? cc->y : (cc->x + 3);
             int y = teletextmode ? cc->x : cc->y;
             x = (int)(((float)x / (float)xscale) * (float)m_safeArea.width());
@@ -612,15 +612,16 @@ void SubtitleScreen::DisplayCC608Subtitles(void)
                 MythUIShape *shape = new MythUIShape(this,
                     QString("cc608bg%1%2%3").arg(cc->x).arg(cc->y).arg(width));
                 shape->SetFillBrush(bgfill);
-                shape->SetArea(MythRect(rect));
+                QRect bgrect(x - pad_width, y, width + pad_width, height);
+                shape->SetArea(MythRect(bgrect));
             }
 
             gTextSubFont->SetColor(clr[max(min(0, cc->color), 7)]);
             MythUIText *text = new MythUIText(
                    cc->text, *gTextSubFont, rect, rect, (MythUIType*)this,
                    QString("cc608txt%1%2%3").arg(cc->x).arg(cc->y).arg(width));
             if (text)
-                text->SetJustification(Qt::AlignCenter);
+                text->SetJustification(Qt::AlignLeft);
             m_refreshArea = true;
             VERBOSE(VB_VBI, QString("x %1 y %2 String: '%3'")
                                 .arg(cc->x).arg(cc->y).arg(cc->text));

diff --git a/mythtv/libs/libmythtv/videodisplayprofile.cpp b/mythtv/libs/libmythtv/videodisplayprofile.cpp
@@ -637,7 +637,6 @@ QString VideoDisplayProfile::GetDecoderName(const QString &decoder)
     if (dec_name.empty())
     {
         dec_name["ffmpeg"]   = QObject::tr("Standard");
-        dec_name["libmpeg2"] = QObject::tr("libmpeg2");
         dec_name["macaccel"] = QObject::tr("Mac hardware acceleration");
         dec_name["vdpau"]    = QObject::tr("NVidia VDPAU acceleration");
     }
@@ -664,11 +663,6 @@ QString VideoDisplayProfile::GetDecoderHelp(QString decoder)
     if (decoder == "ffmpeg")
         msg += QObject::tr("Standard will use ffmpeg library.");
 
-    if (decoder == "libmpeg2")
-        msg +=  QObject::tr(
-            "libmpeg2 is slower on almost all processors than ffmpeg "
-            "and breaks caption decoding. Use at your own risk!");
-
     if (decoder == "macaccel")
         msg += QObject::tr(
             "Mac hardware will try to use the graphics "

diff --git a/mythtv/libs/libmythtv/videoout_d3d.cpp b/mythtv/libs/libmythtv/videoout_d3d.cpp
@@ -45,8 +45,6 @@ void VideoOutputD3D::GetRenderOptions(render_opts &opts,
     (*opts.safe_renderers)["nuppel"].append("direct3d");
     if (opts.decoders->contains("ffmpeg"))
         (*opts.safe_renderers)["ffmpeg"].append("direct3d");
-    if (opts.decoders->contains("libmpeg2"))
-        (*opts.safe_renderers)["libmpeg2"].append("direct3d");
     if (opts.decoders->contains("crystalhd"))
         (*opts.safe_renderers)["crystalhd"].append("direct3d");
     opts.priorities->insert("direct3d", 55);

diff --git a/mythtv/libs/libmythtv/videoout_directfb.cpp b/mythtv/libs/libmythtv/videoout_directfb.cpp
@@ -270,8 +270,6 @@ void VideoOutputDirectfb::GetRenderOptions(render_opts &opts,
     (*opts.safe_renderers)["nuppel"].append("directfb");
     if (opts.decoders->contains("ffmpeg"))
         (*opts.safe_renderers)["ffmpeg"].append("directfb");
-    if (opts.decoders->contains("libmpeg2"))
-        (*opts.safe_renderers)["libmpeg2"].append("directfb");
     if (opts.decoders->contains("crystalhd"))
         (*opts.safe_renderers)["crystalhd"].append("directfb");
     opts.priorities->insert("directfb", 60);

diff --git a/mythtv/libs/libmythtv/videoout_null.cpp b/mythtv/libs/libmythtv/videoout_null.cpp
@@ -22,8 +22,6 @@ void VideoOutputNull::GetRenderOptions(render_opts &opts,
     (*opts.safe_renderers)["nuppel"].append("null");
     if (opts.decoders->contains("ffmpeg"))
         (*opts.safe_renderers)["ffmpeg"].append("null");
-    if (opts.decoders->contains("libmpeg2"))
-        (*opts.safe_renderers)["libmpeg2"].append("null");
     if (opts.decoders->contains("crystalhd"))
         (*opts.safe_renderers)["crystalhd"].append("null");
 

diff --git a/mythtv/libs/libmythtv/videoout_opengl.cpp b/mythtv/libs/libmythtv/videoout_opengl.cpp
@@ -30,8 +30,6 @@ void VideoOutputOpenGL::GetRenderOptions(render_opts &opts,
     (*opts.safe_renderers)["nuppel"].append("opengl");
     if (opts.decoders->contains("ffmpeg"))
         (*opts.safe_renderers)["ffmpeg"].append("opengl");
-    if (opts.decoders->contains("libmpeg2"))
-        (*opts.safe_renderers)["libmpeg2"].append("opengl");
     if (opts.decoders->contains("vda"))
         (*opts.safe_renderers)["vda"].append("opengl");
     if (opts.decoders->contains("crystalhd"))

diff --git a/mythtv/libs/libmythtv/videoout_quartz.cpp b/mythtv/libs/libmythtv/videoout_quartz.cpp
@@ -1092,8 +1092,6 @@ void VideoOutputQuartz::GetRenderOptions(render_opts &opts,
     (*opts.safe_renderers)["nuppel"].append("quartz-blit");
     if (opts.decoders->contains("ffmpeg"))
         (*opts.safe_renderers)["ffmpeg"].append("quartz-blit");
-    if (opts.decoders->contains("libmpeg2"))
-        (*opts.safe_renderers)["libmpeg2"].append("quartz-blit");
     if (opts.decoders->contains("vda"))
         (*opts.safe_renderers)["vda"].append("quartz-blit");
     if (opts.decoders->contains("crystalhd"))
@@ -1764,7 +1762,7 @@ MythCodecID VideoOutputQuartz::GetBestSupportedCodec(
     VideoDisplayProfile vdp;
     vdp.SetInput(QSize(width, height));
     QString dec = vdp.GetDecoder();
-    if ((dec == "libmpeg2") || (dec == "ffmpeg"))
+    if (dec == "ffmpeg")
         return (MythCodecID)(kCodec_MPEG1 + (stream_type-1));
     return (MythCodecID)(kCodec_MPEG1 + (stream_type-1));
 }