Update render to use 3d pipeline instead of vpp for CSC.

Author: taste1981

talk/owt/sdk/base/stream.cc

@@ -81,7 +81,6 @@ Stream::Stream()
     : media_stream_(nullptr),
       renderer_impl_(nullptr),
       audio_renderer_impl_(nullptr),
-      d3d9_renderer_impl_(nullptr),
       d3d11_renderer_impl_(nullptr),
 #ifdef OWT_ENABLE_QUIC
       source_(AudioSourceInfo::kUnknown,
@@ -96,7 +95,6 @@ Stream::Stream(const std::string& id)
     : media_stream_(nullptr),
       renderer_impl_(nullptr),
       audio_renderer_impl_(nullptr),
-      d3d9_renderer_impl_(nullptr),
       d3d11_renderer_impl_(nullptr),
 #ifdef OWT_ENABLE_QUIC
       source_(AudioSourceInfo::kUnknown,

talk/owt/sdk/base/win/d3d11_allocator.cc

@@ -422,7 +422,7 @@ mfxStatus D3D11FrameAllocator::AllocImpl(mfxFrameAllocRequest *request, mfxFrame
         desc.Height =  request->Info.Height;
 
         desc.MipLevels = 1;
-        //number of subresources is 1 in case of not single texture
+        // Number of subresources is 1 in case of not single texture
         desc.ArraySize = m_initParams.bUseSingleTexture ? request->NumFrameSuggested : 1;
         desc.Format = ConverColortFormat(request->Info.FourCC);
         desc.SampleDesc.Count = 1;
@@ -432,10 +432,9 @@ mfxStatus D3D11FrameAllocator::AllocImpl(mfxFrameAllocRequest *request, mfxFrame
         if ((request->Type&MFX_MEMTYPE_VIDEO_MEMORY_ENCODER_TARGET) && (request->Type & MFX_MEMTYPE_INTERNAL_FRAME))
         {
             desc.BindFlags = D3D11_BIND_DECODER | D3D11_BIND_VIDEO_ENCODER;
-        }
-        else
+        } else  // Jianlin: adds the shader resource flag so renderer can use this as staging texture.
 #endif
-            desc.BindFlags = D3D11_BIND_DECODER;
+            desc.BindFlags = D3D11_BIND_DECODER | D3D11_BIND_SHADER_RESOURCE;
 
         if ( (MFX_MEMTYPE_FROM_VPPIN & request->Type) && (DXGI_FORMAT_YUY2 == desc.Format) ||
              (DXGI_FORMAT_B8G8R8A8_UNORM == desc.Format) ||

talk/owt/sdk/base/win/mediacapabilities.cc

@@ -4,11 +4,12 @@
 
 #include <string>
 #include <vector>
-#include "talk/owt/sdk/base/win/mediacapabilities.h"
 #ifdef OWT_USE_MSDK
 #include "mfxcommon.h"
 #include "mfxstructures.h"
 #endif
+#include "talk/owt/sdk/base/win/mediacapabilities.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace owt {
 namespace base {
@@ -295,8 +296,9 @@ MediaCapabilities::SupportedCapabilitiesForVideoDecoder(
       else if (codec == owt::base::VideoCodec::kH265) {
         memset(&video_param, 0, sizeof(video_param));
         video_param.mfx.CodecId = MFX_CODEC_HEVC;
-
         sts = mfx_decoder->Query(nullptr, &video_param);
+        RTC_LOG(LS_ERROR) << "Johny---H265 query result:" << sts;
+
         if (sts == MFX_ERR_NONE) {
           VideoDecoderCapability h265_cap;
           h265_cap.codec_type = owt::base::VideoCodec::kH265;