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

Delete method DecodedImageCallback::ReceivedDecodedReferenceFrame

Browse Source 
The code invoking it was deleted in
https://codereview.webrtc.org/2753783002

Tbr: kwiberg@webrtc.org # Change to mock class in api/test
Bug: webrtc:7408
Change-Id: I576d7aacd7dc60e42a05d2ea837fddf16594e685
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133348
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27680}
This commit is contained in:
Niels Möller
2019-04-17 16:06:06 +02:00
committed by Commit Bot
parent fc3cfc599c
commit 2317c5ee0a
12 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/test/mock_video_decoder.h
View File

@ -29,8 +29,6 @@ class MockDecodedImageCallback : public DecodedImageCallback {
void(VideoFrame& decodedImage, // NOLINT void(VideoFrame& decodedImage, // NOLINT
absl::optional<int32_t> decode_time_ms, absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp)); absl::optional<uint8_t> qp));
MOCK_METHOD1(ReceivedDecodedReferenceFrame,
int32_t(const uint64_t pictureId));
MOCK_METHOD1(ReceivedDecodedFrame, int32_t(const uint64_t pictureId)); MOCK_METHOD1(ReceivedDecodedFrame, int32_t(const uint64_t pictureId));
}; };

5
api/video_codecs/video_decoder.cc
View File

@ -24,11 +24,6 @@ void DecodedImageCallback::Decoded(VideoFrame& decodedImage,
Decoded(decodedImage, decode_time_ms.value_or(-1)); Decoded(decodedImage, decode_time_ms.value_or(-1));
} }
int32_t DecodedImageCallback::ReceivedDecodedReferenceFrame(
const uint64_t pictureId) {
return -1;
}
int32_t DecodedImageCallback::ReceivedDecodedFrame(const uint64_t pictureId) { int32_t DecodedImageCallback::ReceivedDecodedFrame(const uint64_t pictureId) {
return -1; return -1;
} }

2
api/video_codecs/video_decoder.h
View File

@ -43,8 +43,6 @@ class RTC_EXPORT DecodedImageCallback {
absl::optional<int32_t> decode_time_ms, absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp); absl::optional<uint8_t> qp);
virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId);
virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId); virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId);
}; };

5
modules/video_coding/generic_decoder.cc
View File

@ -147,11 +147,6 @@ void VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage,
_receiveCallback->FrameToRender(decodedImage, qp, frameInfo->content_type); _receiveCallback->FrameToRender(decodedImage, qp, frameInfo->content_type);
} }
int32_t VCMDecodedFrameCallback::ReceivedDecodedReferenceFrame(
const uint64_t pictureId) {
return _receiveCallback->ReceivedDecodedReferenceFrame(pictureId);
}
int32_t VCMDecodedFrameCallback::ReceivedDecodedFrame( int32_t VCMDecodedFrameCallback::ReceivedDecodedFrame(
const uint64_t pictureId) { const uint64_t pictureId) {
_lastReceivedPictureID = pictureId; _lastReceivedPictureID = pictureId;

1
modules/video_coding/generic_decoder.h
View File

@ -48,7 +48,6 @@ class VCMDecodedFrameCallback : public DecodedImageCallback {
void Decoded(VideoFrame& decodedImage, void Decoded(VideoFrame& decodedImage,
absl::optional<int32_t> decode_time_ms, absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp) override; absl::optional<uint8_t> qp) override;
int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) override;
int32_t ReceivedDecodedFrame(const uint64_t pictureId) override; int32_t ReceivedDecodedFrame(const uint64_t pictureId) override;
uint64_t LastReceivedPictureID() const; uint64_t LastReceivedPictureID() const;

1
modules/video_coding/include/mock/mock_vcm_callbacks.h
View File

@ -29,7 +29,6 @@ class MockVCMReceiveCallback : public VCMReceiveCallback {
MOCK_METHOD3(FrameToRender, MOCK_METHOD3(FrameToRender,
int32_t(VideoFrame&, absl::optional<uint8_t>, VideoContentType)); int32_t(VideoFrame&, absl::optional<uint8_t>, VideoContentType));
MOCK_METHOD1(ReceivedDecodedReferenceFrame, int32_t(const uint64_t));
MOCK_METHOD1(OnIncomingPayloadType, void(int)); MOCK_METHOD1(OnIncomingPayloadType, void(int));
MOCK_METHOD1(OnDecoderImplementationName, void(const char*)); MOCK_METHOD1(OnDecoderImplementationName, void(const char*));
}; };

1
modules/video_coding/include/video_coding_defines.h
View File

@ -67,7 +67,6 @@ class VCMReceiveCallback {
absl::optional<uint8_t> qp, absl::optional<uint8_t> qp,
VideoContentType content_type) = 0; VideoContentType content_type) = 0;
virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId);
// Called when the current receive codec changes. // Called when the current receive codec changes.
virtual void OnIncomingPayloadType(int payload_type); virtual void OnIncomingPayloadType(int payload_type);
virtual void OnDecoderImplementationName(const char* implementation_name); virtual void OnDecoderImplementationName(const char* implementation_name);

