various: implement sequence pixel aspect ratios and interlacing settings

Implements the following:
- Sequences have pixel aspect ratios that work in tandem with footage PARs
  to render footage correctly. Viewer and export also acknowledge PARs
- Sequences can have interlacing settings. This doesn't do anything yet,
  eventually the renderer will need to interlace/deinterlace/reinterlace
  appropriately in order to conform all the footage to the sequence. Export
  acknowledges interlacing, but this only affects metadata, not the image.

app/dialog/export/export.cpp

@@ -177,9 +177,11 @@ ExportDialog::ExportDialog(ViewerOutput *viewer_node, QWidget *parent) :
   video_tab_->width_slider()->SetDefaultValue(viewer_node_->video_params().width());
   video_tab_->height_slider()->SetValue(viewer_node_->video_params().height());
   video_tab_->height_slider()->SetDefaultValue(viewer_node_->video_params().height());
-  video_tab_->set_frame_rate(viewer_node_->video_params().time_base().flipped());
-  audio_tab_->set_sample_rate(viewer_node_->audio_params().sample_rate());
-  audio_tab_->set_channel_layout(viewer_node_->audio_params().channel_layout());
+  video_tab_->frame_rate_combobox()->SetFrameRate(viewer_node_->video_params().time_base().flipped());
+  video_tab_->pixel_aspect_combobox()->SetPixelAspectRatio(viewer_node_->video_params().pixel_aspect_ratio());
+  video_tab_->interlaced_combobox()->SetInterlaceMode(viewer_node_->video_params().interlacing());
+  audio_tab_->sample_rate_combobox()->SetSampleRate(viewer_node_->audio_params().sample_rate());
+  audio_tab_->channel_layout_combobox()->SetChannelLayout(viewer_node_->audio_params().channel_layout());
 
   video_aspect_ratio_ = static_cast<double>(viewer_node_->video_params().width()) / static_cast<double>(viewer_node_->video_params().height());
 
@@ -423,12 +425,14 @@ ExportParams ExportDialog::GenerateParams() const
 
   VideoParams video_render_params(static_cast<int>(video_tab_->width_slider()->GetValue()),
                                   static_cast<int>(video_tab_->height_slider()->GetValue()),
-                                  video_tab_->frame_rate().flipped(),
+                                  video_tab_->frame_rate_combobox()->GetFrameRate().flipped(),
                                   PixelFormat::instance()->GetConfiguredFormatForMode(render_mode),
+                                  video_tab_->pixel_aspect_combobox()->GetPixelAspectRatio(),
+                                  video_tab_->interlaced_combobox()->GetInterlaceMode(),
                                   render_mode);
 
   AudioParams audio_render_params(audio_tab_->sample_rate_combobox()->currentData().toInt(),
-                                  audio_tab_->channel_layout_combobox()->currentData().toULongLong(),
+                                  audio_tab_->channel_layout_combobox()->GetChannelLayout(),
                                   SampleFormat::kInternalFormat);
 
   ExportParams params;
