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

Remove Reset from conditionally-compiled decoders.

Browse Source 
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}
This commit is contained in:
Peter Boström
2016-02-12 15:56:57 +01:00
parent c90e9b64d5
commit b72dada927
4 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
View File

@ -241,13 +241,6 @@ int32_t H264DecoderImpl::Release() {
return WEBRTC_VIDEO_CODEC_OK; 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( int32_t H264DecoderImpl::RegisterDecodeCompleteCallback(
DecodedImageCallback* callback) { DecodedImageCallback* callback) {
decoded_image_callback_ = callback; decoded_image_callback_ = callback;

1
webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
View File

@ -40,7 +40,6 @@ class H264DecoderImpl : public H264Decoder {
int32_t InitDecode(const VideoCodec* codec_settings, int32_t InitDecode(const VideoCodec* codec_settings,
int32_t number_of_cores) override; int32_t number_of_cores) override;
int32_t Release() override; int32_t Release() override;
int32_t Reset() override;
int32_t RegisterDecodeCompleteCallback( int32_t RegisterDecodeCompleteCallback(
DecodedImageCallback* callback) override; DecodedImageCallback* callback) override;

5
webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc
View File

@ -168,11 +168,6 @@ int H264VideoToolboxDecoder::Release() {
return WEBRTC_VIDEO_CODEC_OK; return WEBRTC_VIDEO_CODEC_OK;
} }
int H264VideoToolboxDecoder::Reset() {
ResetDecompressionSession();
return WEBRTC_VIDEO_CODEC_OK;
}
int H264VideoToolboxDecoder::ResetDecompressionSession() { int H264VideoToolboxDecoder::ResetDecompressionSession() {
DestroyDecompressionSession(); DestroyDecompressionSession();

2
webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h
View File

@ -43,8 +43,6 @@ class H264VideoToolboxDecoder : public H264Decoder {
int Release() override; int Release() override;
int Reset() override;
const char* ImplementationName() const override; const char* ImplementationName() const override;
private: private: