Ticket #10616: 10616-v1.patch

mythtv/libs/libmythtv/playercontext.h

@@ -43 +43 @@
 typedef deque<QString>         StringDeque;
 typedef QHash<QString,QString> InfoMap;
 
-class MTV_PUBLIC PlayerContext : public QObject
+class MTV_PUBLIC PlayerContext
 {
-    Q_OBJECT
   public:
     PlayerContext(const QString &inUseID = QString("Unknown"));
     ~PlayerContext();

mythtv/programs/mythtranscode/transcode.cpp

@@ -721 +721 @@
     m_proginfo(pginfo),
     keyframedist(30),
     nvr(NULL),
-    player(NULL),
-    player_ctx(NULL),
-    inRingBuffer(NULL),
+    ctx(NULL),
     outRingBuffer(NULL),
     fifow(NULL),
     kfa_table(NULL),
@@ -744 +742 @@
 {
     if (nvr)
         delete nvr;
-    if (player_ctx)
-    {
-        player       = NULL;
-        inRingBuffer = NULL;
-        delete player_ctx;
-    }
+    SetPlayerContext(NULL);
     if (outRingBuffer)
         delete outRingBuffer;
     if (fifow)
@@ -831 +824 @@
     return true;
 }
 
+void Transcode::SetPlayerContext(PlayerContext *player_ctx)
+{
+    if (player_ctx == ctx)
+        return;
+
+    delete ctx;
+    ctx = player_ctx;
+}
+
 static QString get_str_option(RecordingProfile &profile, const QString &name)
 {
     const Setting *setting = profile.byName(name);
@@ -919 +921 @@
     }
 
     // Input setup
-    if (hls && (hlsStreamID != -1))
-        inRingBuffer = RingBuffer::Create(hls->GetSourceFile(), false, false);
-    else
-        inRingBuffer = RingBuffer::Create(inputname, false, false);
-
-    player = new MythPlayer(kVideoIsNull);
-
-    player_ctx = new PlayerContext(kTranscoderInUseID);
+    PlayerContext *player_ctx = new PlayerContext(kTranscoderInUseID);
     player_ctx->SetPlayingInfo(m_proginfo);
-    player_ctx->SetRingBuffer(inRingBuffer);
-    player_ctx->SetPlayer(player);
-    player->SetPlayerInfo(NULL, NULL, true, player_ctx);
+    player_ctx->SetRingBuffer(
+        (hls && (hlsStreamID != -1)) ?
+        RingBuffer::Create(hls->GetSourceFile(), false, false) :
+        RingBuffer::Create(inputname, false, false));
+    player_ctx->SetPlayer(new MythPlayer(kVideoIsNull));
+    SetPlayerContext(player_ctx);
+    GetPlayer()->SetPlayerInfo(NULL, NULL, true, GetPlayerContext());
 
     if (showprogress)
     {
@@ -940 +939 @@
     AudioOutput *audioOutput = new AudioReencodeBuffer(FORMAT_NONE, 0,
                                                        passthru);
     AudioReencodeBuffer *arb = ((AudioReencodeBuffer*)audioOutput);
-    player->GetAudio()->SetAudioOutput(audioOutput);
-    player->SetTranscoding(true);
+    GetPlayer()->GetAudio()->SetAudioOutput(audioOutput);
+    GetPlayer()->SetTranscoding(true);
 
-    if (player->OpenFile() < 0)
+    if (GetPlayer()->OpenFile() < 0)
     {
         LOG(VB_GENERAL, LOG_ERR, "Transcoding aborted, error opening file.");
-        if (player_ctx)
-            delete player_ctx;
+        SetPlayerContext(NULL);
         return REENCODE_ERROR;
     }
 
@@ -955 +953 @@
     {
         LOG(VB_GENERAL, LOG_INFO,
             QString("Set audiotrack number to %1").arg(AudioTrackNo));
-        player->GetDecoder()->SetTrack(kTrackTypeAudio, AudioTrackNo);
+        GetPlayer()->GetDecoder()->SetTrack(kTrackTypeAudio, AudioTrackNo);
     }
 
-    long long total_frame_count = player->GetTotalFrameCount();
+    long long total_frame_count = GetPlayer()->GetTotalFrameCount();
     long long new_frame_count = total_frame_count;
     if (honorCutList && m_proginfo)
     {
@@ -1005 +1003 @@
             (JobQueue::IsJobRunning(JOB_COMMFLAG, *m_proginfo)))
         {
             LOG(VB_GENERAL, LOG_INFO, "Transcoding aborted, cutlist changed");
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_CUTLIST_CHANGE;
         }
         m_proginfo->ClearMarkupFlag(MARK_UPDATED_CUT);
         curtime = curtime.addSecs(60);
     }
 
-    player->GetAudio()->ReinitAudio();
-    QString encodingType = player->GetEncodingType();
+    GetPlayer()->GetAudio()->ReinitAudio();
+    QString encodingType = GetPlayer()->GetEncodingType();
     bool copyvideo = false, copyaudio = false;
 
     QString vidsetting = NULL, audsetting = NULL, vidfilters = NULL;
 
-    QSize buf_size = player->GetVideoBufferSize();
+    QSize buf_size = GetPlayer()->GetVideoBufferSize();
     int video_width = buf_size.width();
     int video_height = buf_size.height();
 
@@ -1030 +1027 @@
            "will treat it as such.");
     }
 
