diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/media/muxers | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/muxers')
| -rw-r--r-- | chromium/media/muxers/webm_muxer.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chromium/media/muxers/webm_muxer.cc b/chromium/media/muxers/webm_muxer.cc index d0b3f4a6339..c257bc59fd1 100644 --- a/chromium/media/muxers/webm_muxer.cc +++ b/chromium/media/muxers/webm_muxer.cc @@ -8,6 +8,7 @@ #include <memory> #include "base/bind.h" +#include "base/logging.h" #include "media/base/audio_parameters.h" #include "media/base/limits.h" #include "media/base/video_frame.h" @@ -137,12 +138,9 @@ base::Optional<mkvmuxer::Colour> ColorFromColorSpace( WebmMuxer::VideoParameters::VideoParameters( scoped_refptr<media::VideoFrame> frame) : visible_rect_size(frame->visible_rect().size()), - frame_rate(0.0), + frame_rate(frame->metadata()->frame_rate.value_or(0.0)), codec(kUnknownVideoCodec), - color_space(frame->ColorSpace()) { - ignore_result(frame->metadata()->GetDouble(VideoFrameMetadata::FRAME_RATE, - &frame_rate)); -} + color_space(frame->ColorSpace()) {} WebmMuxer::VideoParameters::VideoParameters( gfx::Size visible_rect_size, |