Reland of Prepare for injectable SW decoders

Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ )

Reason for revert:
Fix bug introduced by keeping the allocated decoders in a map.

Original issue's description:
> Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ )
> 
> Reason for revert:
> Tentative revert since it seems to cause problems in Chrome, MAC.
> 
> https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684
> 
> 
> 
> Original issue's description:
> > Prepare for injectable SW decoders
> > 
> > Pretty much mirrors the work done on the encoding side in CLs:
> > 
> > "Clean up ownership of webrtc::VideoEncoder"
> > https://codereview.webrtc.org/3007643002/
> > 
> > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder"
> > https://codereview.webrtc.org/3007683002/
> > 
> > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs"
> > https://codereview.webrtc.org/3006713002/
> > 
> > BUG=webrtc:7925
> > 
> > Review-Url: https://codereview.webrtc.org/3009973002
> > Cr-Commit-Position: refs/heads/master@{#19641}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454
> 
> TBR=magjed@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7925
> 
> Review-Url: https://codereview.webrtc.org/3010953002
> Cr-Commit-Position: refs/heads/master@{#19647}
> Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6

TBR=magjed@webrtc.org,perkj@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7925
Review-Url: https://codereview.webrtc.org/3005363002
Cr-Commit-Position: refs/heads/master@{#19782}
Committed: https://chromium.googlesource.com/external/webrtc/+/063f0c0d3ac62f9110d54c7fea8aed7722264600

[andersc, 2017-09-11 13:42:10]

Created Reland of Prepare for injectable SW decoders

[andersc, 2017-09-11 14:44:07]

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

[commit-bot: I haz the power, 2017-09-11 14:44:15]

Dry run: CQ is trying da patch.

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

[magjed_webrtc, 2017-09-11 14:46:18]

The CQ bit was unchecked by magjed@webrtc.org

[magjed_webrtc, 2017-09-11 14:59:21]

lgtm if you address comments

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
File webrtc/media/engine/webrtcvideoengine.cc (right):

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
webrtc/media/engine/webrtcvideoengine.cc:80: const VideoCodec& codec,
Actually, can you use webrtc::SdpVideoFormat directly, because that will
simplify my CL :)

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
webrtc/media/engine/webrtcvideoengine.cc:2192: webrtc::SdpVideoFormat
video_format =
Just write:
webrtc::SdpVideoFormat video_format(recv_codec.codec.name,
recv_codec.codec.params);

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
webrtc/media/engine/webrtcvideoengine.cc:2216: allocated_decoders_.insert(
Check that we actually inserted something and didn't have a conflict. You can
write:
const bool did_insert = allocated_decoders_.insert(...).second;
RTC_CHECK(did_insert);

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
File webrtc/media/engine/webrtcvideoengine.h (right):

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
webrtc/media/engine/webrtcvideoengine.h:49: };
Move this to the private section of the WebRtcVideoReceiveStream class and add a
typedef as well:
typedef std::map<webrtc::SdpVideoFormat, std::unique_ptr<webrtc::VideoDecoder>,
SdpVideoFormatCompare> DecoderMap;

[andersc, 2017-09-11 15:29:10]

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
File webrtc/media/engine/webrtcvideoengine.cc (right):

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
webrtc/media/engine/webrtcvideoengine.cc:80: const VideoCodec& codec,
On 2017/09/11 14:59:21, magjed_webrtc wrote:
> Actually, can you use webrtc::SdpVideoFormat directly, because that will
> simplify my CL :)

Ignored after offline discussion

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
webrtc/media/engine/webrtcvideoengine.cc:2192: webrtc::SdpVideoFormat
video_format =
On 2017/09/11 14:59:21, magjed_webrtc wrote:
> Just write:
> webrtc::SdpVideoFormat video_format(recv_codec.codec.name,
> recv_codec.codec.params);

Done.

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
webrtc/media/engine/webrtcvideoengine.cc:2216: allocated_decoders_.insert(
On 2017/09/11 14:59:21, magjed_webrtc wrote:
> Check that we actually inserted something and didn't have a conflict. You can
> write:
> const bool did_insert = allocated_decoders_.insert(...).second;
> RTC_CHECK(did_insert);

Done.

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
File webrtc/media/engine/webrtcvideoengine.h (right):

https://codereview.webrtc.org/3005363002/diff/210001/webrtc/media/engine/webr...
webrtc/media/engine/webrtcvideoengine.h:49: };
On 2017/09/11 14:59:21, magjed_webrtc wrote:
> Move this to the private section of the WebRtcVideoReceiveStream class and add
a
> typedef as well:
> typedef std::map<webrtc::SdpVideoFormat,
std::unique_ptr<webrtc::VideoDecoder>,
> SdpVideoFormatCompare> DecoderMap;

Done.

[perkj_webrtc, 2017-09-11 15:49:24]

Description was changed from

==========
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of
https://codereview.webrtc.org/3010953002/ )

Reason for revert:
Fix bug introduced by keeping the allocated decoders in a map.

Original issue's description:
> Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of
https://codereview.webrtc.org/3009973002/ )
> 
> Reason for revert:
> Tentative revert since it seems to cause problems in Chrome, MAC.
> 
>
https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds...
> 
> 
> 
> Original issue's description:
> > Prepare for injectable SW decoders
> > 
> > Pretty much mirrors the work done on the encoding side in CLs:
> > 
> > "Clean up ownership of webrtc::VideoEncoder"
> > https://codereview.webrtc.org/3007643002/
> > 
> > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder"
> > https://codereview.webrtc.org/3007683002/
> > 
> > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external
video codecs"
> > https://codereview.webrtc.org/3006713002/
> > 
> > BUG=webrtc:7925
> > 
> > Review-Url: https://codereview.webrtc.org/3009973002
> > Cr-Commit-Position: refs/heads/master@{#19641}
> > Committed:
https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc715794584...
> 
> TBR=magjed@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7925
> 
> Review-Url: https://codereview.webrtc.org/3010953002
> Cr-Commit-Position: refs/heads/master@{#19647}
> Committed:
https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc...

TBR=magjed@webrtc.org,perkj@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7925
==========

to

==========
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of
https://codereview.webrtc.org/3010953002/ )

Reason for revert:
Fix bug introduced by keeping the allocated decoders in a map.

Original issue's description:
> Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of
https://codereview.webrtc.org/3009973002/ )
> 
> Reason for revert:
> Tentative revert since it seems to cause problems in Chrome, MAC.
> 
>
https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds...
> 
> 
> 
> Original issue's description:
> > Prepare for injectable SW decoders
> > 
> > Pretty much mirrors the work done on the encoding side in CLs:
> > 
> > "Clean up ownership of webrtc::VideoEncoder"
> > https://codereview.webrtc.org/3007643002/
> > 
> > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder"
> > https://codereview.webrtc.org/3007683002/
> > 
> > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external
video codecs"
> > https://codereview.webrtc.org/3006713002/
> > 
> > BUG=webrtc:7925
> > 
> > Review-Url: https://codereview.webrtc.org/3009973002
> > Cr-Commit-Position: refs/heads/master@{#19641}
> > Committed:
https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc715794584...
> 
> TBR=magjed@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7925
> 
> Review-Url: https://codereview.webrtc.org/3010953002
> Cr-Commit-Position: refs/heads/master@{#19647}
> Committed:
https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc...

TBR=magjed@webrtc.org,perkj@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7925
==========

[perkj_webrtc, 2017-09-11 15:49:24]

perkj@webrtc.org changed reviewers:
+ brandtr@webrtc.org
- perkj@webrtc.org

[perkj_webrtc, 2017-09-11 15:49:38]

perkj@webrtc.org changed reviewers:
+ perkj@webrtc.org

[perkj_webrtc, 2017-09-11 15:49:39]

- perkj
+  brandtr@webrtc.org,

[magjed_webrtc, 2017-09-11 17:18:44]

The CQ bit was checked by magjed@webrtc.org

[magjed_webrtc, 2017-09-11 17:18:44]

The patchset sent to the CQ was uploaded after l-g-t-m from magjed@webrtc.org
Link to the patchset: https://codereview.webrtc.org/3005363002/#ps230001 (title:
"Address comments.")

[commit-bot: I haz the power, 2017-09-11 17:18:59]

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-09-11 18:50:51]

CQ is committing da patch.

Bot data: {"patchset_id": 230001, "attempt_start_ts": 1505150324242730,
"parent_rev": "370c6d5694dcf34005c335ceba2f5d8d9b5959ea", "commit_rev":
"063f0c0d3ac62f9110d54c7fea8aed7722264600"}

[commit-bot: I haz the power, 2017-09-11 18:50:57]

Description was changed from

==========
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of
https://codereview.webrtc.org/3010953002/ )

Reason for revert:
Fix bug introduced by keeping the allocated decoders in a map.

Original issue's description:
> Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of
https://codereview.webrtc.org/3009973002/ )
> 
> Reason for revert:
> Tentative revert since it seems to cause problems in Chrome, MAC.
> 
>
https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds...
> 
> 
> 
> Original issue's description:
> > Prepare for injectable SW decoders
> > 
> > Pretty much mirrors the work done on the encoding side in CLs:
> > 
> > "Clean up ownership of webrtc::VideoEncoder"
> > https://codereview.webrtc.org/3007643002/
> > 
> > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder"
> > https://codereview.webrtc.org/3007683002/
> > 
> > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external
video codecs"
> > https://codereview.webrtc.org/3006713002/
> > 
> > BUG=webrtc:7925
> > 
> > Review-Url: https://codereview.webrtc.org/3009973002
> > Cr-Commit-Position: refs/heads/master@{#19641}
> > Committed:
https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc715794584...
> 
> TBR=magjed@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7925
> 
> Review-Url: https://codereview.webrtc.org/3010953002
> Cr-Commit-Position: refs/heads/master@{#19647}
> Committed:
https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc...

TBR=magjed@webrtc.org,perkj@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7925
==========

to

==========
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of
https://codereview.webrtc.org/3010953002/ )

Reason for revert:
Fix bug introduced by keeping the allocated decoders in a map.

Original issue's description:
> Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of
https://codereview.webrtc.org/3009973002/ )
> 
> Reason for revert:
> Tentative revert since it seems to cause problems in Chrome, MAC.
> 
>
https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds...
> 
> 
> 
> Original issue's description:
> > Prepare for injectable SW decoders
> > 
> > Pretty much mirrors the work done on the encoding side in CLs:
> > 
> > "Clean up ownership of webrtc::VideoEncoder"
> > https://codereview.webrtc.org/3007643002/
> > 
> > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder"
> > https://codereview.webrtc.org/3007683002/
> > 
> > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external
video codecs"
> > https://codereview.webrtc.org/3006713002/
> > 
> > BUG=webrtc:7925
> > 
> > Review-Url: https://codereview.webrtc.org/3009973002
> > Cr-Commit-Position: refs/heads/master@{#19641}
> > Committed:
https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc715794584...
> 
> TBR=magjed@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7925
> 
> Review-Url: https://codereview.webrtc.org/3010953002
> Cr-Commit-Position: refs/heads/master@{#19647}
> Committed:
https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc...

TBR=magjed@webrtc.org,perkj@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7925

Review-Url: https://codereview.webrtc.org/3005363002
Cr-Commit-Position: refs/heads/master@{#19782}
Committed:
https://chromium.googlesource.com/external/webrtc/+/063f0c0d3ac62f9110d54c7fe...
==========

[commit-bot: I haz the power, 2017-09-11 18:50:58]

Committed patchset #3 (id:230001) as
https://chromium.googlesource.com/external/webrtc/+/063f0c0d3ac62f9110d54c7fe...