From: Minje Ahn Date: Thu, 14 May 2020 02:51:47 +0000 (+0900) Subject: Remove unnecessary define X-Git-Tag: submit/tizen/20200528.061116~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a17526b9c431eaadfc4f2dcaf0cbf939fdf9a077;p=platform%2Fcore%2Fmultimedia%2Flibmm-fileinfo.git Remove unnecessary define Change-Id: Ifbd4d89cfa0e14e29b4d5e688cd07834899195b1 Signed-off-by: Minje Ahn --- diff --git a/formats/ffmpeg/mm_file_format_aac.c b/formats/ffmpeg/mm_file_format_aac.c index 8049c61..3ebb8d1 100644 --- a/formats/ffmpeg/mm_file_format_aac.c +++ b/formats/ffmpeg/mm_file_format_aac.c @@ -66,7 +66,6 @@ typedef struct _mmfile_aac_handle { AvFileContentInfo id3Handle; unsigned int streamOffset; unsigned int tagOffset; - char isTagPresent; unsigned int tagInfoSize; unsigned char tagVersion; TAacFormatType formatType; @@ -88,7 +87,6 @@ static void __aac_init_handle(tMMFILE_AAC_HANDLE *privateData) { /* Default Initializations */ privateData->streamOffset = 0; - privateData->isTagPresent = FALSE; privateData->streamOffset = 0; privateData->tagOffset = 0; @@ -156,7 +154,6 @@ static bool __search_id3tag(tMMFILE_AAC_HANDLE *pData) return false; } - pData->isTagPresent = true; pData->tagOffset = 0; pData->streamOffset = pData->tagInfoSize; diff --git a/formats/ffmpeg/mm_file_format_ffmpeg.c b/formats/ffmpeg/mm_file_format_ffmpeg.c index a063dbb..189a2ec 100644 --- a/formats/ffmpeg/mm_file_format_ffmpeg.c +++ b/formats/ffmpeg/mm_file_format_ffmpeg.c @@ -99,7 +99,7 @@ static int _mmf_mem_open(MMFmemIOHandle **handle, const char *filename) filename += strlen(MMFILE_MEM_URI); splitedString = g_strsplit(filename, ":", -1); - mm_file_retvm_if_fails(DEBUG, splitedString, MMFILE_IO_FAILED); + mm_file_retvm_if_fails(DEBUG, splitedString, MMFILE_UTIL_FAIL); if (!splitedString[0] || !splitedString[1]) { debug_error(DEBUG, "invalid param\n"); @@ -117,12 +117,12 @@ static int _mmf_mem_open(MMFmemIOHandle **handle, const char *filename) g_strfreev(splitedString); - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; exception: g_strfreev(splitedString); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } static int _mmf_mem_read(void *opaque, uint8_t *buf, int size) @@ -275,7 +275,7 @@ int mmfile_format_open_ffmpg(MMFileFormatContext *formatContext) } ret = _mmf_mem_open(&handle, formatContext->uriFileName); - if (ret != MMFILE_IO_SUCCESS) { + if (ret != MMFILE_UTIL_SUCCESS) { debug_warning(DEBUG, "failed to _mmf_mem_open.\n"); goto exception; } @@ -352,18 +352,14 @@ exception: /* fail to get content information */ static bool __check_uhqa(int sample_rate, enum AVSampleFormat sample_fmt_info) { - bool ret = FALSE; - debug_error(RELEASE, "[sample rate %d, sample format %d]", sample_rate, sample_fmt_info); if ((sample_rate >= 44100) && (sample_fmt_info >= AV_SAMPLE_FMT_S32)) { debug_msg(RELEASE, "UHQA CONTENT"); - ret = TRUE; - } else { - ret = FALSE; + return true; } - return ret; + return false; } @@ -616,46 +612,46 @@ static void __fill_metainfo_in_context(AVDictionary *metainfo, MMFileFormatConte } if (!g_ascii_strcasecmp(tag->key, "title")) { - MMFILE_SAFE_FREE(formatContext->title); + mmfile_free(formatContext->title); formatContext->title = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "artist")) { - MMFILE_SAFE_FREE(formatContext->artist); + mmfile_free(formatContext->artist); formatContext->artist = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "composer")) { - MMFILE_SAFE_FREE(formatContext->composer); + mmfile_free(formatContext->composer); formatContext->composer = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "album")) { - MMFILE_SAFE_FREE(formatContext->album); + mmfile_free(formatContext->album); formatContext->album = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "album_artist")) { - MMFILE_SAFE_FREE(formatContext->album_artist); + mmfile_free(formatContext->album_artist); formatContext->album_artist = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "copyright")) { - MMFILE_SAFE_FREE(formatContext->copyright); + mmfile_free(formatContext->copyright); formatContext->copyright = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "comment")) { - MMFILE_SAFE_FREE(formatContext->comment); + mmfile_free(formatContext->comment); formatContext->comment = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "description")) { - MMFILE_SAFE_FREE(formatContext->description); + mmfile_free(formatContext->description); formatContext->description = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "genre")) { - MMFILE_SAFE_FREE(formatContext->genre); + mmfile_free(formatContext->genre); formatContext->genre = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "date")) { - MMFILE_SAFE_FREE(formatContext->year); + mmfile_free(formatContext->year); formatContext->year = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "creation_time")) { - MMFILE_SAFE_FREE(formatContext->recDate); + mmfile_free(formatContext->recDate); formatContext->recDate = g_strdup(tag->value); } else if ((!g_ascii_strcasecmp(tag->key, "track")) || (!g_ascii_strcasecmp(tag->key, "tracknumber"))) { - MMFILE_SAFE_FREE(formatContext->tagTrackNum); + mmfile_free(formatContext->tagTrackNum); formatContext->tagTrackNum = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "lyrics")) { - MMFILE_SAFE_FREE(formatContext->unsyncLyrics); + mmfile_free(formatContext->unsyncLyrics); formatContext->unsyncLyrics = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "rotate")) { /*can be "90", "180", "270" */ - MMFILE_SAFE_FREE(formatContext->rotate); + mmfile_free(formatContext->rotate); formatContext->rotate = g_strdup(tag->value); } else if (!g_ascii_strcasecmp(tag->key, "spherical-video")) { ParseSpatialVideoMetadataFromXMLString(tag->value, formatContext); diff --git a/formats/ffmpeg/mm_file_format_frame.c b/formats/ffmpeg/mm_file_format_frame.c index 9c10e3c..220ecf3 100755 --- a/formats/ffmpeg/mm_file_format_frame.c +++ b/formats/ffmpeg/mm_file_format_frame.c @@ -75,7 +75,7 @@ static int _mmf_mem_open(MMFmemIOHandle **handle, const char *filename) filename += strlen(MMFILE_MEM_URI); splitedString = g_strsplit(filename, ":", -1); - mm_file_retvm_if_fails(DEBUG, splitedString, MMFILE_IO_FAILED); + mm_file_retvm_if_fails(DEBUG, splitedString, MMFILE_UTIL_FAIL); if (!splitedString[0] || !splitedString[1]) { debug_error(DEBUG, "invalid param\n"); @@ -93,12 +93,12 @@ static int _mmf_mem_open(MMFmemIOHandle **handle, const char *filename) g_strfreev(splitedString); - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; exception: g_strfreev(splitedString); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } static int _mmf_mem_read(void *opaque, uint8_t *buf, int size) @@ -201,7 +201,7 @@ static int __get_fileformat(const char *urifilename, int *format) ret = mmfile_open(&fp, urifilename, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); mmfile_close(fp); return MMFILE_FORMAT_FAIL; @@ -687,7 +687,7 @@ int mmfile_format_get_frame_from_memory(const void *data, unsigned int datasize, } ret = _mmf_mem_open(&handle, urifilename); - if (ret != MMFILE_IO_SUCCESS) { + if (ret != MMFILE_UTIL_SUCCESS) { debug_warning(DEBUG, "failed to _mmf_mem_open.\n"); av_free(avio_ctx_buffer); ret = MMFILE_FORMAT_FAIL; diff --git a/formats/ffmpeg/mm_file_formats.c b/formats/ffmpeg/mm_file_formats.c index 45fde03..6bbda99 100755 --- a/formats/ffmpeg/mm_file_formats.c +++ b/formats/ffmpeg/mm_file_formats.c @@ -324,7 +324,7 @@ _PreprocessFile(MMFileSourceType *fileSrc, char **urifilename, int *formatEnum) ret = mmfile_open(&fp, *urifilename, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto FILE_FORMAT_FAIL; } @@ -333,7 +333,7 @@ _PreprocessFile(MMFileSourceType *fileSrc, char **urifilename, int *formatEnum) ret = mmfile_open(&fp, *urifilename, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto FILE_FORMAT_FAIL; } diff --git a/mm_file.c b/mm_file.c index f96993a..53ad6c1 100644 --- a/mm_file.c +++ b/mm_file.c @@ -440,7 +440,7 @@ _get_contents_info(MMHandleType attrs, MMFileSourceType *src, MMFILE_PARSE_INFO if (formatContext->streams[MMFILE_AUDIO_STREAM] != NULL) parse->is_uhqa = formatContext->streams[MMFILE_AUDIO_STREAM]->is_uhqa; else - parse->is_uhqa = FALSE; + parse->is_uhqa = false; if (parse->type >= MM_FILE_PARSE_TYPE_ALL && formatContext->videoTotalTrackNum > 0) { /*why below code needed? @@ -1045,7 +1045,7 @@ int mm_file_check_uhqa(const char *filename, bool *is_uhqa) *is_uhqa = parse.is_uhqa; } else { debug_error(DEBUG, "_get_contents_info failed\n"); - *is_uhqa = FALSE; + *is_uhqa = false; } mm_attrs_free(attrs); diff --git a/tests/mm_file_test.c b/tests/mm_file_test.c index 62b31ce..0ce5490 100755 --- a/tests/mm_file_test.c +++ b/tests/mm_file_test.c @@ -592,7 +592,7 @@ static int mmfile_get_video_frame(void *data, void *accurate, bool file_test) int _frame_size = 0; int width = 0; int height = 0; - bool is_accurate = FALSE; + bool is_accurate = false; unsigned long long time_stamp = 5 * 1000 * 1000; //5sec memset(filename, 0x00, sizeof(filename)); @@ -603,12 +603,12 @@ static int mmfile_get_video_frame(void *data, void *accurate, bool file_test) if (strlen(accurate_mode) > 0) { if (strncmp(accurate_mode, "1", 1) == 0) - is_accurate = TRUE; + is_accurate = true; } printf("Extracting video frame for [%s] [%llu] accurate [%d]\n", filename, time_stamp, is_accurate); - if (file_test == TRUE) + if (file_test == true) ret = mm_file_get_video_frame(filename, time_stamp, is_accurate, (unsigned char **)&_frame, &_frame_size, &width, &height); else { unsigned int file_size = 0; diff --git a/utils/include/mm_file_utils.h b/utils/include/mm_file_utils.h index 4a10611..09e7e63 100755 --- a/utils/include/mm_file_utils.h +++ b/utils/include/mm_file_utils.h @@ -41,19 +41,6 @@ extern "C" { #define MMFILE_UTIL_FAIL -1 #define MMFILE_UTIL_SUCCESS 0 -#define MMFILE_IO_FAILED MMFILE_UTIL_FAIL -#define MMFILE_IO_SUCCESS MMFILE_UTIL_SUCCESS -#define CAST_MM_HANDLE(x) (MMHandleType)(x) - -#define MMFILE_SAFE_FREE(src) {if (src) {free(src); src = NULL; } } - -#ifndef TRUE -#define TRUE (1 == 1) -#endif -#ifndef FALSE -#define FALSE (!TRUE) -#endif - #define MM_FILE_INI_PATH "/etc/multimedia/mm_file_config.ini" @@ -182,22 +169,6 @@ char *mmfile_string_convert(const char *str, unsigned int len, const char *to_co char *MMFileUtilGetLocale(); - - -/*////////////////////////////////////////////////////////////////////// */ -/* IMAGE API // */ -/*////////////////////////////////////////////////////////////////////// */ -typedef enum { - MMFILE_PIXEL_FORMAT_YUV420 = 0, - MMFILE_PIXEL_FORMAT_YUV422 = 1, - MMFILE_PIXEL_FORMAT_RGB565 = 2, - MMFILE_PIXEL_FORMAT_RGB888 = 3, - MMFILE_PIXEL_FORMAT_MAX, -} eMMFilePixelFormat; - -int mmfile_util_image_convert(unsigned char *src, eMMFilePixelFormat src_fmt, int src_width, int src_height, unsigned char *dst, eMMFilePixelFormat dst_fmt, int dst_width, int dst_height); - - #ifdef __MMFILE_MEM_TRACE__ /*////////////////////////////////////////////////////////////////////// */ /* MEMORY DEBUG API // */ @@ -220,11 +191,6 @@ char *mmfile_string_convert_debug(const char *str, unsigned int len, const char /* TAG API // */ /*////////////////////////////////////////////////////////////////////// */ -#define MM_FILE_REVERSE_BYTE_ORDER_INT(i) ((int)((((i)&0xFF000000)>>24) | (((i)&0x00FF0000)>>8) | (((i)&0x0000FF00)<<8) | (((i)&0x000000FF)<<24))) -#define MM_FILE_REVERSE_BYTE_ORDER_SHORT(s) ((short)((((s)&0xFF00)>>8) | (((s)&0x00FF)<<8))) - -#define _STRNCPY_EX(dst, src, size) { if ((size > 0)) {strncpy((char*)(dst), (char*)(src), (size)); *((dst) + (size)) = '\0'; } } - inline static int __AvMemstr(unsigned char *mem, unsigned char *str, int str_len, int search_range) { int offset = 0; @@ -254,36 +220,30 @@ inline static int __AvMemstr(unsigned char *mem, unsigned char *str, int str_len #define MP3_TAGv2_22_TXT_HEADER_LEN 6 #define TAGV1_SEEK_GAP 10 - -typedef enum { - AV_ID3V2_PICTURE_TYPE_MIN, - AV_ID3V2_PICTURE_TYPE_OTHER = AV_ID3V2_PICTURE_TYPE_MIN, - AV_ID3V2_PICTURE_TYPE_PNG_ONLY_FILEICON, - AV_ID3V2_PICTURE_TYPE_OTHER_FILEICON, - AV_ID3V2_PICTURE_TYPE_FRONT_COVER, - AV_ID3V2_PICTURE_TYPE_BACK_COVER, - AV_ID3V2_PICTURE_TYPE_LEAFLET_PAGE, - AV_ID3V2_PICTURE_TYPE_MEDIA_SIDEOFCD, - AV_ID3V2_PICTURE_TYPE_LEAD_ARTIST, - AV_ID3V2_PICTURE_TYPE_ARTIST_PERFORMER, - AV_ID3V2_PICTURE_TYPE_CONDUCTOR, - AV_ID3V2_PICTURE_TYPE_BAND_ORCHESTRA, - AV_ID3V2_PICTURE_TYPE_COMPOSER, - AV_ID3V2_PICTURE_TYPE_LYRICIST_TEXTWRITER, - AV_ID3V2_PICTURE_TYPE_RECORDING_LOCATION, - AV_ID3V2_PICTURE_TYPE_DURING_RECORDING, - AV_ID3V2_PICTURE_TYPE_DURING_PERFORMANCE, - AV_ID3V2_PICTURE_TYPE_MOVIE_VIDEO_SCREEN_CAPTURE, - AV_ID3V2_PICTURE_TYPE_BRIGHT_COLOURED_FISH, - AV_ID3V2_PICTURE_TYPE_ILLUSTRATION, - AV_ID3V2_PICTURE_TYPE_BAND_ARTIST_LOGOTYPE, - AV_ID3V2_PICTURE_TYPE_PUBLISHER_STUDIO_LOGOTYPE, - - AV_ID3V2_PICTURE_TYPE_MAX, - AV_ID3V2_PICTURE_TYPE_UNKNOWN = AV_ID3V2_PICTURE_TYPE_MAX /* Unknown picture type */ - -} AvID3v2PictureType; - +/** + $00 Other + $01 32x32 pixels 'file icon' (PNG only) + $02 Other file icon + $03 Cover (front) + $04 Cover (back) + $05 Leaflet page + $06 Media (e.g. lable side of CD) + $07 Lead artist/lead performer/soloist + $08 Artist/performer + $09 Conductor + $0A Band/Orchestra + $0B Composer + $0C Lyricist/text writer + $0D Recording Location + $0E During recording + $0F During performance + $10 Movie/video screen capture + $11 A bright coloured fish + $12 Illustration + $13 Band/artist logotype + $14 Publisher/Studio logotype +*/ +#define MP3_ID3V2_PICTURE_TYPE_MAX 0x15 #define MP3TAGINFO_SIZE 128 /* file end 128 byte */ #define MP3_ID3_TITLE_LENGTH 30 @@ -302,8 +262,6 @@ typedef enum { #define MP3_ID3_IMAGE_DESCRIPTION_MAX_LENGTH 65 #define MP3_ID3_IMAGE_MIME_TYPE_MAX_LENGTH 31 #define MP3_ID3_IMAGE_EXT_MAX_LENGTH 4 -#define TCC_FM_PATH_MOUNT_MMC "/Mount/Mmc" - typedef enum { @@ -401,13 +359,6 @@ typedef struct { } AvFileContentInfo; -typedef struct { - int videocodec; - int audiocodec; - int width; - int height; -} AvExtraInfo; - typedef struct { unsigned long time_info; char *lyric_info; diff --git a/utils/mm_file_util_io.c b/utils/mm_file_util_io.c index 9664442..7183327 100644 --- a/utils/mm_file_util_io.c +++ b/utils/mm_file_util_io.c @@ -101,7 +101,7 @@ static int _mmfile_open(MMFileIOHandle **handle, struct MMFileIOFunc *Func, cons if (!handle || !Func || !filename || !Func->mmfile_open) { debug_error(DEBUG, "invalid param\n"); - err = MMFILE_IO_FAILED; + err = MMFILE_UTIL_FAIL; goto fail; } @@ -120,11 +120,11 @@ static int _mmfile_open(MMFileIOHandle **handle, struct MMFileIOFunc *Func, cons err = Func->mmfile_open(pHandle, filename, flags); if (err < 0) { debug_error(DEBUG, "mmfile_open: pHandle->fileName\n"); - err = MMFILE_IO_FAILED; + err = MMFILE_UTIL_FAIL; goto fail; } - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; fail: if (handle && *handle) { /* fix for prevent */ @@ -145,7 +145,7 @@ int mmfile_open(MMFileIOHandle **handle, const char *filename, int flags) if (!handle || !filename) { debug_error(DEBUG, "invalid param\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } memset(handle_str, 0x00, sizeof(handle_str)); @@ -183,7 +183,7 @@ file_handle: *handle = NULL; - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } @@ -191,11 +191,11 @@ int mmfile_read(MMFileIOHandle *handle, unsigned char *buf, int size) { int ret = 0; if (!handle) { - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } if (!handle->iofunc || !handle->iofunc->mmfile_read) { - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } ret = handle->iofunc->mmfile_read(handle, buf, size); @@ -207,11 +207,11 @@ int mmfile_write(MMFileIOHandle *handle, unsigned char *buf, int size) { int ret = 0; if (!handle) { - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } if (!handle->iofunc || !handle->iofunc->mmfile_write) { - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } ret = handle->iofunc->mmfile_write(handle, buf, size); @@ -223,7 +223,7 @@ int64_t mmfile_seek(MMFileIOHandle *handle, int64_t pos, int whence) { long long ret = 0; if (!handle || !handle->iofunc || !handle->iofunc->mmfile_seek) { - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } ret = handle->iofunc->mmfile_seek(handle, pos, whence); @@ -235,7 +235,7 @@ long long mmfile_tell(MMFileIOHandle *handle) { long long ret = 0; if (!handle || !handle->iofunc || !handle->iofunc->mmfile_tell) { - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } ret = handle->iofunc->mmfile_tell(handle); @@ -250,13 +250,13 @@ long long mmfile_get_size(MMFileIOHandle *handle) cur_pos = mmfile_tell(handle); if (cur_pos < 0) - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; if (mmfile_seek(handle, 0L, MMFILE_SEEK_SET) < 0) - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; if (mmfile_seek(handle, 0L, MMFILE_SEEK_END) < 0) - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; filesize = mmfile_tell(handle); @@ -272,7 +272,7 @@ int mmfile_close(MMFileIOHandle *handle) int ret = 0; if (!handle || !handle->iofunc || !handle->iofunc->mmfile_close) { - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } ret = handle->iofunc->mmfile_close(handle); @@ -289,7 +289,7 @@ int mmfile_register_io_func(MMFileIOFunc *iofunc) MMFileIOFunc **ptr = NULL; if (!iofunc) { - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } ptr = &first_io_func; @@ -299,7 +299,7 @@ int mmfile_register_io_func(MMFileIOFunc *iofunc) *ptr = iofunc; iofunc->next = NULL; - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; } @@ -308,7 +308,7 @@ int mmfile_register_io_all() static int initialized = 0; if (initialized) { - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } is_little_endian = _is_little_endian(); @@ -322,6 +322,6 @@ int mmfile_register_io_all() mmfile_register_io_func(&mmfile_mem_io_handler); mmfile_register_io_func(&mmfile_mmap_io_handler); - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; } diff --git a/utils/mm_file_util_io_file.c b/utils/mm_file_util_io_file.c index 255affd..37605f6 100755 --- a/utils/mm_file_util_io_file.c +++ b/utils/mm_file_util_io_file.c @@ -44,7 +44,7 @@ static int file_open(MMFileIOHandle *handle, const char *filename, int flags) if (!handle || !filename) { debug_error(DEBUG, "invalid param\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } filename += strlen(handle->iofunc->handleName) + 3; /* :// */ @@ -56,7 +56,7 @@ static int file_open(MMFileIOHandle *handle, const char *filename, int flags) fd = open(filename, access); if (fd < 0) { debug_error(DEBUG, "open error\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } privateData = g_new0(tMMFORMAT_FILEIO_DATA, 1); @@ -65,7 +65,7 @@ static int file_open(MMFileIOHandle *handle, const char *filename, int flags) privateData->offset = 0; handle->privateData = (void *)privateData; - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; } static int file_read(MMFileIOHandle *handle, unsigned char *buf, int size) @@ -76,7 +76,7 @@ static int file_read(MMFileIOHandle *handle, unsigned char *buf, int size) readSize = read(privateData->fd, buf, size); if (readSize < 0) { debug_error(RELEASE, "read\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } privateData->offset += readSize; @@ -92,7 +92,7 @@ static int file_write(MMFileIOHandle *handle, unsigned char *buf, int size) writtenSize = write(privateData->fd, buf, size); if (writtenSize < 0) { debug_error(RELEASE, "write\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } privateData->offset += writtenSize; @@ -123,10 +123,10 @@ static int file_close(MMFileIOHandle *handle) close(privateData->fd); mmfile_free(privateData); handle->privateData = NULL; - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; } - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } diff --git a/utils/mm_file_util_io_mem.c b/utils/mm_file_util_io_mem.c index 72f6b06..f5583ec 100755 --- a/utils/mm_file_util_io_mem.c +++ b/utils/mm_file_util_io_mem.c @@ -41,13 +41,13 @@ static int mmf_mem_open(MMFileIOHandle *handle, const char *filename, int flags) if (!handle || !filename || !handle->iofunc || !handle->iofunc->handleName) { debug_error(DEBUG, "invalid param\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } filename += strlen(handle->iofunc->handleName) + 3; /* ://%d:%d means (memory addr:mem size)*/ splitedString = g_strsplit(filename, ":", -1); - mm_file_retvm_if_fails(DEBUG, splitedString, MMFILE_IO_FAILED); + mm_file_retvm_if_fails(DEBUG, splitedString, MMFILE_UTIL_FAIL); if (!splitedString[0] || !splitedString[1]) { debug_error(DEBUG, "invalid param\n"); @@ -65,12 +65,12 @@ static int mmf_mem_open(MMFileIOHandle *handle, const char *filename, int flags) g_strfreev(splitedString); - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; exception: g_strfreev(splitedString); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } static int mmf_mem_read(MMFileIOHandle *h, unsigned char *buf, int size) @@ -81,14 +81,14 @@ static int mmf_mem_read(MMFileIOHandle *h, unsigned char *buf, int size) if (!h || !h->privateData || !buf || size <= 0) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } memHandle = h->privateData; if (!memHandle->ptr) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } c = memHandle->ptr + memHandle->offset; @@ -119,7 +119,7 @@ static int mmf_mem_write(MMFileIOHandle *h, unsigned char *buf, int size) if (!h || !h->privateData || !buf) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } memHandle = h->privateData; @@ -152,7 +152,7 @@ static int64_t mmf_mem_seek(MMFileIOHandle *h, int64_t pos, int whence) if (!h || !h->privateData) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } memHandle = h->privateData; @@ -168,13 +168,13 @@ static int64_t mmf_mem_seek(MMFileIOHandle *h, int64_t pos, int whence) tmp_offset = memHandle->size + pos; break; default: - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } /*check validation*/ if (tmp_offset < 0) { debug_error(DEBUG, "invalid file offset\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } /*set */ @@ -191,7 +191,7 @@ static long long mmf_mem_tell(MMFileIOHandle *h) if (!h || !h->privateData) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } memHandle = h->privateData; @@ -205,7 +205,7 @@ static int mmf_mem_close(MMFileIOHandle *h) if (!h || !h->privateData) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } memHandle = h->privateData; @@ -215,7 +215,7 @@ static int mmf_mem_close(MMFileIOHandle *h) h->privateData = NULL; } - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; } diff --git a/utils/mm_file_util_io_mmap.c b/utils/mm_file_util_io_mmap.c index b6040fc..3510df6 100755 --- a/utils/mm_file_util_io_mmap.c +++ b/utils/mm_file_util_io_mmap.c @@ -50,7 +50,7 @@ static int mmf_mmap_open(MMFileIOHandle *handle, const char *filename, int flags if (!handle || !filename || !handle->iofunc || !handle->iofunc->handleName) { debug_error(DEBUG, "invalid param\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } filename += strlen(handle->iofunc->handleName) + 3; /* :// */ @@ -92,7 +92,7 @@ static int mmf_mmap_open(MMFileIOHandle *handle, const char *filename, int flags handle->privateData = (void *) mmapHandle; - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; exception: if (mmapHandle) { @@ -108,7 +108,7 @@ exception: handle->privateData = NULL; } - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } static int mmf_mmap_read(MMFileIOHandle *h, unsigned char *buf, int size) @@ -119,7 +119,7 @@ static int mmf_mmap_read(MMFileIOHandle *h, unsigned char *buf, int size) if (!h || !h->privateData || !buf || size <= 0) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } mmapHandle = h->privateData; @@ -154,7 +154,7 @@ static int mmf_mmap_write(MMFileIOHandle *h, unsigned char *buf, int size) if (!h || !h->privateData || !buf) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } mmapHandle = h->privateData; @@ -189,7 +189,7 @@ static int64_t mmf_mmap_seek(MMFileIOHandle *h, int64_t pos, int whence) if (!h || !h->privateData) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } mmapHandle = h->privateData; @@ -205,13 +205,13 @@ static int64_t mmf_mmap_seek(MMFileIOHandle *h, int64_t pos, int whence) tmp_offset = mmapHandle->size + pos; break; default: - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } /*check validation*/ if (tmp_offset < 0) { debug_error(DEBUG, "invalid file offset\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } /*set */ @@ -228,7 +228,7 @@ static long long mmf_mmap_tell(MMFileIOHandle *h) if (!h || !h->privateData) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } mmapHandle = h->privateData; @@ -242,7 +242,7 @@ static int mmf_mmap_close(MMFileIOHandle *h) if (!h || !h->privateData) { debug_error(DEBUG, "invalid para\n"); - return MMFILE_IO_FAILED; + return MMFILE_UTIL_FAIL; } mmapHandle = h->privateData; @@ -261,7 +261,7 @@ static int mmf_mmap_close(MMFileIOHandle *h) h->privateData = NULL; - return MMFILE_IO_SUCCESS; + return MMFILE_UTIL_SUCCESS; } diff --git a/utils/mm_file_util_string.c b/utils/mm_file_util_string.c index 3a05cc5..f3be389 100755 --- a/utils/mm_file_util_string.c +++ b/utils/mm_file_util_string.c @@ -64,7 +64,7 @@ char *mmfile_get_charset(const char *str) return NULL; } - ucsdet_enableInputFilter(ucsd, TRUE); + ucsdet_enableInputFilter(ucsd, true); ucsdet_setText(ucsd, str, strlen(str), &status); if (U_FAILURE(status)) { diff --git a/utils/mm_file_util_tag.c b/utils/mm_file_util_tag.c index 956d4ff..52ef680 100644 --- a/utils/mm_file_util_tag.c +++ b/utils/mm_file_util_tag.c @@ -2456,23 +2456,23 @@ bool safe_atoi(char *buffer, int *si) if (end == buffer) { debug_error(RELEASE, "not a decimal number"); - return FALSE; + return false; } else if ('\0' != *end) { debug_error(RELEASE, "extra characters at end of input: %s", end); - return FALSE; + return false; } else if ((LONG_MIN == sl || LONG_MAX == sl) && (ERANGE == errno)) { debug_error(RELEASE, "out of range of type long"); - return FALSE; + return false; } else if (sl > INT_MAX) { debug_error(RELEASE, "greater than INT_MAX"); - return FALSE; + return false; } else if (sl < INT_MIN) { debug_error(RELEASE, "less than INT_MIN"); - return FALSE; + return false; } else { *si = (int)sl; } - return TRUE; + return true; } static bool make_characterset_array(char ***charset_array) @@ -2751,7 +2751,7 @@ static void __id3tag_parse_APIC_pictype(AvFileContentInfo *pInfo, unsigned char { /* get the picture type of Attached PICture, it is 1byte(0xff) */ - if (pTagVal[*offset] < AV_ID3V2_PICTURE_TYPE_MAX) + if (pTagVal[*offset] < MP3_ID3V2_PICTURE_TYPE_MAX) pInfo->imageInfo.pictureType = pTagVal[*offset]; else debug_msg(RELEASE, "APIC image has invalid picture type(0x%x)\n", pTagVal[*offset]); diff --git a/utils/mm_file_util_validity.c b/utils/mm_file_util_validity.c index 85d58b5..e8e321b 100755 --- a/utils/mm_file_util_validity.c +++ b/utils/mm_file_util_validity.c @@ -65,7 +65,7 @@ int MMFileFormatIsValidMP3(MMFileIOHandle *pFileIO, const char *mmfileuri, int f if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -179,7 +179,7 @@ int MMFileFormatIsValidAAC(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -295,7 +295,7 @@ int MMFileFormatIsValidOGG(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); ret = 0; goto exit; @@ -378,7 +378,7 @@ int MMFileFormatIsValidMID(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -446,7 +446,7 @@ int MMFileFormatIsValidWAV(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -495,7 +495,7 @@ int MMFileFormatIsValidMP4(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -554,7 +554,7 @@ int MMFileFormatIsValidAVI(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -599,7 +599,7 @@ int MMFileFormatIsValidASF(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -664,7 +664,7 @@ int MMFileFormatIsValidMMF(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -710,7 +710,7 @@ int MMFileFormatIsValidIMY(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -757,7 +757,7 @@ int MMFileFormatIsValidAMR(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -806,7 +806,7 @@ int MMFileFormatIsValidMatroska(MMFileIOHandle *pFileIO, const char *mmfileuri, const char * probe_data[2] = { "matroska", "webm" }; if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -904,7 +904,7 @@ int MMFileFormatIsValidFLAC(MMFileIOHandle *pFileIO, const char *mmfileuri, int if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -948,7 +948,7 @@ int MMFileFormatIsValidFLV(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -993,7 +993,7 @@ int MMFileFormatIsValidREAL(MMFileIOHandle *pFileIO, const char *mmfileuri, int if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -1046,7 +1046,7 @@ int MMFileFormatIsValidMPEGTS(MMFileIOHandle *pFileIO, const char *mmfileuri, in if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -1090,7 +1090,7 @@ int MMFileFormatIsValidMPEGPS(MMFileIOHandle *pFileIO, const char *mmfileuri, in if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -1134,7 +1134,7 @@ int MMFileFormatIsValidMPEGAUDIO(MMFileIOHandle *pFileIO, const char *mmfileuri, if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -1178,7 +1178,7 @@ int MMFileFormatIsValidMPEGVIDEO(MMFileIOHandle *pFileIO, const char *mmfileuri, if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -1222,7 +1222,7 @@ int MMFileFormatIsValidAIFF(MMFileIOHandle *pFileIO, const char *mmfileuri, int if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; } @@ -1263,7 +1263,7 @@ int MMFileFormatIsValidAPE(MMFileIOHandle *pFileIO, const char *mmfileuri, int d if (fp == NULL) { ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { + if (ret == MMFILE_UTIL_FAIL) { debug_error(DEBUG, "error: mmfile_open\n"); goto exit; }