4
modules/video_coding/video_coding_defines.cc
View File

@ -12,10 +12,6 @@
namespace webrtc { namespace webrtc {
int32_t VCMReceiveCallback::ReceivedDecodedReferenceFrame(
const uint64_t pictureId) {
return -1;
}
void VCMReceiveCallback::OnIncomingPayloadType(int payload_type) {} void VCMReceiveCallback::OnIncomingPayloadType(int payload_type) {}
void VCMReceiveCallback::OnDecoderImplementationName( void VCMReceiveCallback::OnDecoderImplementationName(
const char* implementation_name) {} const char* implementation_name) {}

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

@ -175,14 +175,6 @@ void QualityAnalyzingVideoDecoder::DecoderCallback::Decoded(
delegate_callback_->Decoded(decodedImage, decode_time_ms, qp); delegate_callback_->Decoded(decodedImage, decode_time_ms, qp);
} }
int32_t
QualityAnalyzingVideoDecoder::DecoderCallback::ReceivedDecodedReferenceFrame(
const uint64_t pictureId) {
rtc::CritScope crit(&callback_lock_);
RTC_DCHECK(delegate_callback_);
return delegate_callback_->ReceivedDecodedReferenceFrame(pictureId);
}
int32_t QualityAnalyzingVideoDecoder::DecoderCallback::ReceivedDecodedFrame( int32_t QualityAnalyzingVideoDecoder::DecoderCallback::ReceivedDecodedFrame(
const uint64_t pictureId) { const uint64_t pictureId) {
rtc::CritScope crit(&callback_lock_); rtc::CritScope crit(&callback_lock_);

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

@ -84,7 +84,6 @@ class QualityAnalyzingVideoDecoder : public VideoDecoder {
void Decoded(VideoFrame& decodedImage, void Decoded(VideoFrame& decodedImage,
absl::optional<int32_t> decode_time_ms, absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp) override; absl::optional<uint8_t> qp) override;
int32_t ReceivedDecodedReferenceFrame(uint64_t pictureId) override;
int32_t ReceivedDecodedFrame(uint64_t pictureId) override; int32_t ReceivedDecodedFrame(uint64_t pictureId) override;
int32_t IrrelevantSimulcastStreamDecoded(uint16_t frame_id, int32_t IrrelevantSimulcastStreamDecoded(uint16_t frame_id,

6
video/video_stream_decoder.cc
View File

@ -51,12 +51,6 @@ int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame,
return 0; return 0;
} }
int32_t VideoStreamDecoder::ReceivedDecodedReferenceFrame(
const uint64_t picture_id) {
RTC_NOTREACHED();
return 0;
}
void VideoStreamDecoder::OnIncomingPayloadType(int payload_type) { void VideoStreamDecoder::OnIncomingPayloadType(int payload_type) {
receive_stats_callback_->OnIncomingPayloadType(payload_type); receive_stats_callback_->OnIncomingPayloadType(payload_type);
} }

1
video/video_stream_decoder.h
View File

@ -43,7 +43,6 @@ class VideoStreamDecoder : public VCMReceiveCallback {
int32_t FrameToRender(VideoFrame& video_frame, int32_t FrameToRender(VideoFrame& video_frame,
absl::optional<uint8_t> qp, absl::optional<uint8_t> qp,
VideoContentType content_type) override; VideoContentType content_type) override;
int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override;
void OnIncomingPayloadType(int payload_type) override; void OnIncomingPayloadType(int payload_type) override;
void OnDecoderImplementationName(const char* implementation_name) override; void OnDecoderImplementationName(const char* implementation_name) override;