Skip to content

Commit

Permalink
Sync with ports 74647995deae7050b6f9a3bf3b3a3ef8ff25ad63
Browse files Browse the repository at this point in the history
  • Loading branch information
mwolf-rw committed May 18, 2021
1 parent 9343471 commit 974da5f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
4 changes: 3 additions & 1 deletion www/chromium/Makefile
Expand Up @@ -2,6 +2,7 @@

PORTNAME= chromium
PORTVERSION= 90.0.4430.212
PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/rene/chromium/:fonts
Expand Down Expand Up @@ -63,7 +64,8 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
libxshmfence.so:x11/libxshmfence

RUN_DEPENDS= xdg-open:devel/xdg-utils \
noto-basic>0:x11-fonts/noto-basic
noto-basic>0:x11-fonts/noto-basic \
virtual_oss>0:audio/virtual_oss

USES= bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg
Expand Down
@@ -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

0 comments on commit 974da5f

Please sign in to comment.