zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed VideoDecoderFactory::LegacyCreateVideoDecoder and VideoReceiveStream::Config::stream_id.

Browse Source 
Bug: webrtc:9106
Change-Id: I7fa84095732c33d136a9354ae4f09266cffcf877
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180020
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31793}
This commit is contained in:
philipel
2020-07-22 15:40:18 +02:00
committed by Commit Bot
parent 95e659db34
commit 4ba1044bae
9 changed files with 2 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/video_codecs/BUILD.gn
View File

@ -21,7 +21,6 @@ rtc_library("video_codecs_api") {
"video_codec.h",
"video_decoder.cc",
"video_decoder.h",
"video_decoder_factory.cc",
"video_decoder_factory.h",
"video_encoder.cc",
"video_encoder.h",

23
api/video_codecs/video_decoder_factory.cc
View File

@ -1,23 +0,0 @@
/*
* 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.
*/
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_decoder.h"
namespace webrtc {
std::unique_ptr<VideoDecoder> VideoDecoderFactory::LegacyCreateVideoDecoder(
const SdpVideoFormat& format,
const std::string& receive_stream_id) {
return CreateVideoDecoder(format);
}
} // namespace webrtc

6
api/video_codecs/video_decoder_factory.h
View File

@ -34,12 +34,6 @@ class RTC_EXPORT VideoDecoderFactory {
virtual std::unique_ptr<VideoDecoder> CreateVideoDecoder(
const SdpVideoFormat& format) = 0;
// Note: Do not call or override this method! This method is a legacy
// workaround and is scheduled for removal without notice.
virtual std::unique_ptr<VideoDecoder> LegacyCreateVideoDecoder(
const SdpVideoFormat& format,
const std::string& receive_stream_id);
virtual ~VideoDecoderFactory() {}
};

4
call/video_receive_stream.h
View File

@ -252,10 +252,6 @@ class VideoReceiveStream {
// used for streaming instead of a real-time call.
int target_delay_ms = 0;
// TODO(nisse): Used with VideoDecoderFactory::LegacyCreateVideoDecoder.
// Delete when that method is retired.
std::string stream_id;
// An optional custom frame decryptor that allows the entire frame to be
// decrypted in whatever way the caller choses. This is not required by
// default.

1
media/engine/webrtc_video_engine.cc
View File

@ -2904,7 +2904,6 @@ void WebRtcVideoChannel::WebRtcVideoReceiveStream::RecreateWebRtcVideoStream() {
}
webrtc::VideoReceiveStream::Config config = config_.Copy();
config.rtp.protected_by_flexfec = (flexfec_stream_ != nullptr);
config.stream_id = stream_params_.id;
stream_ = call_->CreateVideoReceiveStream(std::move(config));
if (base_minimum_playout_delay_ms) {
stream_->SetBaseMinimumPlayoutDelayMs(

11
test/pc/e2e/analyzer/video/quality_analyzing_video_decoder.cc
View File

@ -258,16 +258,5 @@ QualityAnalyzingVideoDecoderFactory::CreateVideoDecoder(
analyzer_);
}
std::unique_ptr<VideoDecoder>
QualityAnalyzingVideoDecoderFactory::LegacyCreateVideoDecoder(
const SdpVideoFormat& format,
const std::string& receive_stream_id) {
std::unique_ptr<VideoDecoder> decoder =
delegate_->LegacyCreateVideoDecoder(format, receive_stream_id);
return std::make_unique<QualityAnalyzingVideoDecoder>(
id_generator_->GetNextId(), peer_name_, std::move(decoder), extractor_,
analyzer_);
}
} // namespace webrtc_pc_e2e
} // namespace webrtc

3
test/pc/e2e/analyzer/video/quality_analyzing_video_decoder.h
View File

@ -143,9 +143,6 @@ class QualityAnalyzingVideoDecoderFactory : public VideoDecoderFactory {
std::vector<SdpVideoFormat> GetSupportedFormats() const override;
std::unique_ptr<VideoDecoder> CreateVideoDecoder(
const SdpVideoFormat& format) override;
std::unique_ptr<VideoDecoder> LegacyCreateVideoDecoder(
const SdpVideoFormat& format,
const std::string& receive_stream_id) override;
private:
const std::string peer_name_;

3
video/video_receive_stream.cc
View File

@ -338,8 +338,7 @@ void VideoReceiveStream::Start() {
for (const Decoder& decoder : config_.decoders) {
std::unique_ptr<VideoDecoder> video_decoder =
decoder.decoder_factory->LegacyCreateVideoDecoder(decoder.video_format,
config_.stream_id);
decoder.decoder_factory->CreateVideoDecoder(decoder.video_format);
// If we still have no valid decoder, we have to create a "Null" decoder
// that ignores all calls. The reason we can get into this state is that the
// old decoder factory interface doesn't have a way to query supported

3
video/video_receive_stream2.cc
View File

@ -314,8 +314,7 @@ void VideoReceiveStream2::Start() {
for (const Decoder& decoder : config_.decoders) {
std::unique_ptr<VideoDecoder> video_decoder =
decoder.decoder_factory->LegacyCreateVideoDecoder(decoder.video_format,
config_.stream_id);
decoder.decoder_factory->CreateVideoDecoder(decoder.video_format);
// If we still have no valid decoder, we have to create a "Null" decoder
// that ignores all calls. The reason we can get into this state is that the
// old decoder factory interface doesn't have a way to query supported