Rename adaptation api methods, extended vie_encoder unit test.

Rename adaptation api methods, extended vie_encoder unit test.

Use AdaptDown/AdaptUp instead of ScaleDown/ScaleUp, since we may want to
adapt using other means than resolution.

Also, extend vie_encoder with unit test that actually uses frames scaled
to resolution as determined by VideoAdapter, since that seems to be the
default implementation.

BUG=webrtc:4172
Review-Url: https://codereview.webrtc.org/2652893015
Cr-Commit-Position: refs/heads/master@{#16402}
Committed: https://chromium.googlesource.com/external/webrtc/+/b1ca073db43f8fdcb715d5642d5aa7da7582eb0d

[sprang_webrtc, 2017-01-27 13:50:29]

The CQ bit was checked by sprang@webrtc.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-27 13:50:44]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-27 13:55:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-27 13:55:31]

Dry run: Try jobs failed on following builders:
  presubmit on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/12772)

[sprang_webrtc, 2017-01-27 14:11:01]

Description was changed from

==========
Rename adaption api methods, extended vie_encoder unit test.

Use AdaptDown/AdaptUp instead of ScaleDown/ScaleUp, since we may want to
adapt using other means than resolution.

Also, extend vie_encoder with unit test that actually uses frames scaled
to resolution as determined by VideoAdapter, since that seems to be the
default implementation.

BUG=
==========

to

==========
Rename adaptation api methods, extended vie_encoder unit test.

Use AdaptDown/AdaptUp instead of ScaleDown/ScaleUp, since we may want to
adapt using other means than resolution.

Also, extend vie_encoder with unit test that actually uses frames scaled
to resolution as determined by VideoAdapter, since that seems to be the
default implementation.

BUG=
==========

[sprang_webrtc, 2017-01-27 14:13:14]

Description was changed from

==========
Rename adaptation api methods, extended vie_encoder unit test.

Use AdaptDown/AdaptUp instead of ScaleDown/ScaleUp, since we may want to
adapt using other means than resolution.

Also, extend vie_encoder with unit test that actually uses frames scaled
to resolution as determined by VideoAdapter, since that seems to be the
default implementation.

BUG=
==========

to

==========
Rename adaptation api methods, extended vie_encoder unit test.

Use AdaptDown/AdaptUp instead of ScaleDown/ScaleUp, since we may want to
adapt using other means than resolution.

Also, extend vie_encoder with unit test that actually uses frames scaled
to resolution as determined by VideoAdapter, since that seems to be the
default implementation.

BUG=webrtc:4172
==========

[sprang_webrtc, 2017-01-27 14:18:51]

sprang@webrtc.org changed reviewers:
+ nisse@webrtc.org

[sprang_webrtc, 2017-01-27 14:18:52]

This CL is in preparation of a cpu adaptation mode for the main-resolution
setting. I just renames some methods and adds an extra unit test to vie_encoder.


ptal

[nisse-webrtc, 2017-01-30 09:16:45]

LGTM. Do the suggested additional renames if you think they make sense.

And you need additional reviewer(s), I don't own any of this.

https://codereview.webrtc.org/2652893015/diff/1/webrtc/modules/video_coding/u...
File webrtc/modules/video_coding/utility/quality_scaler.cc (right):

https://codereview.webrtc.org/2652893015/diff/1/webrtc/modules/video_coding/u...
webrtc/modules/video_coding/utility/quality_scaler.cc:42: const
AdaptationObserverInterface::AdaptReason scale_reason_ =
Would it make sense to rename member too, scale_reason_ --> adapt_reason_ ?

https://codereview.webrtc.org/2652893015/diff/1/webrtc/modules/video_coding/u...
File webrtc/modules/video_coding/utility/quality_scaler_unittest.cc (right):

