forked from cemeyer/chromium
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Sync with ports 74647995deae7050b6f9a3bf3b3a3ef8ff25ad63
- Loading branch information
Showing
2 changed files
with
19 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 16 additions & 6 deletions
22
.../files/patch-third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,22 @@ | ||
--- third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.orig 2021-04-30 09:00:21.722978000 +0000 | ||
+++ third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2021-04-30 09:00:54.473978000 +0000 | ||
@@ -202,6 +202,9 @@ | ||
--- third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.orig 2021-05-10 18:48:00 UTC | ||
+++ third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc | ||
@@ -77,7 +77,8 @@ int H264DecoderImpl::AVGetBuffer2(AVCodecContext* cont | ||
int height = av_frame->height; | ||
// See |lowres|, if used the decoder scales the image by 1/2^(lowres). This | ||
// has implications on which resolutions are valid, but we don't use it. | ||
- RTC_CHECK_EQ(context->lowres, 0); | ||
+ // PR255687: disabled to prevent crash with Microsoft Teams | ||
+ // RTC_CHECK_EQ(context->lowres, 0); | ||
// Adjust the |width| and |height| to values acceptable by the decoder. | ||
// Without this, FFmpeg may overflow the buffer. If modified, |width| and/or | ||
// |height| are larger than the actual image and the image has to be cropped | ||
@@ -201,6 +202,9 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* | ||
// |get_buffer2| is called with the context, there |opaque| can be used to get | ||
// a pointer |this|. | ||
av_context_->opaque = this; | ||
+ | ||
+ // Initializing |lowres| | ||
+ av_context_->lowres = 0; | ||
+ | ||
AVCodec* codec = avcodec_find_decoder(av_context_->codec_id); | ||
if (!codec) { | ||
// This is an indication that FFmpeg has not been initialized or it has not |