mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 06:40:43 +01:00
2c7b9825bc
This reverts commit 39d3a7de02.
Reason for revert: This change broke an internal project
Original change's description:
> Delete CodecSpecificInfo argument from VideoDecoder::Decode
>
> Bug: webrtc:10379
> Change-Id: I079b419604bf4e9c1994fe203d7db131a0ccddb6
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/125920
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> Reviewed-by: Erik Språng <sprang@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27022}
TBR=brandtr@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,kthelgason@webrtc.org,sprang@webrtc.org
Change-Id: I2c730cc1834a3b23203fae3d7881f0890802c37b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10379
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126320
Reviewed-by: Jeroen de Borst <jeroendb@webrtc.org>
Commit-Queue: Jeroen de Borst <jeroendb@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27026}
81 lines
2.7 KiB
C++
81 lines
2.7 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 TEST_VIDEO_DECODER_PROXY_FACTORY_H_
|
|
#define TEST_VIDEO_DECODER_PROXY_FACTORY_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "absl/memory/memory.h"
|
|
#include "api/video_codecs/video_decoder.h"
|
|
#include "api/video_codecs/video_decoder_factory.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
// An decoder factory with a single underlying VideoDecoder object, intended for
|
|
// test purposes. Each call to CreateVideoDecoder returns a proxy for the same
|
|
// decoder, typically an instance of FakeDecoder or MockEncoder.
|
|
class VideoDecoderProxyFactory final : public VideoDecoderFactory {
|
|
public:
|
|
explicit VideoDecoderProxyFactory(VideoDecoder* decoder)
|
|
: decoder_(decoder) {}
|
|
|
|
// Unused by tests.
|
|
std::vector<SdpVideoFormat> GetSupportedFormats() const override {
|
|
RTC_NOTREACHED();
|
|
return {};
|
|
}
|
|
|
|
std::unique_ptr<VideoDecoder> CreateVideoDecoder(
|
|
const SdpVideoFormat& format) override {
|
|
return absl::make_unique<DecoderProxy>(decoder_);
|
|
}
|
|
|
|
private:
|
|
// Wrapper class, since CreateVideoDecoder needs to surrender
|
|
// ownership to the object it returns.
|
|
class DecoderProxy final : public VideoDecoder {
|
|
public:
|
|
explicit DecoderProxy(VideoDecoder* decoder) : decoder_(decoder) {}
|
|
|
|
private:
|
|
int32_t Decode(const EncodedImage& input_image,
|
|
bool missing_frames,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
int64_t render_time_ms) override {
|
|
return decoder_->Decode(input_image, missing_frames, codec_specific_info,
|
|
render_time_ms);
|
|
}
|
|
int32_t InitDecode(const VideoCodec* config,
|
|
int32_t number_of_cores) override {
|
|
return decoder_->InitDecode(config, number_of_cores);
|
|
}
|
|
int32_t RegisterDecodeCompleteCallback(
|
|
DecodedImageCallback* callback) override {
|
|
return decoder_->RegisterDecodeCompleteCallback(callback);
|
|
}
|
|
int32_t Release() override { return decoder_->Release(); }
|
|
bool PrefersLateDecoding() const { return decoder_->PrefersLateDecoding(); }
|
|
const char* ImplementationName() const override {
|
|
return decoder_->ImplementationName();
|
|
}
|
|
|
|
VideoDecoder* const decoder_;
|
|
};
|
|
|
|
VideoDecoder* const decoder_;
|
|
};
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // TEST_VIDEO_DECODER_PROXY_FACTORY_H_
|