From b72dada927047c9390a0f861e540da44288ebca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Fri, 12 Feb 2016 15:56:57 +0100 Subject: [PATCH] Remove Reset from conditionally-compiled decoders. Reset is no longer called but removal of them was missed in a previous commit. BUG=webrtc:5475 TBR=hbos@webrtc.org,tkchin@webrtc.org Review URL: https://codereview.webrtc.org/1690193003 . Cr-Commit-Position: refs/heads/master@{#11603} --- .../modules/video_coding/codecs/h264/h264_decoder_impl.cc | 7 ------- .../modules/video_coding/codecs/h264/h264_decoder_impl.h | 1 - .../video_coding/codecs/h264/h264_video_toolbox_decoder.cc | 5 ----- .../video_coding/codecs/h264/h264_video_toolbox_decoder.h | 2 -- 4 files changed, 15 deletions(-) diff --git a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc index 692422ec44..a28f41d101 100644 --- a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc +++ b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc @@ -241,13 +241,6 @@ int32_t H264DecoderImpl::Release() { return WEBRTC_VIDEO_CODEC_OK; } -int32_t H264DecoderImpl::Reset() { - if (!IsInitialized()) - return WEBRTC_VIDEO_CODEC_UNINITIALIZED; - InitDecode(nullptr, 1); - return WEBRTC_VIDEO_CODEC_OK; -} - int32_t H264DecoderImpl::RegisterDecodeCompleteCallback( DecodedImageCallback* callback) { decoded_image_callback_ = callback; diff --git a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h index 357d981948..e464ffbcdd 100644 --- a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h +++ b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h @@ -40,7 +40,6 @@ class H264DecoderImpl : public H264Decoder { int32_t InitDecode(const VideoCodec* codec_settings, int32_t number_of_cores) override; int32_t Release() override; - int32_t Reset() override; int32_t RegisterDecodeCompleteCallback( DecodedImageCallback* callback) override; diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc index 6fee2e6f36..e79fdfb698 100644 --- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc +++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc @@ -168,11 +168,6 @@ int H264VideoToolboxDecoder::Release() { return WEBRTC_VIDEO_CODEC_OK; } -int H264VideoToolboxDecoder::Reset() { - ResetDecompressionSession(); - return WEBRTC_VIDEO_CODEC_OK; -} - int H264VideoToolboxDecoder::ResetDecompressionSession() { DestroyDecompressionSession(); diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h index 6d64307a82..1fbccdacf4 100644 --- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h +++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h @@ -43,8 +43,6 @@ class H264VideoToolboxDecoder : public H264Decoder { int Release() override; - int Reset() override; - const char* ImplementationName() const override; private: