From a768ca13f4a634a888a71b7fdb339b14569aa3b0 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Wed, 18 Jan 2012 08:52:16 +0000 Subject: [PATCH] Removed dead code. BUG=C-10062, C-10063, C-10064, C-10065, C-10393, C-10394. Review URL: https://webrtc-codereview.appspot.com/343013 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1448 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/vie_channel_manager.cc | 4 - src/video_engine/vie_file_impl.cc | 123 ++++++++++-------------- src/video_engine/vie_file_recorder.cc | 3 +- src/video_engine/vie_render_impl.cc | 4 - 4 files changed, 50 insertions(+), 84 deletions(-) diff --git a/src/video_engine/vie_channel_manager.cc b/src/video_engine/vie_channel_manager.cc index 16b8b31074..62822dbe11 100644 --- a/src/video_engine/vie_channel_manager.cc +++ b/src/video_engine/vie_channel_manager.cc @@ -301,10 +301,6 @@ int ViEChannelManager::SetVoiceEngine(VoiceEngine* voice_engine) { WEBRTC_TRACE(kTraceError, kTraceVideo, ViEId(engine_id_), "%s Can't get audio sync interface from VoiceEngine.", __FUNCTION__); - - if (sync_interface) { - sync_interface->Release(); - } return -1; } } diff --git a/src/video_engine/vie_file_impl.cc b/src/video_engine/vie_file_impl.cc index c4f1376437..5a885ad57c 100644 --- a/src/video_engine/vie_file_impl.cc +++ b/src/video_engine/vie_file_impl.cc @@ -531,47 +531,35 @@ int ViEFileImpl::GetRenderSnapshot(const int video_channel, return -1; } - const int JPEG_FORMAT = 0; - int format = JPEG_FORMAT; - switch (format) { - case JPEG_FORMAT: { - // JPEGEncoder writes the jpeg file for you (no control over it) and does - // not return you the buffer. Thus, we are not going to be writing to the - // disk here. - JpegEncoder jpeg_encoder; - RawImage input_image; - if (jpeg_encoder.SetFileName(file_nameUTF8) == -1) { - WEBRTC_TRACE(kTraceError, kTraceVideo, instance_id_, - "\tCould not open output file '%s' for writing!", - file_nameUTF8); - return -1; - } + // JPEGEncoder writes the jpeg file for you (no control over it) and does + // not return you the buffer. Thus, we are not going to be writing to the + // disk here. + JpegEncoder jpeg_encoder; + RawImage input_image; + if (jpeg_encoder.SetFileName(file_nameUTF8) == -1) { + WEBRTC_TRACE(kTraceError, kTraceVideo, instance_id_, + "\tCould not open output file '%s' for writing!", + file_nameUTF8); + return -1; + } - input_image._width = video_frame.Width(); - input_image._height = video_frame.Height(); - video_frame.Swap(input_image._buffer, input_image._length, - input_image._size); + input_image._width = video_frame.Width(); + input_image._height = video_frame.Height(); + video_frame.Swap(input_image._buffer, input_image._length, + input_image._size); - if (jpeg_encoder.Encode(input_image) == -1) { - WEBRTC_TRACE(kTraceError, kTraceVideo, instance_id_, - "\tCould not encode i420 -> jpeg file '%s' for writing!", - file_nameUTF8); - if (input_image._buffer) { - delete [] input_image._buffer; - } - return -1; - } + if (jpeg_encoder.Encode(input_image) == -1) { + WEBRTC_TRACE(kTraceError, kTraceVideo, instance_id_, + "\tCould not encode i420 -> jpeg file '%s' for writing!", + file_nameUTF8); + if (input_image._buffer) { delete [] input_image._buffer; input_image._buffer = NULL; - break; - } - default: { - WEBRTC_TRACE(kTraceError, kTraceFile, instance_id_, - "\tUnsupported file format for %s", __FUNCTION__); - return -1; - break; } + return -1; } + delete [] input_image._buffer; + input_image._buffer = NULL; return 0; } @@ -619,50 +607,37 @@ int ViEFileImpl::GetCaptureDeviceSnapshot(const int capture_id, return -1; } - const int JPEG_FORMAT = 0; - int format = JPEG_FORMAT; - switch (format) { - case JPEG_FORMAT: { - // JPEGEncoder writes the jpeg file for you (no control over it) and does - // not return you the buffer Thusly, we are not going to be writing to the - // disk here. - JpegEncoder jpeg_encoder; - RawImage input_image; - input_image._width = video_frame.Width(); - input_image._height = video_frame.Height(); - video_frame.Swap(input_image._buffer, input_image._length, - input_image._size); + // JPEGEncoder writes the jpeg file for you (no control over it) and does + // not return you the buffer Thusly, we are not going to be writing to the + // disk here. + JpegEncoder jpeg_encoder; + RawImage input_image; + input_image._width = video_frame.Width(); + input_image._height = video_frame.Height(); + video_frame.Swap(input_image._buffer, input_image._length, + input_image._size); - if (jpeg_encoder.SetFileName(file_nameUTF8) == -1) { - WEBRTC_TRACE(kTraceError, kTraceVideo, instance_id_, - "\tCould not open output file '%s' for writing!", - file_nameUTF8); + if (jpeg_encoder.SetFileName(file_nameUTF8) == -1) { + WEBRTC_TRACE(kTraceError, kTraceVideo, instance_id_, + "\tCould not open output file '%s' for writing!", + file_nameUTF8); - if (input_image._buffer) { - delete [] input_image._buffer; - } - return -1; - } - if (jpeg_encoder.Encode(input_image) == -1) { - WEBRTC_TRACE(kTraceError, kTraceVideo, instance_id_, - "\tCould not encode i420 -> jpeg file '%s' for " - "writing!", file_nameUTF8); - if (input_image._buffer) { - delete [] input_image._buffer; - } - return -1; - } + if (input_image._buffer) { delete [] input_image._buffer; - input_image._buffer = NULL; - break; - } - default: { - WEBRTC_TRACE(kTraceError, kTraceFile, instance_id_, - "\tUnsupported file format for %s", __FUNCTION__); - return -1; - break; } + return -1; } + if (jpeg_encoder.Encode(input_image) == -1) { + WEBRTC_TRACE(kTraceError, kTraceVideo, instance_id_, + "\tCould not encode i420 -> jpeg file '%s' for " + "writing!", file_nameUTF8); + if (input_image._buffer) { + delete [] input_image._buffer; + } + return -1; + } + delete [] input_image._buffer; + input_image._buffer = NULL; return 0; } diff --git a/src/video_engine/vie_file_recorder.cc b/src/video_engine/vie_file_recorder.cc index 7dc6ff743e..c2f8fa0ed6 100644 --- a/src/video_engine/vie_file_recorder.cc +++ b/src/video_engine/vie_file_recorder.cc @@ -88,6 +88,7 @@ int ViEFileRecorder::StartRecording(const char* file_nameUTF8, audio_codec_inst.plfreq * 16 }; switch (audio_source) { + // case NO_AUDIO is checked above. case MICROPHONE: error = voe_file_interface_->StartRecordingMicrophone( this, &engine_audio_codec_inst); @@ -96,8 +97,6 @@ int ViEFileRecorder::StartRecording(const char* file_nameUTF8, error = voe_file_interface_->StartRecordingPlayout( audio_channel, this, &engine_audio_codec_inst); break; - case NO_AUDIO: - break; default: assert(!"Unknown audio_source"); } diff --git a/src/video_engine/vie_render_impl.cc b/src/video_engine/vie_render_impl.cc index 4675ba9f2d..c669803f51 100644 --- a/src/video_engine/vie_render_impl.cc +++ b/src/video_engine/vie_render_impl.cc @@ -158,8 +158,6 @@ int ViERenderImpl::AddRenderer(const int render_id, void* window, } return frame_provider->RegisterFrameCallback(render_id, renderer); } - SetLastError(kViERenderInvalidRenderId); - return -1; } int ViERenderImpl::RemoveRenderer(const int render_id) { @@ -386,8 +384,6 @@ int ViERenderImpl::AddRenderer(const int render_id, } return frame_provider->RegisterFrameCallback(render_id, renderer); } - SetLastError(kViERenderInvalidRenderId); - return -1; } } // namespace webrtc