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

Delete DecodedImageCallback::ReceivedDecodedFrame

Browse Source 
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:
Niels Möller
2019-04-23 14:52:33 +02:00
committed by Commit Bot
parent 03e85d2b3b
commit 43f7002aff
7 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/test/mock_video_decoder.h
View File

@ -29,7 +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(ReceivedDecodedFrame, int32_t(const uint64_t pictureId));
}; };
class MockVideoDecoder : public VideoDecoder { class MockVideoDecoder : public VideoDecoder {

4
api/video_codecs/video_decoder.cc
View File

@ -24,10 +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::ReceivedDecodedFrame(const uint64_t pictureId) {
return -1;
}
bool VideoDecoder::PrefersLateDecoding() const { bool VideoDecoder::PrefersLateDecoding() const {
return true; return true;
} }

2
api/video_codecs/video_decoder.h
View File

@ -38,8 +38,6 @@ class RTC_EXPORT DecodedImageCallback {
virtual void Decoded(VideoFrame& decodedImage, virtual void Decoded(VideoFrame& decodedImage,
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 ReceivedDecodedFrame(const uint64_t pictureId);
}; };
class RTC_EXPORT VideoDecoder { class RTC_EXPORT VideoDecoder {

15
modules/video_coding/generic_decoder.cc
View File

@ -25,10 +25,7 @@ namespace webrtc {
VCMDecodedFrameCallback::VCMDecodedFrameCallback(VCMTiming* timing, VCMDecodedFrameCallback::VCMDecodedFrameCallback(VCMTiming* timing,
Clock* clock) Clock* clock)
: _clock(clock), : _clock(clock), _timing(timing), _timestampMap(kDecoderFrameMemoryLength) {
_timing(timing),
_timestampMap(kDecoderFrameMemoryLength),
_lastReceivedPictureID(0) {
ntp_offset_ = ntp_offset_ =
_clock->CurrentNtpInMilliseconds() - _clock->TimeInMilliseconds(); _clock->CurrentNtpInMilliseconds() - _clock->TimeInMilliseconds();
} }
@ -147,16 +144,6 @@ void VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage,
_receiveCallback->FrameToRender(decodedImage, qp, frameInfo->content_type); _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( void VCMDecodedFrameCallback::OnDecoderImplementationName(
const char* implementation_name) { const char* implementation_name) {
_receiveCallback->OnDecoderImplementationName(implementation_name); _receiveCallback->OnDecoderImplementationName(implementation_name);

3
modules/video_coding/generic_decoder.h
View File

@ -48,9 +48,7 @@ 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 ReceivedDecodedFrame(const uint64_t pictureId) override;
uint64_t LastReceivedPictureID() const;
void OnDecoderImplementationName(const char* implementation_name); void OnDecoderImplementationName(const char* implementation_name);
void Map(uint32_t timestamp, VCMFrameInformation* frameInfo); void Map(uint32_t timestamp, VCMFrameInformation* frameInfo);
@ -69,7 +67,6 @@ class VCMDecodedFrameCallback : public DecodedImageCallback {
VCMTiming* _timing; VCMTiming* _timing;
rtc::CriticalSection lock_; rtc::CriticalSection lock_;
VCMTimestampMap _timestampMap RTC_GUARDED_BY(lock_); VCMTimestampMap _timestampMap RTC_GUARDED_BY(lock_);
uint64_t _lastReceivedPictureID;
int64_t ntp_offset_; int64_t ntp_offset_;
}; };

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

@ -175,13 +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::ReceivedDecodedFrame(
const uint64_t pictureId) {
rtc::CritScope crit(&callback_lock_);
RTC_DCHECK(delegate_callback_);
return delegate_callback_->ReceivedDecodedFrame(pictureId);
}
int32_t int32_t
QualityAnalyzingVideoDecoder::DecoderCallback::IrrelevantSimulcastStreamDecoded( QualityAnalyzingVideoDecoder::DecoderCallback::IrrelevantSimulcastStreamDecoded(
uint16_t frame_id, uint16_t frame_id,

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 ReceivedDecodedFrame(uint64_t pictureId) override;
int32_t IrrelevantSimulcastStreamDecoded(uint16_t frame_id, int32_t IrrelevantSimulcastStreamDecoded(uint16_t frame_id,
int64_t timestamp_ms); int64_t timestamp_ms);