-    DecoderBase* dec = player->GetDecoder();
+    DecoderBase* dec = GetPlayer()->GetDecoder();
     float video_aspect = dec ? dec->GetVideoAspect() : 4.0f / 3.0f;
-    float video_frame_rate = player->GetFrameRate();
+    float video_frame_rate = GetPlayer()->GetFrameRate();
     int newWidth = video_width;
     int newHeight = video_height;
     bool halfFramerate = false;
@@ -1074 +1071 @@
         {
             LOG(VB_GENERAL, LOG_ERR,
                 "Transcoding aborted, error creating AVFormatWriter.");
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_ERROR;
         }
 
@@ -1103 +1099 @@
                 {
                     LOG(VB_GENERAL, LOG_ERR, "Transcoding aborted, error "
                         "creating low-bitrate AVFormatWriter.");
-                    if (player_ctx)
-                        delete player_ctx;
+                    SetPlayerContext(NULL);
                     return REENCODE_ERROR;
                 }
 
@@ -1135 +1130 @@
                 (!hls->InitForWrite()))
             {
                 LOG(VB_GENERAL, LOG_ERR, "hls->InitForWrite() failed");
-                if (player_ctx)
-                    delete player_ctx;
+                SetPlayerContext(NULL);
                 return REENCODE_ERROR;
             }
 
@@ -1187 +1181 @@
         if (!avfw->Init())
         {
             LOG(VB_GENERAL, LOG_ERR, "avfw->Init() failed");
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_ERROR;
         }
 
         if (!avfw->OpenFile())
         {
             LOG(VB_GENERAL, LOG_ERR, "avfw->OpenFile() failed");
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_ERROR;
         }
 
         if (avfw2 && !avfw2->Init())
         {
             LOG(VB_GENERAL, LOG_ERR, "avfw2->Init() failed");
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_ERROR;
         }
 
         if (avfw2 && !avfw2->OpenFile())
         {
             LOG(VB_GENERAL, LOG_ERR, "avfw2->OpenFile() failed");
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_ERROR;
         }
 
         arb->m_audioFrameSize = avfw->GetAudioFrameSize() * arb->m_channels * 2;
 
-        player->SetVideoFilters(
+        GetPlayer()->SetVideoFilters(
             gCoreContext->GetSetting("HTTPLiveStreamFilters"));
     }
     else if (fifodir.isEmpty())
@@ -1226 +1216 @@
         if (!GetProfile(profileName, encodingType, video_height,
                         (int)round(video_frame_rate))) {
             LOG(VB_GENERAL, LOG_ERR, "Transcoding aborted, no profile found.");
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_ERROR;
         }
 
@@ -1255 +1244 @@
             get_int_option(profile, "transcodelossless"))
         {
             LOG(VB_GENERAL, LOG_NOTICE, "Switching to MPEG-2 transcoder.");
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_MPEG2TRANS;
         }
 
@@ -1270 +1258 @@
         {
             int actualHeight = (video_height == 1088 ? 1080 : video_height);
 
-            player->SetVideoFilters(vidfilters);
+            GetPlayer()->SetVideoFilters(vidfilters);
             newWidth = get_int_option(profile, "width");
             newHeight = get_int_option(profile, "height");
 
@@ -1302 +1290 @@
                     .arg(newWidth).arg(newHeight));
         }
         else  // lossy and no resize
-            player->SetVideoFilters(vidfilters);
+            GetPlayer()->SetVideoFilters(vidfilters);
 
         // this is ripped from tv_rec SetupRecording. It'd be nice to merge
         nvr->SetOption("inpixfmt", FMT_YV12);
@@ -1357 +1345 @@
             LOG(VB_GENERAL, LOG_ERR, "No video information found!");
             LOG(VB_GENERAL, LOG_ERR, "Please ensure that recording profiles "
                                      "for the transcoder are set");
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_ERROR;
         }
         else
         {
             LOG(VB_GENERAL, LOG_ERR,
                 QString("Unknown video codec: %1").arg(vidsetting));
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_ERROR;
         }
 
@@ -1455 +1441 @@
             cutter = new Cutter();
             cutter->SetCutList(deleteMap);
 
