mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 06:40:43 +01:00
133bf2bd28
This reverts commite57b266a20. Reason for revert: Fixed negotiation of send-only clients. Original change's description: > Revert "Distinguish between send and receive codecs" > > This reverts commitc0f25cf762. > > 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}
60 lines
2 KiB
C++
60 lines
2 KiB
C++
/*
|
|
* Copyright (c) 2018 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 API_TEST_VIDEO_FUNCTION_VIDEO_DECODER_FACTORY_H_
|
|
#define API_TEST_VIDEO_FUNCTION_VIDEO_DECODER_FACTORY_H_
|
|
|
|
#include <functional>
|
|
#include <memory>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "api/video_codecs/sdp_video_format.h"
|
|
#include "api/video_codecs/video_decoder_factory.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
// A decoder factory producing decoders by calling a supplied create function.
|
|
class FunctionVideoDecoderFactory final : public VideoDecoderFactory {
|
|
public:
|
|
explicit FunctionVideoDecoderFactory(
|
|
std::function<std::unique_ptr<VideoDecoder>()> create)
|
|
: create_([create](const SdpVideoFormat&) { return create(); }) {}
|
|
explicit FunctionVideoDecoderFactory(
|
|
std::function<std::unique_ptr<VideoDecoder>(const SdpVideoFormat&)>
|
|
create)
|
|
: create_(std::move(create)) {}
|
|
FunctionVideoDecoderFactory(
|
|
std::function<std::unique_ptr<VideoDecoder>()> create,
|
|
std::vector<SdpVideoFormat> sdp_video_formats)
|
|
: create_([create](const SdpVideoFormat&) { return create(); }),
|
|
sdp_video_formats_(sdp_video_formats) {}
|
|
|
|
std::vector<SdpVideoFormat> GetSupportedFormats() const override {
|
|
return sdp_video_formats_;
|
|
}
|
|
|
|
std::unique_ptr<VideoDecoder> CreateVideoDecoder(
|
|
const SdpVideoFormat& format) override {
|
|
return create_(format);
|
|
}
|
|
|
|
private:
|
|
const std::function<std::unique_ptr<VideoDecoder>(const SdpVideoFormat&)>
|
|
create_;
|
|
const std::vector<SdpVideoFormat> sdp_video_formats_;
|
|
};
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // API_TEST_VIDEO_FUNCTION_VIDEO_DECODER_FACTORY_H_
|