133bf2bd28
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}
57 lines
1.5 KiB
C++
57 lines
1.5 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> send_codecs() const override {
|
|
return std::vector<VideoCodec>();
|
|
}
|
|
|
|
std::vector<VideoCodec> recv_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_
|