-            player->SetCutList(cutter->AdjustedCutList());
+            GetPlayer()->SetCutList(cutter->AdjustedCutList());
         }
         else
         {
             // Have the player apply the cut list
-            player->SetCutList(deleteMap);
+            GetPlayer()->SetCutList(deleteMap);
         }
     }
 
-    player->InitForTranscode(copyaudio, copyvideo);
-    if (player->IsErrored())
+    GetPlayer()->InitForTranscode(copyaudio, copyvideo);
+    if (GetPlayer()->IsErrored())
     {
         LOG(VB_GENERAL, LOG_ERR,
             "Unable to initialize MythPlayer for Transcode");
-        if (player_ctx)
-            delete player_ctx;
+        SetPlayerContext(NULL);
         return REENCODE_ERROR;
     }
 
@@ -1492 +1477 @@
 
     if (!fifodir.isEmpty())
     {
-        AudioPlayer *aplayer = player->GetAudio();
+        AudioPlayer *aplayer = GetPlayer()->GetAudio();
         const char  *audio_codec_name;
 
         switch(aplayer->GetCodec())
@@ -1528 +1513 @@
             bool is_key;
             int did_ff;
             frm_dir_map_t::iterator dm_iter;
-            player->TranscodeGetNextFrame(dm_iter, did_ff, is_key, true);
+            GetPlayer()->TranscodeGetNextFrame(dm_iter, did_ff, is_key, true);
 
-            QSize buf_size = player->GetVideoBufferSize();
+            QSize buf_size = GetPlayer()->GetVideoBufferSize();
             video_width = buf_size.width();
             video_height = buf_size.height();
-            video_aspect = player->GetVideoAspect();
-            video_frame_rate = player->GetFrameRate();
+            video_aspect = GetPlayer()->GetVideoAspect();
+            video_frame_rate = GetPlayer()->GetFrameRate();
         }
 
         // Display details of the format of the fifo data.
@@ -1558 +1543 @@
             // Request was for just the format of fifo data, not for
             // the actual transcode, so stop here.
             unlink(outputname.toLocal8Bit().constData());
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_OK;
         }
 
@@ -1577 +1561 @@
             LOG(VB_GENERAL, LOG_ERR,
                 "Error initializing fifo writer.  Aborting");
             unlink(outputname.toLocal8Bit().constData());
-            if (player_ctx)
-                delete player_ctx;
+            SetPlayerContext(NULL);
             return REENCODE_ERROR;
         }
         LOG(VB_GENERAL, LOG_INFO,
@@ -1609 +1592 @@
     float rateTimeConv = arb->m_eff_audiorate / 1000.0f;
     float vidFrameTime = 1000.0f / video_frame_rate;
     int wait_recover = 0;
-    VideoOutput *videoOutput = player->GetVideoOutput();
+    VideoOutput *videoOutput = GetPlayer()->GetVideoOutput();
     bool is_key = 0;
     bool first_loop = true;
     unsigned char *newFrame = new unsigned char[frame.size];
@@ -1629 +1612 @@
         LOG(VB_GENERAL, LOG_INFO, "Transcoding Video and Audio");
 
     TranscodeFrameQueue *frameQueue =
-        new TranscodeFrameQueue(player, videoOutput, honorCutList);
+        new TranscodeFrameQueue(GetPlayer(), videoOutput, honorCutList);
     MThreadPool::globalInstance()->start(frameQueue, "TranscodeFrameQueue");
 
     QTime flagTime;
@@ -1649 +1632 @@
     {
         if (first_loop)
         {
-            copyaudio = player->GetRawAudioState();
+            copyaudio = GetPlayer()->GetRawAudioState();
             first_loop = false;
         }
 
@@ -1765 +1748 @@
                 }
             }
             videoOutput->DoneDisplayingFrame(lastDecode);
