Cineform support (#1853)

* Cineform Support

Add default cineform support

* Revert "Cineform Support"

This reverts commit f810358b7997ea2d996a3dbbae21252c9f37e7e9.

* Cineform Support

Add default cineform support

* Do not expose DNxHD yet

* ExportDialog: Add CineformSection

Co-authored-by: itsmattkc <34096995+itsmattkc@users.noreply.github.com>

app/codec/exportcodec.cpp

@@ -44,6 +44,8 @@ QString ExportCodec::GetCodecName(ExportCodec::Codec c)
     return tr("PNG");
   case kCodecProRes:
     return tr("ProRes");
+    case kCodecCineform:
+    return tr("Cineform");
   case kCodecTIFF:
     return tr("TIFF");
   case kCodecMP2:
@@ -79,6 +81,7 @@ bool ExportCodec::IsCodecAStillImage(ExportCodec::Codec c)
   case kCodecH264rgb:
   case kCodecH265:
   case kCodecProRes:
+  case kCodecCineform:
   case kCodecMP2:
   case kCodecMP3:
   case kCodecAAC:

app/codec/exportcodec.h

@@ -42,6 +42,7 @@ public:
     kCodecOpenEXR,
     kCodecPNG,
     kCodecProRes,
+    kCodecCineform,
     kCodecTIFF,
     kCodecVP9,
 

app/codec/exportformat.cpp

@@ -117,7 +117,7 @@ QList<ExportCodec::Codec> ExportFormat::GetVideoCodecs(ExportFormat::Format f)
   case kFormatTIFF:
     return {ExportCodec::kCodecTIFF};
   case kFormatQuickTime:
-    return {ExportCodec::kCodecH264, ExportCodec::kCodecH264rgb, ExportCodec::kCodecH265, ExportCodec::kCodecProRes};
+    return {ExportCodec::kCodecH264, ExportCodec::kCodecH264rgb, ExportCodec::kCodecH265, ExportCodec::kCodecProRes, ExportCodec::kCodecCineform};
   case kFormatWebM:
     return {ExportCodec::kCodecVP9};
   case kFormatOgg:

app/codec/ffmpeg/ffmpegencoder.cpp

@@ -844,6 +844,8 @@ AVCodec *FFmpegEncoder::GetEncoder(ExportCodec::Codec c)
     return avcodec_find_encoder(AV_CODEC_ID_DNXHD);
   case ExportCodec::kCodecProRes:
     return avcodec_find_encoder(AV_CODEC_ID_PRORES);
+    case ExportCodec::kCodecCineform:
+    return avcodec_find_encoder(AV_CODEC_ID_CFHD);
   case ExportCodec::kCodecH265:
     return avcodec_find_encoder(AV_CODEC_ID_HEVC);
   case ExportCodec::kCodecVP9:

app/dialog/export/codec/CMakeLists.txt

@@ -16,12 +16,13 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
+  dialog/export/codec/cineformsection.cpp
+  dialog/export/codec/cineformsection.h
   dialog/export/codec/codecsection.cpp
   dialog/export/codec/codecsection.h
   dialog/export/codec/codecstack.cpp
   dialog/export/codec/codecstack.h
   dialog/export/codec/h264section.cpp
-  dialog/export/codec/h264section.cpp
   dialog/export/codec/h264section.h
   dialog/export/codec/imagesection.cpp
   dialog/export/codec/imagesection.h

app/dialog/export/codec/cineformsection.cpp

@@ -0,0 +1,85 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2021 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "cineformsection.h"
+
+#include <QGridLayout>
+#include <QLabel>
+
+namespace olive {
+
+CineformSection::CineformSection(QWidget *parent) :
+  CodecSection(parent)
+{
+  QGridLayout *layout = new QGridLayout(this);
+
+  layout->setMargin(0);
+
+  int row = 0;
+
+  layout->addWidget(new QLabel(tr("Quality:")), row, 0);
+
+  quality_combobox_ = new QComboBox();
+
+  /* Correspond to the following indexes for FFmpeg
+   *
+   *   -quality           <int>        E..V....... set quality (from 0 to 12) (default film3+)
+   *     film3+          0            E..V.......
+   *     film3           1            E..V.......
+   *     film2+          2            E..V.......
+   *     film2           3            E..V.......
+   *     film1.5         4            E..V.......
+   *     film1+          5            E..V.......
+   *     film1           6            E..V.......
+   *     high+           7            E..V.......
+   *     high            8            E..V.......
+   *     medium+         9            E..V.......
+   *     medium          10           E..V.......
+   *     low+            11           E..V.......
+   *     low             12           E..V.......
+   *
+   */
+
+  quality_combobox_->addItem(tr("Film Scan 3+"));
+  quality_combobox_->addItem(tr("Film Scan 3"));
+  quality_combobox_->addItem(tr("Film Scan 2+"));
+  quality_combobox_->addItem(tr("Film Scan 2"));
+  quality_combobox_->addItem(tr("Film Scan 1.5"));
+  quality_combobox_->addItem(tr("Film Scan 1+"));
+  quality_combobox_->addItem(tr("Film Scan 1"));
+  quality_combobox_->addItem(tr("High+"));
+  quality_combobox_->addItem(tr("High"));
+  quality_combobox_->addItem(tr("Medium+"));
+  quality_combobox_->addItem(tr("Medium"));
+  quality_combobox_->addItem(tr("Low+"));
+  quality_combobox_->addItem(tr("Low"));
+
+  // Default to "medium"
+  quality_combobox_->setCurrentIndex(10);
+
+  layout->addWidget(quality_combobox_, row, 1);
+}
+
+void CineformSection::AddOpts(EncodingParams *params)
+{
+  params->set_video_option(QStringLiteral("quality"), QString::number(quality_combobox_->currentIndex()));
+}
+
+}

app/dialog/export/codec/cineformsection.h

@@ -0,0 +1,45 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2021 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef CINEFORMSECTION_H
+#define CINEFORMSECTION_H
+
+#include <QComboBox>
+
+#include "codecsection.h"
+
+namespace olive {
+
+class CineformSection : public CodecSection
+{
+  Q_OBJECT
+public:
+  CineformSection(QWidget *parent = nullptr);
+
+  virtual void AddOpts(EncodingParams* params) override;
+
+private:
+  QComboBox *quality_combobox_;
+
+};
+
+}
+
+#endif // CINEFORMSECTION_H

app/dialog/export/exportvideotab.cpp

@@ -185,6 +185,9 @@ QWidget *ExportVideoTab::SetupCodecSection()
   h265_section_ = new H265Section();
   codec_stack_->addWidget(h265_section_);
 
+  cineform_section_ = new CineformSection();
+  codec_stack_->addWidget(cineform_section_);
+
   row++;
 
   QPushButton* advanced_btn = new QPushButton(tr("Advanced"));
@@ -240,6 +243,9 @@ void ExportVideoTab::VideoCodecChanged()
     case ExportCodec::kCodecH265:
       SetCodecSection(h265_section_);
       break;
+    case ExportCodec::kCodecCineform:
+      SetCodecSection(cineform_section_);
+      break;
     default:
       SetCodecSection(ExportCodec::IsCodecAStillImage(codec) ? image_section_ : nullptr);
   }

app/dialog/export/exportvideotab.h

@@ -26,6 +26,7 @@
 #include <QWidget>
 
 #include "common/rational.h"
+#include "dialog/export/codec/cineformsection.h"
 #include "dialog/export/codec/codecstack.h"
 #include "dialog/export/codec/h264section.h"
 #include "dialog/export/codec/imagesection.h"
@@ -160,6 +161,7 @@ private:
   ImageSection* image_section_;
   H264Section* h264_section_;
   H264Section* h265_section_;
+  CineformSection *cineform_section_;
 
   ColorSpaceChooser* color_space_chooser_;