https://codereview.webrtc.org/2652893015/diff/1/webrtc/modules/video_coding/u...
webrtc/modules/video_coding/utility/quality_scaler_unittest.cc:29: class
MockScaleObserver : public AdaptationObserverInterface {
Could rename scale --> adapt everywhere in this class too, for consistency? If
that makes sense, I don't know if this is perhaps intended for scaling only.

https://codereview.webrtc.org/2652893015/diff/1/webrtc/video/overuse_frame_de...
File webrtc/video/overuse_frame_detector_unittest.cc (right):

https://codereview.webrtc.org/2652893015/diff/1/webrtc/video/overuse_frame_de...
webrtc/video/overuse_frame_detector_unittest.cc:39: MOCK_METHOD1(AdaptDown,
void(AdaptReason));
Hmm. Could this be unified with the MockScaleObserver from
quality_scaler_unittest.cc? Or are they different?

[sprang_webrtc, 2017-01-30 09:55:05]

sprang@webrtc.org changed reviewers:
+ stefan@webrtc.org

[sprang_webrtc, 2017-01-30 09:55:06]

+stefan, need an owner for webrtc/test

https://codereview.webrtc.org/2652893015/diff/1/webrtc/modules/video_coding/u...
File webrtc/modules/video_coding/utility/quality_scaler.cc (right):

https://codereview.webrtc.org/2652893015/diff/1/webrtc/modules/video_coding/u...
webrtc/modules/video_coding/utility/quality_scaler.cc:42: const
AdaptationObserverInterface::AdaptReason scale_reason_ =
On 2017/01/30 09:16:45, nisse-webrtc wrote:
> Would it make sense to rename member too, scale_reason_ --> adapt_reason_ ?

This one was actually just used as an alias in two methods below. It's not a
member of anything as suggested by that name. I removed it instead since I don't
think it actually helps.

https://codereview.webrtc.org/2652893015/diff/1/webrtc/modules/video_coding/u...
File webrtc/modules/video_coding/utility/quality_scaler_unittest.cc (right):

https://codereview.webrtc.org/2652893015/diff/1/webrtc/modules/video_coding/u...
webrtc/modules/video_coding/utility/quality_scaler_unittest.cc:29: class
MockScaleObserver : public AdaptationObserverInterface {
On 2017/01/30 09:16:45, nisse-webrtc wrote:
> Could rename scale --> adapt everywhere in this class too, for consistency? If
> that makes sense, I don't know if this is perhaps intended for scaling only.

As related to the interface I think it makes sense to rename. I won't purge all
usage of the word scale here though. I haven't decided yet if we want to apply
this signal to eg a screenshare scenario.

https://codereview.webrtc.org/2652893015/diff/1/webrtc/video/overuse_frame_de...
File webrtc/video/overuse_frame_detector_unittest.cc (right):

https://codereview.webrtc.org/2652893015/diff/1/webrtc/video/overuse_frame_de...
webrtc/video/overuse_frame_detector_unittest.cc:39: MOCK_METHOD1(AdaptDown,
void(AdaptReason));
On 2017/01/30 09:16:45, nisse-webrtc wrote:
> Hmm. Could this be unified with the MockScaleObserver from
> quality_scaler_unittest.cc? Or are they different?

They are a bit different, mostly due to the one in quality scaler doing things
asynchronously using a task queue. Since this is a very small helper class I
suggest keeping it as is.

[nisse-webrtc, 2017-01-30 10:07:13]

https://codereview.webrtc.org/2652893015/diff/1/webrtc/modules/video_coding/u...
File webrtc/modules/video_coding/utility/quality_scaler.cc (right):

https://codereview.webrtc.org/2652893015/diff/1/webrtc/modules/video_coding/u...
webrtc/modules/video_coding/utility/quality_scaler.cc:42: const
AdaptationObserverInterface::AdaptReason scale_reason_ =
On 2017/01/30 09:55:05, språng wrote:
> On 2017/01/30 09:16:45, nisse-webrtc wrote:
> > Would it make sense to rename member too, scale_reason_ --> adapt_reason_ ?
> 
> This one was actually just used as an alias in two methods below. It's not a
> member of anything as suggested by that name. I removed it instead since I
don't
> think it actually helps.

Nice.

https://codereview.webrtc.org/2652893015/diff/1/webrtc/video/overuse_frame_de...
File webrtc/video/overuse_frame_detector_unittest.cc (right):

https://codereview.webrtc.org/2652893015/diff/1/webrtc/video/overuse_frame_de...
webrtc/video/overuse_frame_detector_unittest.cc:39: MOCK_METHOD1(AdaptDown,
void(AdaptReason));
On 2017/01/30 09:55:06, språng wrote:
> On 2017/01/30 09:16:45, nisse-webrtc wrote:
> > Hmm. Could this be unified with the MockScaleObserver from
> > quality_scaler_unittest.cc? Or are they different?
> 
> They are a bit different, mostly due to the one in quality scaler doing things
> asynchronously using a task queue. Since this is a very small helper class I
> suggest keeping it as is.

Acknowledged.

[sprang_webrtc, 2017-01-31 11:28:15]

ping stefan

[sprang_webrtc, 2017-01-31 11:28:15]

ping stefan

[stefan-webrtc, 2017-01-31 18:04:17]

LGTM for webrtc/test

[sprang_webrtc, 2017-02-01 10:14:36]

The CQ bit was checked by sprang@webrtc.org

[sprang_webrtc, 2017-02-01 10:14:37]

The patchset sent to the CQ was uploaded after l-g-t-m from nisse@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2652893015/#ps20001 (title:
"Cleanup")

[commit-bot: I haz the power, 2017-02-01 10:14:49]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-02-01 10:18:18]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-01 10:18:19]

