Ticket #12055: 0259-ticket12xxx-hls-add-preset-tune.patch

mythtv/external/FFmpeg/libavcodec/libx264.c

@@ -289 +289 @@
     x4->params.rc.f_pb_factor             = avctx->b_quant_factor;
     x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
     if (x4->preset || x4->tune)
+        av_log(avctx, AV_LOG_INFO, "x264 setting preset/tune to: %s/%s.\n", x4->preset, x4->tune);
         if (x264_param_default_preset(&x4->params, x4->preset, x4->tune) < 0) {
             int i;
             av_log(avctx, AV_LOG_ERROR, "Error setting preset/tune %s/%s.\n", x4->preset, x4->tune);

mythtv/libs/libmythtv/avformatwriter.cpp

@@ -545 +545 @@
         av_opt_set_int(c, "mixed-refs", 1, 0);
         av_opt_set_int(c, "8x8dct", 0, 0);
         av_opt_set_int(c, "weightb", 0, 0);
+
+        const char* preset = m_EncodingPreset.toStdString().c_str();
+        av_opt_set(c->priv_data, "preset", preset, 0);
+        const char* tune = m_EncodingTune.toStdString().c_str();
+        av_opt_set(c->priv_data, "tune", tune, 0);
     }
 
     if(m_ctx->oformat->flags & AVFMT_GLOBALHEADER)

mythtv/libs/libmythtv/filewriterbase.h

@@ -40 +40 @@
     void SetAudioFormat(AudioFormat f)  { m_audioFormat = f; }
     void SetThreadCount(int count)      { m_encodingThreadCount = count; }
     void SetTimecodeOffset(long long o) { m_startingTimecodeOffset = o; }
+    void SetEncodingPreset(QString preset) { m_EncodingPreset = preset; }
+    void SetEncodingTune(QString tune)  { m_EncodingTune = tune; }
 
     long long GetFramesWritten(void)  const { return m_framesWritten; }
     long long GetTimecodeOffset(void) const { return m_startingTimecodeOffset; }
@@ -67 +69 @@
     int         m_encodingThreadCount;
     long long   m_framesWritten;
     long long   m_startingTimecodeOffset;
+    QString     m_EncodingPreset;
+    QString     m_EncodingTune;
 };
 
 #endif

mythtv/programs/mythtranscode/transcode.cpp

@@ -556 +556 @@
             avfw->SetKeyFrameDist(30);
         }
 
-        avfw->SetThreadCount(
-            gCoreContext->GetNumSetting("HTTPLiveStreamThreads", 2));
+        int threads    = gCoreContext->GetNumSetting("HTTPLiveStreamThreads", 2);
+        QString preset = gCoreContext->GetSetting("HTTPLiveStreamPreset", "medium");
+        QString tune   = gCoreContext->GetSetting("HTTPLiveStreamTune", "film");
+
+        LOG(VB_GENERAL, LOG_NOTICE,
+            QString("x264 HLS using: %1 threads, '%2' profile and '%3' tune")
+                .arg(threads).arg(preset).arg(tune));
+
+        avfw->SetThreadCount(threads);
+        avfw->SetEncodingPreset(preset);
+        avfw->SetEncodingTune(tune);
 
         if (avfw2)
             avfw2->SetThreadCount(1);