mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 14:20:45 +01:00
6f440ed5b5
This reverts commit 07efe436c9.
Reason for revert: Breaks downstream project.
cricket::GetSimulcastConfig method signature has been updated.
I think you can get away with a default value for temporal_layers_supported (and then you can remove it after a few days when projects will be updated).
Original change's description:
> Implement H264 simulcast support and generalize SimulcastEncoderAdapter use for H264 & VP8.
>
> * Move SimulcastEncoderAdapter out under modules/video_coding
> * Move SimulcastRateAllocator back out to modules/video_coding/utility
> * Move TemporalLayers and ScreenshareLayers to modules/video_coding/utility
> * Move any VP8 specific code - such as temporal layer bitrate budgeting -
> under codec type dependent conditionals.
> * Plumb the simulcast index for H264 in the codec specific and RTP format data structures.
>
> Bug: webrtc:5840
> Change-Id: Ieced8a00e38f273c1a6cfd0f5431a87d07b8f44e
> Reviewed-on: https://webrtc-review.googlesource.com/64100
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> Reviewed-by: Erik Språng <sprang@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#23705}
TBR=sprang@webrtc.org,stefan@webrtc.org,mflodman@webrtc.org,hta@webrtc.org,sergio.garcia.murillo@gmail.com,titovartem@webrtc.org,agouaillard@gmail.com
Change-Id: Ic9d3b1eeaf195bb5ec2063954421f5e77866d663
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:5840
Reviewed-on: https://webrtc-review.googlesource.com/84760
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23710}
88 lines
3.4 KiB
C++
88 lines
3.4 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 MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_TEST_FIXTURE_IMPL_H_
|
|
#define MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_TEST_FIXTURE_IMPL_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/test/simulcast_test_fixture.h"
|
|
#include "api/video/i420_buffer.h"
|
|
#include "api/video/video_frame.h"
|
|
#include "api/video_codecs/video_decoder_factory.h"
|
|
#include "api/video_codecs/video_encoder_factory.h"
|
|
#include "common_types.h" // NOLINT(build/include)
|
|
#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h"
|
|
#include "modules/video_coding/include/mock/mock_video_codec_interface.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
class SimulcastTestFixtureImpl final : public SimulcastTestFixture {
|
|
public:
|
|
SimulcastTestFixtureImpl(
|
|
std::unique_ptr<VideoEncoderFactory> encoder_factory,
|
|
std::unique_ptr<VideoDecoderFactory> decoder_factory);
|
|
~SimulcastTestFixtureImpl() final;
|
|
|
|
// Implements SimulcastTestFixture.
|
|
void TestKeyFrameRequestsOnAllStreams() override;
|
|
void TestPaddingAllStreams() override;
|
|
void TestPaddingTwoStreams() override;
|
|
void TestPaddingTwoStreamsOneMaxedOut() override;
|
|
void TestPaddingOneStream() override;
|
|
void TestPaddingOneStreamTwoMaxedOut() override;
|
|
void TestSendAllStreams() override;
|
|
void TestDisablingStreams() override;
|
|
void TestActiveStreams() override;
|
|
void TestSwitchingToOneStream() override;
|
|
void TestSwitchingToOneOddStream() override;
|
|
void TestSwitchingToOneSmallStream() override;
|
|
void TestSpatioTemporalLayers333PatternEncoder() override;
|
|
void TestSpatioTemporalLayers321PatternEncoder() override;
|
|
void TestStrideEncodeDecode() override;
|
|
|
|
static void DefaultSettings(VideoCodec* settings,
|
|
const int* temporal_layer_profile);
|
|
|
|
private:
|
|
class Vp8TestEncodedImageCallback;
|
|
class Vp8TestDecodedImageCallback;
|
|
|
|
void SetUpCodec(const int* temporal_layer_profile);
|
|
void SetUpRateAllocator();
|
|
void SetRates(uint32_t bitrate_kbps, uint32_t fps);
|
|
void RunActiveStreamsTest(const std::vector<bool> active_streams);
|
|
void UpdateActiveStreams(const std::vector<bool> active_streams);
|
|
void ExpectStreams(FrameType frame_type,
|
|
const std::vector<bool> expected_streams_active);
|
|
void ExpectStreams(FrameType frame_type, int expected_video_streams);
|
|
void VerifyTemporalIdxAndSyncForAllSpatialLayers(
|
|
Vp8TestEncodedImageCallback* encoder_callback,
|
|
const int* expected_temporal_idx,
|
|
const bool* expected_layer_sync,
|
|
int num_spatial_layers);
|
|
void SwitchingToOneStream(int width, int height);
|
|
|
|
std::unique_ptr<VideoEncoder> encoder_;
|
|
MockEncodedImageCallback encoder_callback_;
|
|
std::unique_ptr<VideoDecoder> decoder_;
|
|
MockDecodedImageCallback decoder_callback_;
|
|
VideoCodec settings_;
|
|
rtc::scoped_refptr<I420Buffer> input_buffer_;
|
|
std::unique_ptr<VideoFrame> input_frame_;
|
|
std::unique_ptr<SimulcastRateAllocator> rate_allocator_;
|
|
};
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_TEST_FIXTURE_IMPL_H_
|