DX Crash fix for stereo mode sets

3DStreamingToolkit · Jan 25, 2018 · 571ac3f · 571ac3f
1 parent 626b0a9
commit 571ac3f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Make sure patch files only use lf.
+*.patch text eol=lf
diff --git a/Libraries/WebRTC/nvencodeDXCrashFix.patch b/Libraries/WebRTC/nvencodeDXCrashFix.patch
@@ -0,0 +1,16 @@
+diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
+index d361b8a4f..978e90181 100644
+--- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
++++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
+@@ -376,7 +376,10 @@ NVENCSTATUS H264EncoderImpl::Deinitialize()
+ 	ReleaseIOBuffers();
+ 	nvStatus = m_pNvHWEncoder->NvEncDestroyEncoder();
+
+-	__cu(cuCtxDestroy(m_cuContext));
++	if (!m_d3dDevice)
++	{
++		__cu(cuCtxDestroy(m_cuContext));
++	}
+ 	return nvStatus;
+ }
+