diff options
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" |