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/capture/content | |
| 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/capture/content')
| -rw-r--r-- | chromium/media/capture/content/android/thread_safe_capture_oracle.cc | 15 | ||||
| -rw-r--r-- | chromium/media/capture/content/video_capture_oracle.cc | 1 |
2 files changed, 6 insertions, 10 deletions
diff --git a/chromium/media/capture/content/android/thread_safe_capture_oracle.cc b/chromium/media/capture/content/android/thread_safe_capture_oracle.cc index 27a1515b9e7..498f65f10d8 100644 --- a/chromium/media/capture/content/android/thread_safe_capture_oracle.cc +++ b/chromium/media/capture/content/android/thread_safe_capture_oracle.cc @@ -221,16 +221,11 @@ void ThreadSafeCaptureOracle::DidCaptureFrame( if (!should_deliver_frame || !client_) return; - frame->metadata()->SetDouble(VideoFrameMetadata::FRAME_RATE, - params_.requested_format.frame_rate); - frame->metadata()->SetTimeTicks(VideoFrameMetadata::CAPTURE_BEGIN_TIME, - capture->begin_time); - frame->metadata()->SetTimeTicks(VideoFrameMetadata::CAPTURE_END_TIME, - base::TimeTicks::Now()); - frame->metadata()->SetTimeDelta(VideoFrameMetadata::FRAME_DURATION, - capture->frame_duration); - frame->metadata()->SetTimeTicks(VideoFrameMetadata::REFERENCE_TIME, - reference_time); + frame->metadata()->frame_rate = params_.requested_format.frame_rate; + frame->metadata()->capture_begin_time = capture->begin_time; + frame->metadata()->capture_end_time = base::TimeTicks::Now(); + frame->metadata()->frame_duration = capture->frame_duration; + frame->metadata()->reference_time = reference_time; media::VideoCaptureFormat format(frame->coded_size(), params_.requested_format.frame_rate, diff --git a/chromium/media/capture/content/video_capture_oracle.cc b/chromium/media/capture/content/video_capture_oracle.cc index 2a1e3c12801..e92d28ec940 100644 --- a/chromium/media/capture/content/video_capture_oracle.cc +++ b/chromium/media/capture/content/video_capture_oracle.cc @@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h" |