This CL is a forward fix of https://webrtc-review.googlesource.com/c/src/+/83729. That CL implemented QueryVideoEncoder() using |supported_formats_| instead of |supported_formats_with_h264_hp_|, which means |is_hardware_accelerated| will incorrectly be set to false for H264 High Profile. This CL fixes that. Actually, after removing H264 CHP field trial code in https://webrtc-review.googlesource.com/c/src/+/73242, there is no need for separate |supported_formats_| and |supported_formats_with_h264_hp_| so this CL merges them again. TBR=andersc@webrtc.org Bug: webrtc:7925 Change-Id: I35a8ef2f76368fe43f984b13f28c6c83a28e98fd Reviewed-on: https://webrtc-review.googlesource.com/87940 Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23912}