This is a reland of 4e64e605894df287178c5a1b537fbe859b7d420c This CL lands all code except the code that activates the change, see media/engine/webrtc_video_engine.cc Once downstream projects are fixed, there will be a one-line change to activate the change to distinguish between send and receive video codecs. Original change's description: > Reland "Reland "Distinguish between send and receive video codecs"" > > This is a reland of 77eb338ae48acb0cb1437da05d86941bb4063228 > > Original change's description: > > Reland "Distinguish between send and receive video codecs" > > > > This reverts commit f2d6fe62f23f13b974d50baa9ef60426a242af03. > > > > Reason for revert: Downstream test updated. > > > > Original change's description: > > > Revert "Reland "Distinguish between send and receive video codecs"" > > > > > > This reverts commit 26e6afe93f134c844d739384784e78acc07cc145. > > > > > > Reason for revert: Breaks another downstream test. > > > > > > Original change's description: > > > > Reland "Distinguish between send and receive video codecs" > > > > > > > > This reverts commit f22af3cca7cfe517e4126db4b7083475722c3e6d. > > > > > > > > Reason for revert: Downstream tests have been updated. > > > > > > > > Original change's description: > > > > > Revert "Distinguish between send and receive video codecs" > > > > > > > > > > This reverts commit 18314bd8d2cb27fa58e4d304bbc428e3ed1736ba. > > > > > > > > > > Reason for revert: Breaks downstream test. > > > > > > > > > > Original change's description: > > > > > > Distinguish between send and receive video codecs > > > > > > > > > > > > Even though send and receive codecs are 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: I16a80da44c5061ca42f2aabda76e6bf0b879bf7b > > > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161306 > > > > > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > > > > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > > > > > Commit-Queue: Johannes Kron <kron@webrtc.org> > > > > > > Cr-Commit-Position: refs/heads/master@{#30041} > > > > > > > > > > TBR=steveanton@webrtc.org,andersc@webrtc.org,kron@webrtc.org > > > > > > > > > > Change-Id: I7e5807460006db613e9b3b369ec6036b88f164fd > > > > > No-Presubmit: true > > > > > No-Tree-Checks: true > > > > > No-Try: true > > > > > Bug: chromium:1029737 > > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161662 > > > > > Reviewed-by: Johannes Kron <kron@webrtc.org> > > > > > Commit-Queue: Johannes Kron <kron@webrtc.org> > > > > > Cr-Commit-Position: refs/heads/master@{#30042} > > > > > > > > TBR=steveanton@webrtc.org,andersc@webrtc.org,kron@webrtc.org > > > > > > > > # Not skipping CQ checks because original CL landed > 1 day ago. > > > > > > > > Bug: chromium:1029737 > > > > Change-Id: Ia70b11376b43888e2495ef21838c2d2e3c68d735 > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161734 > > > > Reviewed-by: Johannes Kron <kron@webrtc.org> > > > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > > > Commit-Queue: Johannes Kron <kron@webrtc.org> > > > > Cr-Commit-Position: refs/heads/master@{#30078} > > > > > > TBR=steveanton@webrtc.org,andersc@webrtc.org,kron@webrtc.org > > > > > > Change-Id: Ia4971b898c9209a3736a916a1c2c48d392dfdad6 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: chromium:1029737 > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/162140 > > > Reviewed-by: Johannes Kron <kron@webrtc.org> > > > Commit-Queue: Johannes Kron <kron@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#30079} > > > > TBR=steveanton@webrtc.org,andersc@webrtc.org,kron@webrtc.org > > > > # Not skipping CQ checks because original CL landed > 1 day ago. > > > > Bug: chromium:1029737 > > Change-Id: If2c3c5b5e7d86cb852a1f20f02b6ceae62b2e0c8 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/162186 > > Reviewed-by: Johannes Kron <kron@webrtc.org> > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Commit-Queue: Johannes Kron <kron@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#30097} > > Bug: chromium:1029737 > Change-Id: I5912822df8169fbb3097c0f440f7924527fa950b > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/162483 > Reviewed-by: Steve Anton <steveanton@webrtc.org> > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > Commit-Queue: Johannes Kron <kron@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#30120} Bug: chromium:1029737 Change-Id: Id4f1c6f6f0cf7b96fe93dd22d14310d286af31f3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165682 Reviewed-by: Steve Anton <steveanton@webrtc.org> Reviewed-by: Anders Carlsson <andersc@webrtc.org> Commit-Queue: Johannes Kron <kron@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30219}
144 lines
5.1 KiB
C++
144 lines
5.1 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);
|
|
void AddSupportedVideoCodecType(const std::string& name);
|
|
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_
|