-            player->GetCC608Reader()->FlushTxtBuffers();
+            GetPlayer()->GetCC608Reader()->FlushTxtBuffers();
             lasttimecode = frame.timecode;
         }
         else if (copyaudio)
         {
             // Encoding from NuppelVideo to NuppelVideo with MP3 audio
             // So let's not decode/reencode audio
-            if (!player->GetRawAudioState())
+            if (!GetPlayer()->GetRawAudioState())
             {
                 // The Raw state changed during decode.  This is not good
                 LOG(VB_GENERAL, LOG_ERR, "Transcoding aborted, MythPlayer "
@@ -1780 +1763 @@
 
                 unlink(outputname.toLocal8Bit().constData());
                 delete [] newFrame;
-                if (player_ctx)
-                    delete player_ctx;
+                SetPlayerContext(NULL);
                 if (frameQueue)
                     frameQueue->stop();
                 return REENCODE_ERROR;
@@ -1801 +1783 @@
 
                     //need to correct the frame# and timecode here
                     // Question:  Is it necessary to change the timecodes?
-                    long sync_offset;
-                    sync_offset = player->UpdateStoredFrameNum(curFrameNum);
+                    long sync_offset =
+                        GetPlayer()->UpdateStoredFrameNum(curFrameNum);
                     nvr->UpdateSeekTable(num_keyframes, sync_offset);
                     ReencoderAddKFA(curFrameNum, lastKeyFrame, num_keyframes);
                     num_keyframes++;
@@ -1821 +1803 @@
             lasttimecode = frame.timecode;
             frame.timecode -= timecodeOffset;
 
-            if (! player->WriteStoredData(outRingBuffer, (did_ff == 0),
-                                       timecodeOffset))
+            if (!GetPlayer()->WriteStoredData(
+                    outRingBuffer, (did_ff == 0), timecodeOffset))
             {
                 if (video_aspect != new_aspect)
                 {
@@ -1830 +1812 @@
                     nvr->SetNewVideoParams(video_aspect);
                 }
 
-                QSize buf_size = player->GetVideoBufferSize();
+                QSize buf_size = GetPlayer()->GetVideoBufferSize();
 
                 if (video_width != buf_size.width() ||
                     video_height != buf_size.height())
@@ -1877 +1859 @@
 
                 nvr->WriteVideo(&frame, true, writekeyframe);
             }
-            player->GetCC608Reader()->FlushTxtBuffers();
+            GetPlayer()->GetCC608Reader()->FlushTxtBuffers();
         }
         else
         {
@@ -1896 +1878 @@
             }
 
 
-            QSize buf_size = player->GetVideoBufferSize();
+            QSize buf_size = GetPlayer()->GetVideoBufferSize();
 
             if (video_width != buf_size.width() ||
                 video_height != buf_size.height())
@@ -1979 +1961 @@
                                 "NVR::WriteAudio");
 
                             delete [] newFrame;
-                            if (player_ctx)
-                                delete player_ctx;
+                            SetPlayerContext(NULL);
                             if (frameQueue)
                                 frameQueue->stop();
                             delete ab;
@@ -1996 +1977 @@
             }
 
             if (!avfMode)
-                player->GetCC608Reader()->
+            {
+                GetPlayer()->GetCC608Reader()->
                     TranscodeWriteText(&TranscodeWriteText, (void *)(nvr));
+            }
             lasttimecode = frame.timecode;
             frame.timecode -= timecodeOffset;
 
@@ -2066 +2049 @@
 
                 unlink(outputname.toLocal8Bit().constData());
                 delete [] newFrame;
-                if (player_ctx)
-                    delete player_ctx;
+                SetPlayerContext(NULL);
                 if (frameQueue)
                     frameQueue->stop();
                 return REENCODE_CUTLIST_CHANGE;
@@ -2082 +2064 @@
 
                     unlink(outputname.toLocal8Bit().constData());
                     delete [] newFrame;
-                    if (player_ctx)
-                        delete player_ctx;
+                    SetPlayerContext(NULL);
                     if (frameQueue)
                         frameQueue->stop();
                     return REENCODE_STOPPED;
@@ -2116 +2097 @@
         curFrameNum++;
         frame.frameNumber = 1 + (curFrameNum << 1);
 
-        player->DiscardVideoFrame(lastDecode);
+        GetPlayer()->DiscardVideoFrame(lastDecode);
     }
 
     sws_freeContext(scontext);
@@ -2175 +2156 @@
         frameQueue->stop();
 
     delete [] newFrame;
-    if (player_ctx)
-        delete player_ctx;
+    SetPlayerContext(NULL);
+
     return REENCODE_OK;
 }
 

mythtv/programs/mythtranscode/transcode.h

@@ -1 @@
-#include <QPointer>
 #include "recordingprofile.h"
 #include "fifowriter.h"
 #include "transcodedefs.h"
@@ -43 +42 @@
     bool GetProfile(QString profileName, QString encodingType, int height,
                     int frameRate);
     void ReencoderAddKFA(long curframe, long lastkey, long num_keyframes);
+    void SetPlayerContext(PlayerContext*);
+    PlayerContext *GetPlayerContext(void) { return ctx; }
+    MythPlayer *GetPlayer(void) { return (ctx) ? ctx->player : NULL; }
 
   private:
     ProgramInfo            *m_proginfo;
     RecordingProfile        profile;
     int                     keyframedist;
     NuppelVideoRecorder    *nvr;
-    MythPlayer             *player;
-    QPointer<PlayerContext> player_ctx;
-    RingBuffer             *inRingBuffer;
+    PlayerContext          *ctx;
     RingBuffer             *outRingBuffer;
     FIFOWriter             *fifow;
     KFATable               *kfa_table;