@@ -462,8 +466,8 @@ ExportParams ExportDialog::GenerateParams() const
 
 void ExportDialog::UpdateViewerDimensions()
 {
-  preview_viewer_->SetOverrideSize(static_cast<int>(video_tab_->width_slider()->GetValue()),
-                                   static_cast<int>(video_tab_->height_slider()->GetValue()));
+  preview_viewer_->SetViewerResolution(static_cast<int>(video_tab_->width_slider()->GetValue()),
+                                       static_cast<int>(video_tab_->height_slider()->GetValue()));
 
   QMatrix4x4 transform =
       ExportParams::GenerateMatrix(static_cast<ExportParams::VideoScalingMethod>(video_tab_->scaling_method_combobox()->currentData().toInt()),

app/dialog/export/exportaudiotab.cpp

@@ -46,22 +46,14 @@ ExportAudioTab::ExportAudioTab(QWidget* parent) :
 
   layout->addWidget(new QLabel(tr("Sample Rate:")), row, 0);
 
-  sample_rate_combobox_ = new QComboBox();
-  sample_rates_ = Core::SupportedSampleRates();
-  foreach (const int& sr, sample_rates_) {
-    sample_rate_combobox_->addItem(Core::SampleRateToString(sr), sr);
-  }
+  sample_rate_combobox_ = new SampleRateComboBox();
   layout->addWidget(sample_rate_combobox_, row, 1);
 
   row++;
 
   layout->addWidget(new QLabel(tr("Channel Layout:")), row, 0);
 
-  channel_layout_combobox_ = new QComboBox();
-  channel_layouts_ = Core::SupportedChannelLayouts();
-  foreach (const uint64_t& ch_layout, channel_layouts_) {
-    channel_layout_combobox_->addItem(Core::ChannelLayoutToString(ch_layout), QVariant::fromValue(ch_layout));
-  }
+  channel_layout_combobox_ = new ChannelLayoutComboBox();
   layout->addWidget(channel_layout_combobox_, row, 1);
 
   row++;
@@ -72,29 +64,4 @@ ExportAudioTab::ExportAudioTab(QWidget* parent) :
   outer_layout->addStretch();
 }
 
-QComboBox *ExportAudioTab::codec_combobox() const
-{
-  return codec_combobox_;
-}
-
-QComboBox *ExportAudioTab::sample_rate_combobox() const
-{
-  return sample_rate_combobox_;
-}
-
-QComboBox *ExportAudioTab::channel_layout_combobox() const
-{
-  return channel_layout_combobox_;
-}
-
-void ExportAudioTab::set_sample_rate(int rate)
-{
-  sample_rate_combobox_->setCurrentIndex(sample_rates_.indexOf(rate));
-}
-
-void ExportAudioTab::set_channel_layout(uint64_t layout)
-{
-  channel_layout_combobox_->setCurrentIndex(channel_layouts_.indexOf(layout));
-}
-
 OLIVE_NAMESPACE_EXIT

app/dialog/export/exportaudiotab.h

@@ -25,6 +25,7 @@
 #include <QWidget>
 
 #include "common/define.h"
+#include "widget/standardcombos/standardcombos.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -33,20 +34,26 @@ class ExportAudioTab : public QWidget
 public:
   ExportAudioTab(QWidget* parent = nullptr);
 
-  QComboBox* codec_combobox() const;
-  QComboBox* sample_rate_combobox() const;
-  QComboBox* channel_layout_combobox() const;
+  QComboBox* codec_combobox() const
+  {
+    return codec_combobox_;
+  }
 
-  void set_sample_rate(int rate);
-  void set_channel_layout(uint64_t layout);
+  SampleRateComboBox* sample_rate_combobox() const
+  {
+    return sample_rate_combobox_;
+  }
+
+  ChannelLayoutComboBox* channel_layout_combobox() const
+  {
+    return channel_layout_combobox_;
+  }
 
 private:
   QComboBox* codec_combobox_;
-  QComboBox* sample_rate_combobox_;
-  QComboBox* channel_layout_combobox_;
+  SampleRateComboBox* sample_rate_combobox_;
+  ChannelLayoutComboBox* channel_layout_combobox_;
 
-  QList<int> sample_rates_;
-  QList<uint64_t> channel_layouts_;
 };
 
 OLIVE_NAMESPACE_EXIT

app/dialog/export/exportvideotab.cpp

@@ -49,71 +49,6 @@ ExportVideoTab::ExportVideoTab(ColorManager* color_manager, QWidget *parent) :
   outer_layout->addStretch();
 }
 
-ExportCodec::Codec ExportVideoTab::GetSelectedCodec() const
-{
-  return static_cast<ExportCodec::Codec>(codec_combobox()->currentData().toInt());
-}
-
-QComboBox *ExportVideoTab::codec_combobox() const
-{
-  return codec_combobox_;
-}
-
-IntegerSlider *ExportVideoTab::width_slider() const
-{
-  return width_slider_;
-}
-
-IntegerSlider *ExportVideoTab::height_slider() const
-{
-  return height_slider_;
-}
-
-QCheckBox *ExportVideoTab::maintain_aspect_checkbox() const
-{
-  return maintain_aspect_checkbox_;
-}
-
-QComboBox *ExportVideoTab::scaling_method_combobox() const
-{
-  return scaling_method_combobox_;
-}
-
-const rational &ExportVideoTab::frame_rate() const
-{
-  return frame_rates_.at(frame_rate_combobox_->currentIndex());
-}
-
-void ExportVideoTab::set_frame_rate(const rational &frame_rate)
-{
-  frame_rate_combobox_->setCurrentIndex(frame_rates_.indexOf(frame_rate));
-}
-
-QString ExportVideoTab::CurrentOCIOColorSpace()
-{
-  return color_space_chooser_->input();
-}
-
-CodecSection *ExportVideoTab::GetCodecSection() const
-{
-  return static_cast<CodecSection*>(codec_stack_->currentWidget());
-}
-
-void ExportVideoTab::SetCodecSection(CodecSection *section)
-{
-  codec_stack_->setCurrentWidget(section);
-}
-
-ImageSection *ExportVideoTab::image_section() const
-{
-  return image_section_;
-}
-
-H264Section *ExportVideoTab::h264_section() const
-{
-  return h264_section_;
-}
-
 QWidget* ExportVideoTab::SetupResolutionSection()
 {
   int row = 0;
@@ -163,14 +98,23 @@ QWidget* ExportVideoTab::SetupResolutionSection()
 
   layout->addWidget(new QLabel(tr("Frame Rate:")), row, 0);
 
-  frame_rate_combobox_ = new QComboBox();
-  frame_rates_ = Core::SupportedFrameRates();
-  foreach (const rational& fr, frame_rates_) {
-    frame_rate_combobox_->addItem(Core::FrameRateToString(fr));
-  }
-
+  frame_rate_combobox_ = new FrameRateComboBox();
   layout->addWidget(frame_rate_combobox_, row, 1);
 
+  row++;
+
+  layout->addWidget(new QLabel(tr("Pixel Aspect Ratio:")), row, 0);
+
+  pixel_aspect_combobox_ = new PixelAspectRatioComboBox();
+  layout->addWidget(pixel_aspect_combobox_, row, 1);
+
+  row++;
+
+  layout->addWidget(new QLabel(tr("Interlacing:")), row, 0);
+
+  interlaced_combobox_ = new InterlacedComboBox();
+  layout->addWidget(interlaced_combobox_, row, 1);
+
   return resolution_group;
 }
 

