Delete DecodedImageCallback::ReceivedDecodedFrame
This was a companion method to ReceivedDecodedReferenceFrame, deleted in https://webrtc-review.googlesource.com/c/src/+/133348. Tbr: kwiberg@webrtc.org # Mock class update Bug: webrtc:7408 Change-Id: I429f5f5c18f14c27136e82860297107a82c81d13 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133571 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Åsa Persson <asapersson@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27754}
This commit is contained in:
@ -29,7 +29,6 @@ class MockDecodedImageCallback : public DecodedImageCallback {
|
||||
void(VideoFrame& decodedImage, // NOLINT
|
||||
absl::optional<int32_t> decode_time_ms,
|
||||
absl::optional<uint8_t> qp));
|
||||
MOCK_METHOD1(ReceivedDecodedFrame, int32_t(const uint64_t pictureId));
|
||||
};
|
||||
|
||||
class MockVideoDecoder : public VideoDecoder {
|
||||
|
@ -24,10 +24,6 @@ void DecodedImageCallback::Decoded(VideoFrame& decodedImage,
|
||||
Decoded(decodedImage, decode_time_ms.value_or(-1));
|
||||
}
|
||||
|
||||
int32_t DecodedImageCallback::ReceivedDecodedFrame(const uint64_t pictureId) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
bool VideoDecoder::PrefersLateDecoding() const {
|
||||
return true;
|
||||
}
|
||||
|
@ -38,8 +38,6 @@ class RTC_EXPORT DecodedImageCallback {
|
||||
virtual void Decoded(VideoFrame& decodedImage,
|
||||
absl::optional<int32_t> decode_time_ms,
|
||||
absl::optional<uint8_t> qp);
|
||||
|
||||
virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId);
|
||||
};
|
||||
|
||||
class RTC_EXPORT VideoDecoder {
|
||||
|
@ -25,10 +25,7 @@ namespace webrtc {
|
||||
|
||||
VCMDecodedFrameCallback::VCMDecodedFrameCallback(VCMTiming* timing,
|
||||
Clock* clock)
|
||||
: _clock(clock),
|
||||
_timing(timing),
|
||||
_timestampMap(kDecoderFrameMemoryLength),
|
||||
_lastReceivedPictureID(0) {
|
||||
: _clock(clock), _timing(timing), _timestampMap(kDecoderFrameMemoryLength) {
|
||||
ntp_offset_ =
|
||||
_clock->CurrentNtpInMilliseconds() - _clock->TimeInMilliseconds();
|
||||
}
|
||||
@ -147,16 +144,6 @@ void VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage,
|
||||
_receiveCallback->FrameToRender(decodedImage, qp, frameInfo->content_type);
|
||||
}
|
||||
|
||||
int32_t VCMDecodedFrameCallback::ReceivedDecodedFrame(
|
||||
const uint64_t pictureId) {
|
||||
_lastReceivedPictureID = pictureId;
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint64_t VCMDecodedFrameCallback::LastReceivedPictureID() const {
|
||||
return _lastReceivedPictureID;
|
||||
}
|
||||
|
||||
void VCMDecodedFrameCallback::OnDecoderImplementationName(
|
||||
const char* implementation_name) {
|
||||
_receiveCallback->OnDecoderImplementationName(implementation_name);
|
||||
|
@ -48,9 +48,7 @@ class VCMDecodedFrameCallback : public DecodedImageCallback {
|
||||
void Decoded(VideoFrame& decodedImage,
|
||||
absl::optional<int32_t> decode_time_ms,
|
||||
absl::optional<uint8_t> qp) override;
|
||||
int32_t ReceivedDecodedFrame(const uint64_t pictureId) override;
|
||||
|
||||
uint64_t LastReceivedPictureID() const;
|
||||
void OnDecoderImplementationName(const char* implementation_name);
|
||||
|
||||
void Map(uint32_t timestamp, VCMFrameInformation* frameInfo);
|
||||
@ -69,7 +67,6 @@ class VCMDecodedFrameCallback : public DecodedImageCallback {
|
||||
VCMTiming* _timing;
|
||||
rtc::CriticalSection lock_;
|
||||
VCMTimestampMap _timestampMap RTC_GUARDED_BY(lock_);
|
||||
uint64_t _lastReceivedPictureID;
|
||||
int64_t ntp_offset_;
|
||||
};
|
||||
|
||||
|
@ -175,13 +175,6 @@ void QualityAnalyzingVideoDecoder::DecoderCallback::Decoded(
|
||||
delegate_callback_->Decoded(decodedImage, decode_time_ms, qp);
|
||||
}
|
||||
|
||||
int32_t QualityAnalyzingVideoDecoder::DecoderCallback::ReceivedDecodedFrame(
|
||||
const uint64_t pictureId) {
|
||||
rtc::CritScope crit(&callback_lock_);
|
||||
RTC_DCHECK(delegate_callback_);
|
||||
return delegate_callback_->ReceivedDecodedFrame(pictureId);
|
||||
}
|
||||
|
||||
int32_t
|
||||
QualityAnalyzingVideoDecoder::DecoderCallback::IrrelevantSimulcastStreamDecoded(
|
||||
uint16_t frame_id,
|
||||
|
@ -84,7 +84,6 @@ class QualityAnalyzingVideoDecoder : public VideoDecoder {
|
||||
void Decoded(VideoFrame& decodedImage,
|
||||
absl::optional<int32_t> decode_time_ms,
|
||||
absl::optional<uint8_t> qp) override;
|
||||
int32_t ReceivedDecodedFrame(uint64_t pictureId) override;
|
||||
|
||||
int32_t IrrelevantSimulcastStreamDecoded(uint16_t frame_id,
|
||||
int64_t timestamp_ms);
|
||||
|
Reference in New Issue
Block a user