Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 92d2faf

Browse files
committed
Do not destroy d3d11 views when d3d9 device lost.
1 parent a3c1913 commit 92d2faf

File tree

6 files changed

+567
-598
lines changed

6 files changed

+567
-598
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ int32_t MSDKVideoDecoder::Decode(
392392
decoded_frame.set_ntp_time_ms(inputImage.ntp_time_ms_);
393393
decoded_frame.set_timestamp(inputImage.Timestamp());
394394
callback_->Decoded(decoded_frame);
395-
RTC_LOG(LS_ERROR) << "Succeed decoding a frame.";
396395
}
397396
}
398397
} else if (MFX_ERR_MORE_DATA == sts) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "talk/owt/sdk/base/win/msdkvideodecoderfactory.h"
1515
#include "talk/owt/sdk/base/win/msdkvideodecoder.h"
1616

17+
1718
namespace owt {
1819
namespace base {
1920

@@ -90,7 +91,7 @@ std::unique_ptr<webrtc::VideoDecoder> MSDKVideoDecoderFactory::CreateVideoDecode
9091
return webrtc::VP9Decoder::Create();
9192
} else if (absl::EqualsIgnoreCase(format.name, cricket::kVp8CodecName) &&
9293
!vp8_hw) {
93-
RTC_LOG(LS_ERROR) << "Not supporting HW VP8 decoder. Requesting SW:";
94+
RTC_LOG(LS_ERROR) << "Not supporting HW VP8 decoder. Requesting SW decoding.";
9495
return webrtc::VP8Decoder::Create();
9596
} else if (absl::EqualsIgnoreCase(format.name, cricket::kH264CodecName) && !h264_hw) {
9697
return webrtc::H264Decoder::Create();
@@ -102,7 +103,6 @@ std::unique_ptr<webrtc::VideoDecoder> MSDKVideoDecoderFactory::CreateVideoDecode
102103
// This should not happen.
103104
else if (absl::EqualsIgnoreCase(format.name, cricket::kH265CodecName) && !h265_hw) {
104105
RTC_LOG(LS_ERROR) << "Returning null hevc encoder.";
105-
//return nullptr;
106106
}
107107
#endif
108108

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -550,12 +550,7 @@ int MSDKVideoEncoder::Encode(
550550
}
551551
}
552552
}
553-
RTC_LOG(LS_ERROR) << "Request encoding of frame size:" << input_image.height()
554-
<< "x" << input_image.width();
555553
sts = m_pmfxENC->GetVideoParam(&m_mfxEncParams);
556-
RTC_LOG(LS_ERROR) << "Current video param, width="
557-
<< m_mfxEncParams.mfx.FrameInfo.CropW
558-
<< ", height=" << m_mfxEncParams.mfx.FrameInfo.CropH;
559554
if (codec_type == webrtc::kVideoCodecVP9 && vp9_use_external_brc) {
560555
sts = m_pmfxENC->GetVideoParam(&m_mfxEncParams);
561556
if (MFX_ERR_NONE != sts) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ std::unique_ptr<webrtc::VideoEncoder> MSDKVideoEncoderFactory::CreateVideoEncode
108108
else if (absl::EqualsIgnoreCase(format.name, cricket::kH265CodecName) &&
109109
!h265_hw) {
110110
}
111-
// return nullptr;
112111
#endif
113112
return MSDKVideoEncoder::Create(cricket::VideoCodec(format));
114113
}

0 commit comments

Comments
 (0)