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

Remove deprecated API

Browse Source 
BUG=none

Review-Url: https://codereview.webrtc.org/2865663002
Cr-Commit-Position: refs/heads/master@{#18044}
This commit is contained in:
ilnik
2017-05-08 02:59:38 -07:00
committed by Commit bot
parent 32f2505185
commit fc0acc44e6
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h
View File

@ -33,8 +33,6 @@ class MockVCMReceiveCallback : public VCMReceiveCallback {
MockVCMReceiveCallback() {}
virtual ~MockVCMReceiveCallback() {}
// TODO(ilnik): Remove using ... once deprecation is done.
using VCMReceiveCallback::FrameToRender;
MOCK_METHOD3(FrameToRender,
int32_t(VideoFrame&, rtc::Optional<uint8_t>, VideoContentType));
MOCK_METHOD1(ReceivedDecodedReferenceFrame, int32_t(const uint64_t));

11
webrtc/modules/video_coding/include/video_coding_defines.h
View File

@ -61,17 +61,10 @@ struct VCMFrameCount {
// rendered.
class VCMReceiveCallback {
public:
// TODO(ilnik): Once deprecation is complete, change this to pure virtual.
virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT
rtc::Optional<uint8_t> qp,
VideoContentType /*content_type*/) {
return FrameToRender(videoFrame, qp);
}
// DEPRECATED. Use the other overloaded version.
virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT
rtc::Optional<uint8_t> qp) {
return -1;
}
VideoContentType /*content_type*/) = 0;
virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) {
return -1;
}

2
webrtc/video/video_stream_decoder.h
View File

@ -57,8 +57,6 @@ class VideoStreamDecoder : public VCMReceiveCallback,
rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream);
~VideoStreamDecoder();
// TODO(ilnik): remove this once deprecated API is removed.
using VCMReceiveCallback::FrameToRender;
// Implements VCMReceiveCallback.
int32_t FrameToRender(VideoFrame& video_frame,
rtc::Optional<uint8_t> qp,