diff options
author | SeokHoon Lee <andy.shlee@samsung.com> | 2017-09-27 20:10:23 +0900 |
---|---|---|
committer | SeokHoon Lee <andy.shlee@samsung.com> | 2017-09-27 20:10:41 +0900 |
commit | 88f340b457d435edde8755b766bfc17f4dd9c5a6 (patch) | |
tree | 3c650f8609ea1d5a3fe63585af40432f8218070b | |
parent | 9a6bb44de682767f101bf53b21b263b7b6d4484b (diff) | |
download | mediastreamrecorder-88f340b457d435edde8755b766bfc17f4dd9c5a6.tar.gz mediastreamrecorder-88f340b457d435edde8755b766bfc17f4dd9c5a6.tar.bz2 mediastreamrecorder-88f340b457d435edde8755b766bfc17f4dd9c5a6.zip |
delete dupulicate NULL check
- StreamRecorder handle is checked in capi(streamrecorder.c) already.
Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I48f51997ebaad173d59bbfbdd6b06c1f9789c697
-rw-r--r-- | packaging/capi-media-streamrecorder.spec | 2 | ||||
-rw-r--r-- | src/streamrecorder_private.c | 164 |
2 files changed, 1 insertions, 165 deletions
diff --git a/packaging/capi-media-streamrecorder.spec b/packaging/capi-media-streamrecorder.spec index 375b7ef..22a6fb8 100644 --- a/packaging/capi-media-streamrecorder.spec +++ b/packaging/capi-media-streamrecorder.spec @@ -1,6 +1,6 @@ Name: capi-media-streamrecorder Summary: A Streamrecorder library in Tizen Native API -Version: 0.0.18 +Version: 0.0.19 Release: 0 Group: Multimedia/Other License: Apache-2.0 diff --git a/src/streamrecorder_private.c b/src/streamrecorder_private.c index 49255aa..dcbb017 100644 --- a/src/streamrecorder_private.c +++ b/src/streamrecorder_private.c @@ -27,7 +27,6 @@ #include <fcntl.h> -#define LOWSET_DECIBEL -300.0 int __convert_streamrecorder_error_code(const char *func, int code) { @@ -161,8 +160,6 @@ static int _streamrecorder_check_and_set_attribute(streamrecorder_h recorder, co int _streamrecorder_set_videosource_buffer(streamrecorder_h recorder) { int ret = STREAMRECORDER_ERROR_NONE; - if (recorder == NULL) - return STREAMRECORDER_ERROR_INVALID_PARAMETER; streamrecorder_s *handle = (streamrecorder_s *)recorder; @@ -181,8 +178,6 @@ int _streamrecorder_set_videosource_buffer(streamrecorder_h recorder) int _streamrecorder_set_audiosource_buffer(streamrecorder_h recorder) { int ret = STREAMRECORDER_ERROR_NONE; - if (recorder == NULL) - return STREAMRECORDER_ERROR_INVALID_PARAMETER; streamrecorder_s *handle; handle = (streamrecorder_s *) recorder; @@ -202,10 +197,6 @@ int _streamrecorder_get_state(streamrecorder_h recorder, streamrecorder_state_e int ret = STREAMRECORDER_ERROR_NONE; MMStreamRecorderStateType srstate; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } if (state == NULL) { LOGE("NULL pointer state"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -213,7 +204,6 @@ int _streamrecorder_get_state(streamrecorder_h recorder, streamrecorder_state_e streamrecorder_s *handle = (streamrecorder_s *)recorder; - ret = mm_streamrecorder_get_state(handle->mm_handle, &srstate); if (ret != MM_ERROR_NONE) return __convert_streamrecorder_error_code(__func__, ret); @@ -228,10 +218,6 @@ int _streamrecorder_destroy(streamrecorder_h recorder) streamrecorder_s *handle = NULL; int ret = MM_ERROR_NONE; streamrecorder_state_e state = STREAMRECORDER_STATE_NONE; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } handle = (streamrecorder_s *)recorder; @@ -262,10 +248,6 @@ int _streamrecorder_prepare(streamrecorder_h recorder) streamrecorder_s *handle = (streamrecorder_s *)recorder; streamrecorder_state_e state = STREAMRECORDER_STATE_NONE; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } ret = streamrecorder_get_state(recorder, &state); if (ret != MM_ERROR_NONE) return __convert_streamrecorder_error_code(__func__, ret); @@ -290,11 +272,6 @@ int _streamrecorder_unprepare(streamrecorder_h recorder) streamrecorder_s *handle = (streamrecorder_s *)recorder; streamrecorder_state_e state = STREAMRECORDER_STATE_NONE; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - ret = streamrecorder_get_state(recorder, &state); if (ret != MM_ERROR_NONE) return __convert_streamrecorder_error_code(__func__, ret); @@ -317,11 +294,6 @@ int _streamrecorder_start(streamrecorder_h recorder) streamrecorder_s *handle = (streamrecorder_s *)recorder; streamrecorder_state_e state = STREAMRECORDER_STATE_NONE; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - ret = streamrecorder_get_state(recorder, &state); if (ret != MM_ERROR_NONE) return __convert_streamrecorder_error_code(__func__, ret); @@ -340,11 +312,6 @@ int _streamrecorder_pause(streamrecorder_h recorder) streamrecorder_s *handle = (streamrecorder_s *)recorder; streamrecorder_state_e state = STREAMRECORDER_STATE_NONE; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - ret = streamrecorder_get_state(recorder, &state); if (ret != MM_ERROR_NONE) return __convert_streamrecorder_error_code(__func__, ret); @@ -364,11 +331,6 @@ int _streamrecorder_commit(streamrecorder_h recorder) streamrecorder_s *handle = (streamrecorder_s *)recorder; streamrecorder_state_e state = STREAMRECORDER_STATE_NONE; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - ret = streamrecorder_get_state(recorder, &state); if (ret != MM_ERROR_NONE) return __convert_streamrecorder_error_code(__func__, ret); @@ -387,11 +349,6 @@ int _streamrecorder_cancel(streamrecorder_h recorder) streamrecorder_s *handle = (streamrecorder_s *)recorder; streamrecorder_state_e state = STREAMRECORDER_STATE_NONE; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - ret = streamrecorder_get_state(recorder, &state); if (ret != MM_ERROR_NONE) return __convert_streamrecorder_error_code(__func__, ret); @@ -409,11 +366,6 @@ int _streamrecorder_set_video_framerate(streamrecorder_h recorder , int framerat int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - ret = mm_streamrecorder_set_attributes(handle->mm_handle, NULL, MMSTR_VIDEO_FRAMERATE, framerate, NULL); @@ -427,11 +379,6 @@ int _streamrecorder_get_video_framerate(streamrecorder_h recorder, int *framerat int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (framerate == NULL) return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -475,10 +422,6 @@ int _streamrecorder_set_video_resolution(streamrecorder_h recorder, int width, i streamrecorder_s *handle = (streamrecorder_s *)recorder; streamrecorder_state_e state = STREAMRECORDER_STATE_NONE; - if (handle == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } streamrecorder_get_state(recorder, &state); if (state > STREAMRECORDER_STATE_CREATED) { LOGE("STREAMRECORDER_ERROR_INVALID_STATE (state:%d)", state); @@ -501,12 +444,6 @@ int _streamrecorder_get_video_resolution(streamrecorder_h recorder, int *width, int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (!handle) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - - if (!width || !height) { LOGE("NULL pointer width = [%p], height = [%p]", width, height); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -525,12 +462,6 @@ int _streamrecorder_foreach_supported_video_resolution(streamrecorder_h recorder int ret = MM_ERROR_NONE; streamrecorder_s * handle = (streamrecorder_s *)recorder; - if (!handle) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - - if (!foreach_cb) { LOGE("NULL pointer callback"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -558,11 +489,6 @@ int _streamrecorder_set_filename(streamrecorder_h recorder, const char *filenam int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (filename == NULL) { LOGE("filename is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -587,11 +513,6 @@ int _streamrecorder_get_filename(streamrecorder_h recorder, char **filename) int record_filename_size; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (filename == NULL) { LOGE("filename is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -617,10 +538,6 @@ int _streamrecorder_set_file_format(streamrecorder_h recorder, streamrecorder_fi MM_FILE_FORMAT_AAC, /* STREAMRECORDER_FILE_FORMAT_ADTS */ MM_FILE_FORMAT_WAV, /* STREAMRECORDER_FILE_FORMAT_WAV */ }; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } if (format > STREAMRECORDER_FILE_FORMAT_WAV) { LOGE("invalid format %d", format); @@ -636,11 +553,6 @@ int _streamrecorder_get_file_format(streamrecorder_h recorder, streamrecorder_fi streamrecorder_s *handle = (streamrecorder_s *)recorder; int mm_format; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (format == NULL) { LOGE("format is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -682,10 +594,6 @@ int _streamrecorder_foreach_supported_file_format(streamrecorder_h recorder, str streamrecorder_s *handle = (streamrecorder_s *)recorder; int format; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } if (foreach_cb == NULL) { LOGE("NULL pointer foreach_cb"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -732,11 +640,6 @@ int _streamrecorder_set_size_limit(streamrecorder_h recorder, int kbyte) int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (kbyte < 0) return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -751,11 +654,6 @@ int _streamrecorder_set_time_limit(streamrecorder_h recorder, int second) int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("NULL pointer handle"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (second < 0) return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -772,11 +670,6 @@ int _streamrecorder_set_audio_encoder(streamrecorder_h recorder, streamrecorder_ MM_AUDIO_CODEC_WAVE /* STREAMRECORDER_AUDIO_CODEC_PCM */ }; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (codec > STREAMRECORDER_AUDIO_CODEC_PCM) { LOGE("invalid parameter : codec %d", codec); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -792,11 +685,6 @@ int _streamrecorder_get_audio_encoder(streamrecorder_h recorder, streamrecorder_ int audio_enable = 0; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (codec == NULL) { LOGE("codec is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -837,12 +725,6 @@ int _streamrecorder_set_video_encoder(streamrecorder_h recorder, streamrecorder_ }; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (handle == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - - if (codec > STREAMRECORDER_VIDEO_CODEC_MPEG4) { LOGE("invalid codec %d", codec); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -861,10 +743,6 @@ int _streamrecorder_get_video_encoder(streamrecorder_h recorder, streamrecorder_ int video_enable = 0; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (handle == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } if (codec == NULL) { LOGE("codec is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -921,11 +799,6 @@ int _streamrecorder_set_video_encoder_bitrate(streamrecorder_h recorder, int bit int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (handle == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (bitrate < 0) { LOGE("Invalid bitrate %d", bitrate); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -941,11 +814,6 @@ int _streamrecorder_get_size_limit(streamrecorder_h recorder, int *kbyte) int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (kbyte == NULL) { LOGE("Size limit is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -961,11 +829,6 @@ int _streamrecorder_get_time_limit(streamrecorder_h recorder, int *second) int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (second == NULL) { LOGE("Time limit is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -982,11 +845,6 @@ int _streamrecorder_get_audio_samplerate(streamrecorder_h recorder, int *sampler int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (samplerate == NULL) { LOGE("samplerate is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -1004,11 +862,6 @@ int _streamrecorder_get_audio_encoder_bitrate(streamrecorder_h recorder, int *bi int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (bitrate == NULL) { LOGE("bitrate is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -1026,11 +879,6 @@ int _streamrecorder_get_video_encoder_bitrate(streamrecorder_h recorder, int *bi int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (handle == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } - if (bitrate == NULL) return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -1047,10 +895,6 @@ int _streamrecorder_foreach_supported_audio_encoder(streamrecorder_h recorder, s int codec; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } if (foreach_cb == NULL) { LOGE("foreach_cb is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -1091,10 +935,6 @@ int _streamrecorder_foreach_supported_video_encoder(streamrecorder_h recorder, s int codec; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (handle == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } if (foreach_cb == NULL) { LOGE("foreach_cb is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; @@ -1142,10 +982,6 @@ int _streamrecorder_get_audio_channel(streamrecorder_h recorder, int *channel_co int ret = MM_ERROR_NONE; streamrecorder_s *handle = (streamrecorder_s *)recorder; - if (recorder == NULL) { - LOGE("handle is NULL"); - return STREAMRECORDER_ERROR_INVALID_PARAMETER; - } if (channel_count == NULL) { LOGE("channel_count is NULL"); return STREAMRECORDER_ERROR_INVALID_PARAMETER; |