Try jobs failed on following builders:
  presubmit on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/12892)

[sprang_webrtc, 2017-02-01 11:13:48]

The CQ bit was checked by sprang@webrtc.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-01 11:14:01]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-02-01 11:15:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-01 11:15:30]

Dry run: Try jobs failed on following builders:
  ios64_sim_ios9_dbg on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/ios64_sim_ios9_dbg/buil...)
  ios_arm64_dbg on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/ios_arm64_dbg/builds/17008)
  ios_dbg on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/ios_dbg/builds/22270)
  ios_rel on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/ios_rel/builds/21009)

[sprang_webrtc, 2017-02-01 15:57:09]

The CQ bit was checked by sprang@webrtc.org

[sprang_webrtc, 2017-02-01 15:57:10]

The patchset sent to the CQ was uploaded after l-g-t-m from nisse@webrtc.org,
stefan@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2652893015/#ps60001 (title:
"Rebase, again")

[commit-bot: I haz the power, 2017-02-01 15:57:16]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-02-01 16:38:12]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1485964629657820,
"parent_rev": "d83b9670a67c1445a81a3cf20984185c99faa3dc", "commit_rev":
"b1ca073db43f8fdcb715d5642d5aa7da7582eb0d"}

[commit-bot: I haz the power, 2017-02-01 16:38:15]

Description was changed from

==========
Rename adaptation api methods, extended vie_encoder unit test.

Use AdaptDown/AdaptUp instead of ScaleDown/ScaleUp, since we may want to
adapt using other means than resolution.

Also, extend vie_encoder with unit test that actually uses frames scaled
to resolution as determined by VideoAdapter, since that seems to be the
default implementation.

BUG=webrtc:4172
==========

to

==========
Rename adaptation api methods, extended vie_encoder unit test.

Use AdaptDown/AdaptUp instead of ScaleDown/ScaleUp, since we may want to
adapt using other means than resolution.

Also, extend vie_encoder with unit test that actually uses frames scaled
to resolution as determined by VideoAdapter, since that seems to be the
default implementation.

BUG=webrtc:4172

Review-Url: https://codereview.webrtc.org/2652893015
Cr-Commit-Position: refs/heads/master@{#16402}
Committed:
https://chromium.googlesource.com/external/webrtc/+/b1ca073db43f8fdcb715d5642...
==========

[commit-bot: I haz the power, 2017-02-01 16:38:16]

Committed patchset #4 (id:60001) as
https://chromium.googlesource.com/external/webrtc/+/b1ca073db43f8fdcb715d5642...