フレーム時間が不明の場合の処理を追加。

Author: rigaya

VCECore/rgy_filter_yadif.cpp

@@ -322,11 +322,21 @@ RGY_ERR RGYFilterYadif::run_filter(const RGYFrameInfo *pInputFrame, RGYFrameInfo
                 pSourceFrame->picstruct,
                 queue, wait_events, event
                 );
+            auto frameDuration = pSourceFrame->duration;
+            if (frameDuration == 0) {
+                if (iframe <= 1) {
+                    frameDuration = (decltype(frameDuration))((prm->timebase / prm->baseFps * 2).qdouble() + 0.5);
+                } else if (m_nFrame + 1 >= iframe) {
+                    frameDuration = m_source.get(m_nFrame + 0)->frame.timestamp - m_source.get(m_nFrame - 1)->frame.timestamp;
+                } else {
+                    frameDuration = m_source.get(m_nFrame + 1)->frame.timestamp - m_source.get(m_nFrame + 0)->frame.timestamp;
+                }
+            }
             ppOutputFrames[1]->picstruct = RGY_PICSTRUCT_FRAME;
             ppOutputFrames[0]->timestamp = pSourceFrame->timestamp;
-            ppOutputFrames[0]->duration = (pSourceFrame->duration + 1) / 2;
+            ppOutputFrames[0]->duration = (frameDuration + 1) / 2;
             ppOutputFrames[1]->timestamp = ppOutputFrames[0]->timestamp + ppOutputFrames[0]->duration;
-            ppOutputFrames[1]->duration = pSourceFrame->duration - ppOutputFrames[0]->duration;
+            ppOutputFrames[1]->duration = frameDuration - ppOutputFrames[0]->duration;
             ppOutputFrames[1]->inputFrameId = pSourceFrame->inputFrameId;
         }
         m_nFrame++;

VCECore/rgy_filter_yadif.h

@@ -39,7 +39,8 @@ enum YadifTargetField {
 class RGYFilterParamYadif : public RGYFilterParam {
 public:
     VppYadif yadif;
-    RGYFilterParamYadif() : yadif() {};
+    rgy_rational<int> timebase;
+    RGYFilterParamYadif() : yadif(), timebase() {};
     virtual ~RGYFilterParamYadif() {};
     virtual tstring print() const override { return yadif.print(); };
 };

VCECore/vce_core.cpp

@@ -1041,6 +1041,7 @@ RGY_ERR VCECore::initFilters(VCEParam *inputParam) {
             param->frameIn = inputFrame;
             param->frameOut = inputFrame;
             param->baseFps = m_encFps;
+            param->timebase = m_outputTimebase;
             param->bOutOverwrite = false;
             auto sts = filter->init(param, m_pLog);
             if (sts != RGY_ERR_NONE) {