diff --git a/media/base/videoadapter.cc b/media/base/videoadapter.cc index 553c2c320b..52619831b4 100644 --- a/media/base/videoadapter.cc +++ b/media/base/videoadapter.cc @@ -255,7 +255,8 @@ bool VideoAdapter::AdaptFrameResolution(int in_width, return true; } -void VideoAdapter::OnOutputFormatRequest(const VideoFormat& format) { +void VideoAdapter::OnOutputFormatRequest( + const rtc::Optional& format) { rtc::CritScope cs(&critical_section_); requested_format_ = format; next_frame_timestamp_ns_ = rtc::nullopt; diff --git a/media/base/videoadapter.h b/media/base/videoadapter.h index 5b3d13841b..abf6069df7 100644 --- a/media/base/videoadapter.h +++ b/media/base/videoadapter.h @@ -48,7 +48,7 @@ class VideoAdapter { // requested aspect ratio is orientation agnostic and will be adjusted to // maintain the input orientation, so it doesn't matter if e.g. 1280x720 or // 720x1280 is requested. - void OnOutputFormatRequest(const VideoFormat& format); + void OnOutputFormatRequest(const rtc::Optional& format); // Requests the output frame size from |AdaptFrameResolution| to have as close // as possible to |target_pixel_count| pixels (if set) but no more than