2015-01-20 21:36:13 +00:00
|
|
|
/*
|
2016-02-07 20:46:45 -08:00
|
|
|
* Copyright (c) 2010 The WebRTC project authors. All Rights Reserved.
|
2015-01-20 21:36:13 +00:00
|
|
|
*
|
2016-02-07 20:46:45 -08:00
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
2015-01-20 21:36:13 +00:00
|
|
|
*/
|
2013-07-10 00:45:36 +00:00
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#ifndef MEDIA_BASE_VIDEOADAPTER_H_
|
|
|
|
|
#define MEDIA_BASE_VIDEOADAPTER_H_
|
2013-07-10 00:45:36 +00:00
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "api/optional.h"
|
|
|
|
|
#include "media/base/videocommon.h"
|
|
|
|
|
#include "rtc_base/constructormagic.h"
|
|
|
|
|
#include "rtc_base/criticalsection.h"
|
2013-07-10 00:45:36 +00:00
|
|
|
|
|
|
|
|
namespace cricket {
|
|
|
|
|
|
|
|
|
|
// VideoAdapter adapts an input video frame to an output frame based on the
|
|
|
|
|
// specified input and output formats. The adaptation includes dropping frames
|
2016-04-05 15:23:49 +02:00
|
|
|
// to reduce frame rate and scaling frames.
|
|
|
|
|
// VideoAdapter is thread safe.
|
2013-07-10 00:45:36 +00:00
|
|
|
class VideoAdapter {
|
|
|
|
|
public:
|
|
|
|
|
VideoAdapter();
|
Reland of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #1 id:1 of https://codereview.webrtc.org/2783183003/ )
Reason for revert:
Seem to be a flaky test rather than an issue with this cl. Creating reland, will add code to reduce flakiness to that test.
Original issue's description:
> Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #8 id:410001 of https://codereview.webrtc.org/2781433002/ )
>
> Reason for revert:
> This has resulted in failure of CallPerfTest.ReceivesCpuOveruseAndUnderuse test on the Win7 build bot https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1780
>
> Original issue's description:
> > Reland of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #1 id:1 of https://codereview.webrtc.org/2764133002/ )
> >
> > Reason for revert:
> > Found issue with test case, will add fix to reland cl.
> >
> > Original issue's description:
> > > Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #14 id:250001 of https://codereview.webrtc.org/2716643002/ )
> > >
> > > Reason for revert:
> > > Breaks perf tests:
> > > https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1679
> > > https://build.chromium.org/p/client.webrtc.perf/builders/Android32%20Tests%20%28L%20Nexus5%29/builds/2325
> > >
> > > Original issue's description:
> > > > Add framerate to VideoSinkWants and ability to signal on overuse
> > > >
> > > > In ViEEncoder, try to reduce framerate instead of resolution if the
> > > > current degradation preference is maintain-resolution rather than
> > > > balanced.
> > > >
> > > > BUG=webrtc:4172
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2716643002
> > > > Cr-Commit-Position: refs/heads/master@{#17327}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/72acf2526177bb4dbb5103cd6e165eb4361a5ae6
> > >
> > > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,sprang@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4172
> > >
> > > Review-Url: https://codereview.webrtc.org/2764133002
> > > Cr-Commit-Position: refs/heads/master@{#17331}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/8b45b11144c968b4173215c76f78c710c9a2ed0b
> >
> > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,skvlad@webrtc.org
> > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > BUG=webrtc:4172
> >
> > Review-Url: https://codereview.webrtc.org/2781433002
> > Cr-Commit-Position: refs/heads/master@{#17474}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/3ea3c77e93121b1ab9d5e46641e6764f2cca0d51
>
> TBR=ilnik@webrtc.org,stefan@webrtc.org,asapersson@webrtc.org,sprang@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4172
>
> Review-Url: https://codereview.webrtc.org/2783183003
> Cr-Commit-Position: refs/heads/master@{#17477}
> Committed: https://chromium.googlesource.com/external/webrtc/+/f9ed235c9b7248694edcb46feb1f29ce7456ab59
R=ilnik@webrtc.org,stefan@webrtc.org
BUG=webrtc:4172
Review-Url: https://codereview.webrtc.org/2789823002
Cr-Commit-Position: refs/heads/master@{#17498}
2017-04-02 23:53:04 -07:00
|
|
|
// The output frames will have height and width that is divisible by
|
|
|
|
|
// |required_resolution_alignment|.
|
|
|
|
|
explicit VideoAdapter(int required_resolution_alignment);
|
2013-07-10 00:45:36 +00:00
|
|
|
virtual ~VideoAdapter();
|
|
|
|
|
|
2016-05-25 08:47:01 -07:00
|
|
|
// Return the adapted resolution and cropping parameters given the
|
|
|
|
|
// input resolution. The input frame should first be cropped, then
|
|
|
|
|
// scaled to the final output resolution. Returns true if the frame
|
|
|
|
|
// should be adapted, and false if it should be dropped.
|
|
|
|
|
bool AdaptFrameResolution(int in_width,
|
2016-05-13 10:26:00 -07:00
|
|
|
int in_height,
|
2016-05-19 06:05:40 -07:00
|
|
|
int64_t in_timestamp_ns,
|
2016-05-13 10:26:00 -07:00
|
|
|
int* cropped_width,
|
|
|
|
|
int* cropped_height,
|
|
|
|
|
int* out_width,
|
|
|
|
|
int* out_height);
|
2013-07-10 00:45:36 +00:00
|
|
|
|
2016-04-05 15:23:49 +02:00
|
|
|
// Requests the output frame size and frame interval from
|
2016-05-13 10:26:00 -07:00
|
|
|
// |AdaptFrameResolution| to not be larger than |format|. Also, the input
|
|
|
|
|
// frame size will be cropped to match the requested aspect ratio. The
|
|
|
|
|
// 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.
|
2016-04-05 15:23:49 +02:00
|
|
|
void OnOutputFormatRequest(const VideoFormat& format);
|
2013-08-30 21:24:16 +00:00
|
|
|
|
2017-02-10 07:04:27 -08:00
|
|
|
// Requests the output frame size from |AdaptFrameResolution| to have as close
|
Reland of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #1 id:1 of https://codereview.webrtc.org/2783183003/ )
Reason for revert:
Seem to be a flaky test rather than an issue with this cl. Creating reland, will add code to reduce flakiness to that test.
Original issue's description:
> Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #8 id:410001 of https://codereview.webrtc.org/2781433002/ )
>
> Reason for revert:
> This has resulted in failure of CallPerfTest.ReceivesCpuOveruseAndUnderuse test on the Win7 build bot https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1780
>
> Original issue's description:
> > Reland of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #1 id:1 of https://codereview.webrtc.org/2764133002/ )
> >
> > Reason for revert:
> > Found issue with test case, will add fix to reland cl.
> >
> > Original issue's description:
> > > Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #14 id:250001 of https://codereview.webrtc.org/2716643002/ )
> > >
> > > Reason for revert:
> > > Breaks perf tests:
> > > https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1679
> > > https://build.chromium.org/p/client.webrtc.perf/builders/Android32%20Tests%20%28L%20Nexus5%29/builds/2325
> > >
> > > Original issue's description:
> > > > Add framerate to VideoSinkWants and ability to signal on overuse
> > > >
> > > > In ViEEncoder, try to reduce framerate instead of resolution if the
> > > > current degradation preference is maintain-resolution rather than
> > > > balanced.
> > > >
> > > > BUG=webrtc:4172
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2716643002
> > > > Cr-Commit-Position: refs/heads/master@{#17327}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/72acf2526177bb4dbb5103cd6e165eb4361a5ae6
> > >
> > > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,sprang@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4172
> > >
> > > Review-Url: https://codereview.webrtc.org/2764133002
> > > Cr-Commit-Position: refs/heads/master@{#17331}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/8b45b11144c968b4173215c76f78c710c9a2ed0b
> >
> > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,skvlad@webrtc.org
> > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > BUG=webrtc:4172
> >
> > Review-Url: https://codereview.webrtc.org/2781433002
> > Cr-Commit-Position: refs/heads/master@{#17474}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/3ea3c77e93121b1ab9d5e46641e6764f2cca0d51
>
> TBR=ilnik@webrtc.org,stefan@webrtc.org,asapersson@webrtc.org,sprang@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4172
>
> Review-Url: https://codereview.webrtc.org/2783183003
> Cr-Commit-Position: refs/heads/master@{#17477}
> Committed: https://chromium.googlesource.com/external/webrtc/+/f9ed235c9b7248694edcb46feb1f29ce7456ab59
R=ilnik@webrtc.org,stefan@webrtc.org
BUG=webrtc:4172
Review-Url: https://codereview.webrtc.org/2789823002
Cr-Commit-Position: refs/heads/master@{#17498}
2017-04-02 23:53:04 -07:00
|
|
|
// as possible to |target_pixel_count| pixels (if set) but no more than
|
|
|
|
|
// |max_pixel_count|.
|
|
|
|
|
// |max_framerate_fps| is essentially analogous to |max_pixel_count|, but for
|
|
|
|
|
// framerate rather than resolution.
|
|
|
|
|
// Set |max_pixel_count| and/or |max_framerate_fps| to
|
|
|
|
|
// std::numeric_limit<int>::max() if no upper limit is desired.
|
|
|
|
|
void OnResolutionFramerateRequest(
|
|
|
|
|
const rtc::Optional<int>& target_pixel_count,
|
|
|
|
|
int max_pixel_count,
|
|
|
|
|
int max_framerate_fps);
|
2014-06-24 07:24:49 +00:00
|
|
|
|
2013-07-10 00:45:36 +00:00
|
|
|
private:
|
2016-05-19 06:05:40 -07:00
|
|
|
// Determine if frame should be dropped based on input fps and requested fps.
|
|
|
|
|
bool KeepFrame(int64_t in_timestamp_ns);
|
|
|
|
|
|
2016-04-05 15:23:49 +02:00
|
|
|
int frames_in_; // Number of input frames.
|
|
|
|
|
int frames_out_; // Number of output frames.
|
|
|
|
|
int frames_scaled_; // Number of frames scaled.
|
2013-08-30 21:24:16 +00:00
|
|
|
int adaption_changes_; // Number of changes in scale factor.
|
2016-04-05 15:23:49 +02:00
|
|
|
int previous_width_; // Previous adapter output width.
|
|
|
|
|
int previous_height_; // Previous adapter output height.
|
2016-12-08 08:04:51 -08:00
|
|
|
// Resolution must be divisible by this factor.
|
|
|
|
|
const int required_resolution_alignment_;
|
2016-05-19 06:05:40 -07:00
|
|
|
// The target timestamp for the next frame based on requested format.
|
2017-09-09 04:17:22 -07:00
|
|
|
rtc::Optional<int64_t> next_frame_timestamp_ns_
|
|
|
|
|
RTC_GUARDED_BY(critical_section_);
|
2016-04-05 15:23:49 +02:00
|
|
|
|
|
|
|
|
// Max number of pixels requested via calls to OnOutputFormatRequest,
|
|
|
|
|
// OnResolutionRequest respectively.
|
|
|
|
|
// The adapted output format is the minimum of these.
|
2017-09-09 04:17:22 -07:00
|
|
|
rtc::Optional<VideoFormat> requested_format_
|
|
|
|
|
RTC_GUARDED_BY(critical_section_);
|
|
|
|
|
int resolution_request_target_pixel_count_ RTC_GUARDED_BY(critical_section_);
|
|
|
|
|
int resolution_request_max_pixel_count_ RTC_GUARDED_BY(critical_section_);
|
|
|
|
|
int max_framerate_request_ RTC_GUARDED_BY(critical_section_);
|
2016-04-05 15:23:49 +02:00
|
|
|
|
2013-07-10 00:45:36 +00:00
|
|
|
// The critical section to protect the above variables.
|
2014-07-29 17:36:52 +00:00
|
|
|
rtc::CriticalSection critical_section_;
|
2013-07-10 00:45:36 +00:00
|
|
|
|
2015-09-16 05:37:44 -07:00
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(VideoAdapter);
|
2013-07-10 00:45:36 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
} // namespace cricket
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#endif // MEDIA_BASE_VIDEOADAPTER_H_
|