app/dialog/export/exportvideotab.h

@@ -31,6 +31,7 @@
 #include "render/colormanager.h"
 #include "widget/colorwheel/colorspacechooser.h"
 #include "widget/slider/integerslider.h"
+#include "widget/standardcombos/standardcombos.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -40,24 +41,75 @@ class ExportVideoTab : public QWidget
 public:
   ExportVideoTab(ColorManager* color_manager, QWidget* parent = nullptr);
 
-  ExportCodec::Codec GetSelectedCodec() const;
+  ExportCodec::Codec GetSelectedCodec() const
+  {
+    return static_cast<ExportCodec::Codec>(codec_combobox()->currentData().toInt());
+  }
 
-  QComboBox* codec_combobox() const;
+  QComboBox* codec_combobox() const
+  {
+    return codec_combobox_;
+  }
 
-  IntegerSlider* width_slider() const;
-  IntegerSlider* height_slider() const;
-  QCheckBox* maintain_aspect_checkbox() const;
-  QComboBox* scaling_method_combobox() const;
+  IntegerSlider* width_slider() const
+  {
+    return width_slider_;
+  }
 
-  const rational& frame_rate() const;
-  void set_frame_rate(const rational& frame_rate);
+  IntegerSlider* height_slider() const
+  {
+    return height_slider_;
+  }
 
-  QString CurrentOCIOColorSpace();
+  QCheckBox* maintain_aspect_checkbox() const
+  {
+    return maintain_aspect_checkbox_;
+  }
 
-  CodecSection* GetCodecSection() const;
-  void SetCodecSection(CodecSection* section);
-  ImageSection* image_section() const;
-  H264Section* h264_section() const;
+  QComboBox* scaling_method_combobox() const
+  {
+    return scaling_method_combobox_;
+  }
+
+  FrameRateComboBox* frame_rate_combobox() const
+  {
+    return frame_rate_combobox_;
+  }
+
+  QString CurrentOCIOColorSpace()
+  {
+    return color_space_chooser_->input();
+  }
+
+  CodecSection* GetCodecSection() const
+  {
+    return static_cast<CodecSection*>(codec_stack_->currentWidget());
+  }
+
+  void SetCodecSection(CodecSection* section)
+  {
+    codec_stack_->setCurrentWidget(section);
+  }
+
+  ImageSection* image_section() const
+  {
+    return image_section_;
+  }
+
+  H264Section* h264_section() const
+  {
+    return h264_section_;
+  }
+
+  InterlacedComboBox* interlaced_combobox() const
+  {
+    return interlaced_combobox_;
+  }
+
+  PixelAspectRatioComboBox* pixel_aspect_combobox() const
+  {
+    return pixel_aspect_combobox_;
+  }
 
   const int& threads() const
   {
@@ -80,7 +132,7 @@ private:
   QWidget* SetupCodecSection();
 
   QComboBox* codec_combobox_;
-  QComboBox* frame_rate_combobox_;
+  FrameRateComboBox* frame_rate_combobox_;
   QCheckBox* maintain_aspect_checkbox_;
   QComboBox* scaling_method_combobox_;
 
@@ -93,10 +145,11 @@ private:
   IntegerSlider* width_slider_;
   IntegerSlider* height_slider_;
 
-  QList<rational> frame_rates_;
-
   ColorManager* color_manager_;
 
+  InterlacedComboBox* interlaced_combobox_;
+  PixelAspectRatioComboBox* pixel_aspect_combobox_;
+
   int threads_;
 
   QString pix_fmt_;