projects
/
platform
/
core
/
multimedia
/
libmm-camcorder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[libmm-camcorder] g_free and g_printf function fixes
[platform/core/multimedia/libmm-camcorder.git]
/
src
/
mm_camcorder_audiorec.c
diff --git
a/src/mm_camcorder_audiorec.c
b/src/mm_camcorder_audiorec.c
index
c005178
..
4cfbb72
100644
(file)
--- a/
src/mm_camcorder_audiorec.c
+++ b/
src/mm_camcorder_audiorec.c
@@
-408,7
+408,7
@@
_mmcamcorder_audio_command(MMHandleType handle, int command)
goto _ERR_CAMCORDER_AUDIO_COMMAND;
}
goto _ERR_CAMCORDER_AUDIO_COMMAND;
}
- info->filename = strdup(temp_filename);
+ info->filename =
g_
strdup(temp_filename);
if (!info->filename) {
_mmcam_dbg_err("STRDUP was failed");
goto _ERR_CAMCORDER_AUDIO_COMMAND;
if (!info->filename) {
_mmcam_dbg_err("STRDUP was failed");
goto _ERR_CAMCORDER_AUDIO_COMMAND;
@@
-541,8
+541,7
@@
_mmcamcorder_audio_command(MMHandleType handle, int command)
if (info->filename) {
_mmcam_dbg_log("file delete(%s)", info->filename);
unlink(info->filename);
if (info->filename) {
_mmcam_dbg_log("file delete(%s)", info->filename);
unlink(info->filename);
- g_free(info->filename);
- info->filename = NULL;
+ SAFE_G_FREE(info->filename);
}
break;
}
break;
@@
-655,7
+654,7
@@
int _mmcamcorder_audio_handle_eos(MMHandleType handle)
/* Send recording report message to application */
msg.id = MM_MESSAGE_CAMCORDER_AUDIO_CAPTURED;
/* Send recording report message to application */
msg.id = MM_MESSAGE_CAMCORDER_AUDIO_CAPTURED;
- report = (MMCamRecordingReport*) malloc(sizeof(MMCamRecordingReport));
+ report = (MMCamRecordingReport*)
g_
malloc(sizeof(MMCamRecordingReport));
if (!report) {
_mmcam_dbg_err("Recording report fail(%s). Out of memory.", info->filename);
return FALSE;
if (!report) {
_mmcam_dbg_err("Recording report fail(%s). Out of memory.", info->filename);
return FALSE;
@@
-668,7
+667,7
@@
int _mmcamcorder_audio_handle_eos(MMHandleType handle)
}
/* END TAG HERE */
}
/* END TAG HERE */
- report->recording_filename = strdup(info->filename);
+ report->recording_filename =
g_
strdup(info->filename);
msg.param.data= report;
_mmcamcorder_send_message(handle, &msg);
msg.param.data= report;
_mmcamcorder_send_message(handle, &msg);
@@
-686,8
+685,7
@@
int _mmcamcorder_audio_handle_eos(MMHandleType handle)
sc->isMaxsizePausing = FALSE;
sc->isMaxtimePausing = FALSE;
sc->isMaxsizePausing = FALSE;
sc->isMaxtimePausing = FALSE;
- g_free(info->filename);
- info->filename = NULL;
+ SAFE_G_FREE(info->filename);
_mmcam_dbg_err("_MMCamcorder_CMD_COMMIT : end");
_mmcam_dbg_err("_MMCamcorder_CMD_COMMIT : end");
@@
-737,7
+735,7
@@
__mmcamcorder_get_decibel(unsigned char* raw, int size, MMCamcorderAudioFormat f
}
if (count > 0) {
}
if (count > 0) {
- rms = sqrt(
square_sum/
count );
+ rms = sqrt(
(double)square_sum/(double)
count );
if (depthByte == 1) {
db = 20 * log10( rms/MAX_AMPLITUDE_MEAN_08BIT );
} else {
if (depthByte == 1) {
db = 20 * log10( rms/MAX_AMPLITUDE_MEAN_08BIT );
} else {
@@
-1049,7
+1047,6
@@
static gboolean __mmcamcorder_audio_add_metadata_info_m4a(MMHandleType handle)
gint64 udta_pos = 0;
// supporting audio geo tag for mobile
int gps_enable = 0;
gint64 udta_pos = 0;
// supporting audio geo tag for mobile
int gps_enable = 0;
- char *err_name = NULL;
gdouble longitude = 0;
gdouble latitude = 0;
gdouble altitude = 0;
gdouble longitude = 0;
gdouble latitude = 0;
gdouble altitude = 0;
@@
-1069,12
+1066,12
@@
static gboolean __mmcamcorder_audio_add_metadata_info_m4a(MMHandleType handle)
mmf_return_val_if_fail(sc->info_audio, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
info = sc->info_audio;
mmf_return_val_if_fail(sc->info_audio, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
info = sc->info_audio;
- mm_camcorder_get_attributes(handle,
&err_name
,
+ mm_camcorder_get_attributes(handle,
NULL
,
MMCAM_TAG_GPS_ENABLE, &gps_enable,
NULL);
if (gps_enable) {
MMCAM_TAG_GPS_ENABLE, &gps_enable,
NULL);
if (gps_enable) {
- mm_camcorder_get_attributes(handle,
&err_name
,
+ mm_camcorder_get_attributes(handle,
NULL
,
MMCAM_TAG_LATITUDE, &latitude,
MMCAM_TAG_LONGITUDE, &longitude,
MMCAM_TAG_ALTITUDE, &altitude,
MMCAM_TAG_LATITUDE, &latitude,
MMCAM_TAG_LONGITUDE, &longitude,
MMCAM_TAG_ALTITUDE, &altitude,
@@
-1091,10
+1088,6
@@
static gboolean __mmcamcorder_audio_add_metadata_info_m4a(MMHandleType handle)
if (f == NULL) {
strerror_r(errno, err_msg, 128);
_mmcam_dbg_err("file open failed [%s]", err_msg);
if (f == NULL) {
strerror_r(errno, err_msg, 128);
_mmcam_dbg_err("file open failed [%s]", err_msg);
- if (err_name) {
- free(err_name);
- err_name = NULL;
- }
return FALSE;
}
return FALSE;
}
@@
-1184,27
+1177,16
@@
static gboolean __mmcamcorder_audio_add_metadata_info_m4a(MMHandleType handle)
}
fclose(f);
}
fclose(f);
- if (err_name) {
- free(err_name);
- err_name = NULL;
- }
+
return TRUE;
fail:
fclose(f);
return TRUE;
fail:
fclose(f);
- if (err_name) {
- free(err_name);
- err_name = NULL;
- }
return FALSE;
ftell_fail:
_mmcam_dbg_err("ftell() returns negative value.");
fclose(f);
return FALSE;
ftell_fail:
_mmcam_dbg_err("ftell() returns negative value.");
fclose(f);
- if (err_name) {
- free(err_name);
- err_name = NULL;
- }
return FALSE;
}
return FALSE;
}