webrtc_m130/media/engine/null_webrtc_video_engine.h
Johannes Kron 8e8b36a94a Revert "Reland "Reland "Reland "Distinguish between send and receive codecs""""
This reverts commit 184ea66aed43161f05d80fbb74183a2efccca352.

Reason for revert: Breaks downstream projects.

TBR=steveanton@webrtc.org

Original change's description:
> Reland "Reland "Reland "Distinguish between send and receive codecs"""
>
> This reverts commit a104ceb0ceec0f95e199e6d6704f41ec88a51fc5.
>
> Reason for revert: Keep logic as is.
>
> Original change's description:
> > Revert "Reland "Reland "Distinguish between send and receive codecs"""
> >
> > This reverts commit 9bac68c0cc4444b852416396f0e0f31ea66a9cfe.
> >
> > Reason for revert: Breaks perf test on iOS.
> >
> > Original change's description:
> > > Reland "Reland "Distinguish between send and receive codecs""
> > >
> > > This reverts commit 00a30873c415d717af8dcdf21c2df7fd4b6d1ed2.
> > >
> > > Reason for revert: Flaky test in Chromium fixed.
> > >
> > > Original change's description:
> > > > Revert "Reland "Distinguish between send and receive codecs""
> > > >
> > > > This reverts commit 133bf2bd28596aab5c7684e0ea3da99b1fece77f.
> > > >
> > > > Reason for revert: Breaks Chromium import due to flaky test in Chromium.
> > > >
> > > > Original change's description:
> > > > > Reland "Distinguish between send and receive codecs"
> > > > >
> > > > > This reverts commit e57b266a20334e47f105a0bd777190ec8c6562e8.
> > > > >
> > > > > Reason for revert: Fixed negotiation of send-only clients.
> > > > >
> > > > > Original change's description:
> > > > > > Revert "Distinguish between send and receive codecs"
> > > > > >
> > > > > > This reverts commit c0f25cf762a6946666c812f7a3df3f0a7f98b38d.
> > > > > >
> > > > > > Reason for revert: breaks negotiation with send-only clients
> > > > > >
> > > > > > (webrtc_video_engine.cc:985): SetRecvParameters called with unsupported video codec: VideoCodec[96:H264]
> > > > > > (peer_connection.cc:6043): Failed to set local video description recv parameters. (INVALID_PARAMETER)
> > > > > > (peer_connection.cc:2591): Failed to set local offer sdp: Failed to set local video description recv parameters.
> > > > > >
> > > > > > Original change's description:
> > > > > > > Distinguish between send and receive codecs
> > > > > > >
> > > > > > > Even though send and receive codecs may be the same, they might have
> > > > > > > different support in HW. Distinguish between send and receive codecs
> > > > > > > to be able to keep track of which codecs have HW support.
> > > > > > >
> > > > > > > Bug: chromium:1029737
> > > > > > > Change-Id: Id119560becadfe0aaf861c892a6485f1c2eb378d
> > > > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165763
> > > > > > > Commit-Queue: Johannes Kron <kron@webrtc.org>
> > > > > > > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > > > > > > Cr-Commit-Position: refs/heads/master@{#30284}
> > > > > >
> > > > > > TBR=steveanton@webrtc.org,kron@webrtc.org
> > > > > >
> > > > > > Change-Id: Iacb7059436b2313b52577b65f164ee363c4816aa
> > > > > > No-Presubmit: true
> > > > > > No-Tree-Checks: true
> > > > > > No-Try: true
> > > > > > Bug: chromium:1029737
> > > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166420
> > > > > > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > > > > > Commit-Queue: Steve Anton <steveanton@webrtc.org>
> > > > > > Cr-Commit-Position: refs/heads/master@{#30292}
> > > > >
> > > > > TBR=steveanton@webrtc.org,kron@webrtc.org
> > > > >
> > > > >
> > > > > Bug: chromium:1029737
> > > > > Change-Id: I287efcfdcd1c9a3f2c410aeec8fe26a84204d1fd
> > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166604
> > > > > Reviewed-by: Johannes Kron <kron@webrtc.org>
> > > > > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > > > > Commit-Queue: Johannes Kron <kron@webrtc.org>
> > > > > Cr-Commit-Position: refs/heads/master@{#30348}
> > > >
> > > > TBR=steveanton@webrtc.org,kron@webrtc.org
> > > >
> > > > Change-Id: I9f8731309749e07ce7e651e1550ecfabddb1735f
> > > > No-Presubmit: true
> > > > No-Tree-Checks: true
> > > > No-Try: true
> > > > Bug: chromium:1029737
> > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167205
> > > > Reviewed-by: Johannes Kron <kron@webrtc.org>
> > > > Commit-Queue: Johannes Kron <kron@webrtc.org>
> > > > Cr-Commit-Position: refs/heads/master@{#30360}
> > >
> > > TBR=steveanton@webrtc.org,kron@webrtc.org
> > >
> > > Change-Id: I1cc2d83bd884f10685503a9c31288f96c935d6a3
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Bug: chromium:1029737
> > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167206
> > > Reviewed-by: Johannes Kron <kron@webrtc.org>
> > > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > > Commit-Queue: Johannes Kron <kron@webrtc.org>
> > > Cr-Commit-Position: refs/heads/master@{#30367}
> >
> > TBR=steveanton@webrtc.org,kron@webrtc.org
> >
> > Change-Id: I0a9b0b58922ce7c558b3d31b64cc12086b2a6a55
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: chromium:1029737
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167364
> > Commit-Queue: Johannes Kron <kron@webrtc.org>
> > Reviewed-by: Johannes Kron <kron@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#30373}
>
> TBR=steveanton@webrtc.org,kron@webrtc.org
>
>
> Bug: chromium:1029737
> Change-Id: Id381cb6d8e03b0fca941e392978362af6fdab0b6
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167531
> Reviewed-by: Johannes Kron <kron@webrtc.org>
> Reviewed-by: Steve Anton <steveanton@webrtc.org>
> Commit-Queue: Johannes Kron <kron@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#30415}

TBR=steveanton@webrtc.org,kron@webrtc.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: chromium:1029737
Change-Id: Ice25339e7dfb9fc75049bd207d097b0910bd4446
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168341
Commit-Queue: Johannes Kron <kron@webrtc.org>
Reviewed-by: Johannes Kron <kron@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30484}
2020-02-07 15:11:08 +00:00

53 lines
1.4 KiB
C++

/*
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
*
* 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.
*/
#ifndef MEDIA_ENGINE_NULL_WEBRTC_VIDEO_ENGINE_H_
#define MEDIA_ENGINE_NULL_WEBRTC_VIDEO_ENGINE_H_
#include <vector>
#include "media/base/media_channel.h"
#include "media/base/media_engine.h"
namespace webrtc {
class Call;
} // namespace webrtc
namespace cricket {
class VideoMediaChannel;
// Video engine implementation that does nothing and can be used in
// CompositeMediaEngine.
class NullWebRtcVideoEngine : public VideoEngineInterface {
public:
std::vector<VideoCodec> codecs() const override {
return std::vector<VideoCodec>();
}
RtpCapabilities GetCapabilities() const override { return RtpCapabilities(); }
VideoMediaChannel* CreateMediaChannel(
webrtc::Call* call,
const MediaConfig& config,
const VideoOptions& options,
const webrtc::CryptoOptions& crypto_options,
webrtc::VideoBitrateAllocatorFactory* video_bitrate_allocator_factory)
override {
return nullptr;
}
};
} // namespace cricket
#endif // MEDIA_ENGINE_NULL_WEBRTC_VIDEO_ENGINE_H_