Delete post_encode_callback
Bug: webrtc:9864
Change-Id: I5e45a73e50e2cf6b25b415a83fe637f8f5b4e70e
Reviewed-on: https://webrtc-review.googlesource.com/c/14840
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25106}diff --git a/video/video_analyzer.h b/video/video_analyzer.h
index 681d1f4..d2c4fa8 100644
--- a/video/video_analyzer.h
+++ b/video/video_analyzer.h
@@ -25,8 +25,7 @@
class VideoAnalyzer : public PacketReceiver,
public Transport,
- public rtc::VideoSinkInterface<VideoFrame>,
- public EncodedFrameObserver {
+ public rtc::VideoSinkInterface<VideoFrame> {
public:
VideoAnalyzer(test::LayerFilteringTransport* transport,
const std::string& test_label,
@@ -61,9 +60,7 @@
int64_t packet_time_us) override;
void PreEncodeOnFrame(const VideoFrame& video_frame);
-
- // EncodedFrameObserver implementation, wired to post_encode_callback.
- void EncodedFrameCallback(const EncodedFrame& encoded_frame) override;
+ void PostEncodeOnFrame(size_t stream_id, uint32_t timestamp);
bool SendRtp(const uint8_t* packet,
size_t length,
@@ -73,8 +70,6 @@
void OnFrame(const VideoFrame& video_frame) override;
void Wait();
- rtc::VideoSinkInterface<VideoFrame>* pre_encode_proxy();
-
void StartMeasuringCpuProcessTime();
void StopMeasuringCpuProcessTime();
void StartExcludingCpuThreadTime();
@@ -132,17 +127,6 @@
double ssim;
};
- // This class receives the send-side OnFrame callback and is provided to not
- // conflict with the receiver-side renderer callback.
- class PreEncodeProxy : public rtc::VideoSinkInterface<VideoFrame> {
- public:
- explicit PreEncodeProxy(VideoAnalyzer* parent);
- void OnFrame(const VideoFrame& video_frame) override;
-
- private:
- VideoAnalyzer* const parent_;
- };
-
// Implements VideoSinkInterface to receive captured frames from a
// FrameGeneratorCapturer. Implements VideoSourceInterface to be able to act
// as a source to VideoSendStream.
@@ -221,7 +205,6 @@
const size_t selected_stream_;
const int selected_sl_;
const int selected_tl_;
- PreEncodeProxy pre_encode_proxy_;
rtc::CriticalSection comparison_lock_;
std::vector<Sample> samples_ RTC_GUARDED_BY(comparison_lock_);