
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}
143 lines
5.0 KiB
C++
143 lines
5.0 KiB
C++
/*
|
|
* Copyright (c) 2010 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_FAKE_WEBRTC_VIDEO_ENGINE_H_
|
|
#define MEDIA_ENGINE_FAKE_WEBRTC_VIDEO_ENGINE_H_
|
|
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/fec_controller_override.h"
|
|
#include "api/video/encoded_image.h"
|
|
#include "api/video/video_bitrate_allocation.h"
|
|
#include "api/video/video_frame.h"
|
|
#include "api/video_codecs/sdp_video_format.h"
|
|
#include "api/video_codecs/video_codec.h"
|
|
#include "api/video_codecs/video_decoder.h"
|
|
#include "api/video_codecs/video_decoder_factory.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "api/video_codecs/video_encoder_factory.h"
|
|
#include "modules/video_coding/include/video_codec_interface.h"
|
|
#include "rtc_base/critical_section.h"
|
|
#include "rtc_base/event.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
|
|
namespace cricket {
|
|
|
|
class FakeWebRtcVideoDecoderFactory;
|
|
class FakeWebRtcVideoEncoderFactory;
|
|
|
|
// Fake class for mocking out webrtc::VideoDecoder
|
|
class FakeWebRtcVideoDecoder : public webrtc::VideoDecoder {
|
|
public:
|
|
explicit FakeWebRtcVideoDecoder(FakeWebRtcVideoDecoderFactory* factory);
|
|
~FakeWebRtcVideoDecoder();
|
|
|
|
int32_t InitDecode(const webrtc::VideoCodec*, int32_t) override;
|
|
int32_t Decode(const webrtc::EncodedImage&, bool, int64_t) override;
|
|
int32_t RegisterDecodeCompleteCallback(
|
|
webrtc::DecodedImageCallback*) override;
|
|
int32_t Release() override;
|
|
|
|
int GetNumFramesReceived() const;
|
|
|
|
private:
|
|
int num_frames_received_;
|
|
FakeWebRtcVideoDecoderFactory* factory_;
|
|
};
|
|
|
|
// Fake class for mocking out webrtc::VideoDecoderFactory.
|
|
class FakeWebRtcVideoDecoderFactory : public webrtc::VideoDecoderFactory {
|
|
public:
|
|
FakeWebRtcVideoDecoderFactory();
|
|
|
|
std::vector<webrtc::SdpVideoFormat> GetSupportedFormats() const override;
|
|
std::unique_ptr<webrtc::VideoDecoder> CreateVideoDecoder(
|
|
const webrtc::SdpVideoFormat& format) override;
|
|
|
|
void DecoderDestroyed(FakeWebRtcVideoDecoder* decoder);
|
|
void AddSupportedVideoCodecType(const webrtc::SdpVideoFormat& format);
|
|
int GetNumCreatedDecoders();
|
|
const std::vector<FakeWebRtcVideoDecoder*>& decoders();
|
|
|
|
private:
|
|
std::vector<webrtc::SdpVideoFormat> supported_codec_formats_;
|
|
std::vector<FakeWebRtcVideoDecoder*> decoders_;
|
|
int num_created_decoders_;
|
|
};
|
|
|
|
// Fake class for mocking out webrtc::VideoEnoder
|
|
class FakeWebRtcVideoEncoder : public webrtc::VideoEncoder {
|
|
public:
|
|
explicit FakeWebRtcVideoEncoder(FakeWebRtcVideoEncoderFactory* factory);
|
|
~FakeWebRtcVideoEncoder();
|
|
|
|
void SetFecControllerOverride(
|
|
webrtc::FecControllerOverride* fec_controller_override) override;
|
|
int32_t InitEncode(const webrtc::VideoCodec* codecSettings,
|
|
const VideoEncoder::Settings& settings) override;
|
|
int32_t Encode(
|
|
const webrtc::VideoFrame& inputImage,
|
|
const std::vector<webrtc::VideoFrameType>* frame_types) override;
|
|
int32_t RegisterEncodeCompleteCallback(
|
|
webrtc::EncodedImageCallback* callback) override;
|
|
int32_t Release() override;
|
|
void SetRates(const RateControlParameters& parameters) override;
|
|
webrtc::VideoEncoder::EncoderInfo GetEncoderInfo() const override;
|
|
|
|
bool WaitForInitEncode();
|
|
webrtc::VideoCodec GetCodecSettings();
|
|
int GetNumEncodedFrames();
|
|
|
|
private:
|
|
rtc::CriticalSection crit_;
|
|
rtc::Event init_encode_event_;
|
|
int num_frames_encoded_ RTC_GUARDED_BY(crit_);
|
|
webrtc::VideoCodec codec_settings_ RTC_GUARDED_BY(crit_);
|
|
FakeWebRtcVideoEncoderFactory* factory_;
|
|
};
|
|
|
|
// Fake class for mocking out webrtc::VideoEncoderFactory.
|
|
class FakeWebRtcVideoEncoderFactory : public webrtc::VideoEncoderFactory {
|
|
public:
|
|
FakeWebRtcVideoEncoderFactory();
|
|
|
|
std::vector<webrtc::SdpVideoFormat> GetSupportedFormats() const override;
|
|
std::unique_ptr<webrtc::VideoEncoder> CreateVideoEncoder(
|
|
const webrtc::SdpVideoFormat& format) override;
|
|
CodecInfo QueryVideoEncoder(
|
|
const webrtc::SdpVideoFormat& format) const override;
|
|
|
|
bool WaitForCreatedVideoEncoders(int num_encoders);
|
|
void EncoderDestroyed(FakeWebRtcVideoEncoder* encoder);
|
|
void set_encoders_have_internal_sources(bool internal_source);
|
|
void AddSupportedVideoCodec(const webrtc::SdpVideoFormat& format);
|
|
void AddSupportedVideoCodecType(const std::string& name);
|
|
int GetNumCreatedEncoders();
|
|
const std::vector<FakeWebRtcVideoEncoder*> encoders();
|
|
|
|
private:
|
|
rtc::CriticalSection crit_;
|
|
rtc::Event created_video_encoder_event_;
|
|
std::vector<webrtc::SdpVideoFormat> formats_;
|
|
std::vector<FakeWebRtcVideoEncoder*> encoders_ RTC_GUARDED_BY(crit_);
|
|
int num_created_encoders_ RTC_GUARDED_BY(crit_);
|
|
bool encoders_have_internal_sources_;
|
|
bool vp8_factory_mode_;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // MEDIA_ENGINE_FAKE_WEBRTC_VIDEO_ENGINE_H_
|