Support for interlaced inputs

CHANGELOG.txt

@@ -1,4 +1,8 @@
-next (0.4.0: Upscaling, added MPCVR renderer, HDR controls)
+0.4.1
+- Fix for interlaced sources
+
+0.4.0: Upscaling, added MPCVR renderer, HDR controls
+- re-release of beta3
 
 0.4.0-beta3
 - Added V210 to P210 converter for general MPCVR YUV422 duty

TODO.txt

@@ -2,8 +2,8 @@ Roadmap
 =======
 
 1.0.0: Out of beta
-- Put all formatters together under a nice API and refactor the usage a bit
-- Make generic SDR and HDR directshow filters
+- internal: Put formatters under a nice abstration
+- internal: Make generic SDR and HDR directshow filter abstrations
 
 1.1.0: Constant time delay
 - Determine baseline latency with external meter

src/DisplayMode.cpp

@@ -14,10 +14,12 @@
 DisplayMode::DisplayMode(
 	unsigned int frameWidth,
 	unsigned int frameHeight,
+	bool interlaced,
 	unsigned int timeScale,
 	unsigned int frameDuration):
 	m_frameWidth(frameWidth),
 	m_frameHeight(frameHeight),
+	m_interlaced(interlaced),
 	m_timeScale(timeScale),
 	m_frameDuration(frameDuration)
 {
@@ -54,6 +56,11 @@ CString DisplayMode::ToString() const
 	// Resolutiion
 	s.AppendFormat(_T("%ix%i"), m_frameWidth, m_frameHeight);
 
+	if (m_interlaced)
+		s += TEXT("I ");  // Interlaced
+	else
+		s += TEXT("P ");  // Progressive
+
 	// Mode name if well-known
 	// https://en.wikipedia.org/wiki/List_of_common_resolutions
 	if (m_frameWidth == 1280 && m_frameHeight == 720)
@@ -84,7 +91,8 @@ bool DisplayMode::operator == (const DisplayMode& other) const
 		FrameWidth() == other.FrameWidth() &&
 		FrameHeight() == other.FrameHeight() &&
 		TimeScale() == other.TimeScale() &&
-		FrameDuration() == other.FrameDuration();
+		FrameDuration() == other.FrameDuration() &&
+		IsInterlaced() == other.IsInterlaced();
 }
 
 

src/DisplayMode.h

@@ -34,6 +34,7 @@ class DisplayMode
 	DisplayMode(
 		unsigned int frameWidth,
 		unsigned int frameHeight,
+		bool interlaced,  // Two field per frame expected
 		unsigned int timeScale,
 		unsigned int frameDuration);
 
@@ -49,6 +50,10 @@ class DisplayMode
 	// Ticks per frame (expressed in TimeScale())
 	unsigned int FrameDuration() const { return m_frameDuration; }
 
+	// Frame contains interlaced data
+	bool IsInterlaced() const { return m_interlaced; }
+
+
 	// Refresh rate in Hz as double
 	double RefreshRateHz() const;
 
@@ -65,6 +70,7 @@ class DisplayMode
 
 	const unsigned int m_frameWidth;
 	const unsigned int m_frameHeight;
+	const bool m_interlaced;
 	const unsigned int m_timeScale;
 	const unsigned int m_frameDuration;
 };

src/Encoding.h

@@ -13,6 +13,7 @@
 
 
 // (Color space) encoding of the signal
+// TODO: Rename me to something more understandable and fix line above here so give more details
 enum class Encoding
 {
 	UNKNOWN,

src/blackmagic_decklink/BlackMagicDeckLinkCaptureDevice.cpp

@@ -535,6 +535,7 @@ HRESULT STDMETHODCALLTYPE BlackMagicDeckLinkCaptureDevice::VideoInputFrameArrive
 		m_previousTimingClockFrameTime = timingClockFrameTime;
 
 		// Every every so often get the hardware latency.
+		// TODO: Change to framerate rather than fixed number of frames
 		if(m_capturedVideoFrameCount % 20 == 0)
 		{
 			timingclocktime_t timingClockNow = TimingClockNow();

src/blackmagic_decklink/BlackMagicDeckLinkTranslate.cpp

@@ -294,12 +294,14 @@ DisplayModeSharedPtr Translate(BMDDisplayMode displayMode)
 	if(it == BD_DISPLAY_MODE_DATA.end())
 		throw std::runtime_error("Unknown BMDDisplayMode");
 
-	if (it->second.fieldsPerFrame != 1)
-		throw std::runtime_error("Interlaced format, not supported");
+	assert(
+		it->second.fieldsPerFrame == 1 ||
+		it->second.fieldsPerFrame == 2);
 
 	return std::make_shared<DisplayMode>(
 		it->second.width,
 		it->second.height,
+		(it->second.fieldsPerFrame == 2),  // Interlaced?
 		(unsigned int)it->second.timeScale,
 		(unsigned int)it->second.frameDuration);
 }

src/microsoft_directshow/video_renderers/DirectShowGenericHDRVideoRenderer.cpp

@@ -212,6 +212,9 @@ void DirectShowGenericHDRVideoRenderer::MediaTypeGenerate()
 	pvi2->dwControlFlags += AMCONTROL_USED;
 	pvi2->dwControlFlags += AMCONTROL_COLORINFO_PRESENT;
 
+	if (m_videoState->displayMode->IsInterlaced())
+		pvi2->dwInterlaceFlags = AMINTERLACE_IsInterlaced | AMINTERLACE_DisplayModeBobOrWeave;
+
 	m_pmt.lSampleSize = DIBSIZE(pvi2->bmiHeader);
 }