c5a4c938bb
This is a reland of commit 8ad4924936dea2bd97990b0a951df93f7526f0ff See diff between latest Patch Set and PS1. Fixes include: - VideoStreamEncoder's call to bitrate_adjuster_->OnEncodedFrame() is updated to take stream index (spatial or simulcast index) instead of only looking at SpatialIndex(). - Migrate test-only helpers to use Spatial/SimulcastIndex correctly. The fixes are to migrate some test-only helpers that we had forgot to fix that are used by external tests. Original change's description: > Make SimulcastIndex() and SpatialIndex() distinct (remove fallback). > > This CL removes the fallback logic to return the other index when the > one requested has not been set. This means we can remove the codec gates > that was previously needed because SpatialIndex() had multiple meanings, > resolving the TODOs previously added in > https://webrtc-review.googlesource.com/c/src/+/293343. > > We have already migrated all known external dependencies from > SpatialIndex() to SimulcastIndex() where necessary, unblocking this CL. > > PSA: https://groups.google.com/g/discuss-webrtc/c/SDAVg6xJ3gY > > Bug: webrtc:14884 > Change-Id: I82787505ab10be151e5f64965b270c45465d63a9 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/293740 > Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Commit-Queue: Henrik Boström <hbos@webrtc.org> > Reviewed-by: Philip Eliasson <philipel@webrtc.org> > Reviewed-by: Evan Shrubsole <eshr@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#39343} Bug: webrtc:14884 Change-Id: Ib966924efca1a040dae881599f0789a7f2ab24a2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/294284 Reviewed-by: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/main@{#39358}
How to write code in the api/ directory
Mostly, just follow the regular style guide, but:
- Note that
api/code is not exempt from the “.hand.ccfiles come in pairs” rule, so if you declare something inapi/path/to/foo.h, it should be defined inapi/path/to/foo.cc. - Headers in
api/should, if possible, not#includeheaders outsideapi/. It’s not always possible to avoid this, but be aware that it adds to a small mountain of technical debt that we’re trying to shrink. .ccfiles inapi/, on the other hand, are free to#includeheaders outsideapi/.
That is, the preferred way for api/ code to access non-api/ code is to call
it from a .cc file, so that users of our API headers won’t transitively
#include non-public headers.
For headers in api/ that need to refer to non-public types, forward
declarations are often a lesser evil than including non-public header files. The
usual rules still apply, though.
.cc files in api/ should preferably be kept reasonably small. If a
substantial implementation is needed, consider putting it with our non-public
code, and just call it from the api/ .cc file.