From c90e9b64d5446a9cc5f183e830eb088770392676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Fri, 12 Feb 2016 15:16:24 +0100 Subject: [PATCH] Remove no-op VideoDecoder::Reset implementation. No longer used in Chromium and should be removable now. BUG=webrtc:5475 TBR=mflodman@webrtc.org Review URL: https://codereview.webrtc.org/1692543005 . Cr-Commit-Position: refs/heads/master@{#11602} --- webrtc/video/video_decoder.cc | 4 ---- webrtc/video_decoder.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/webrtc/video/video_decoder.cc b/webrtc/video/video_decoder.cc index 195f7e14d6..8e0a503425 100644 --- a/webrtc/video/video_decoder.cc +++ b/webrtc/video/video_decoder.cc @@ -168,10 +168,6 @@ int32_t NullVideoDecoder::Release() { return WEBRTC_VIDEO_CODEC_OK; } -int32_t NullVideoDecoder::Reset() { - return WEBRTC_VIDEO_CODEC_OK; -} - const char* NullVideoDecoder::ImplementationName() const { return "NullVideoDecoder"; } diff --git a/webrtc/video_decoder.h b/webrtc/video_decoder.h index 368b846e14..e99183fdef 100644 --- a/webrtc/video_decoder.h +++ b/webrtc/video_decoder.h @@ -73,9 +73,6 @@ class VideoDecoder { DecodedImageCallback* callback) = 0; virtual int32_t Release() = 0; - // TODO(pbos): Remove, this is no longer called. A no-op implementation is - // added here to permit removal elsewhere. - virtual int32_t Reset() { return 0; } // Returns true if the decoder prefer to decode frames late. // That is, it can not decode infinite number of frames before the decoded @@ -142,7 +139,6 @@ class NullVideoDecoder : public VideoDecoder { DecodedImageCallback* callback) override; int32_t Release() override; - int32_t Reset() override; const char* ImplementationName() const override; };