From: jiyong.min Date: Mon, 2 Sep 2019 23:55:12 +0000 (+0900) Subject: Improve 'MMFileFormatIsValidXXX' function to reduce DC X-Git-Tag: accepted/tizen/unified/20190904.224430^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0911852abdda74015b06335a6667700196bdeddd;p=platform%2Fcore%2Fmultimedia%2Flibmm-fileinfo.git Improve 'MMFileFormatIsValidXXX' function to reduce DC Change-Id: Id9ba66477f0b8766db1b33efb8d09bbb805b3b51 --- diff --git a/utils/mm_file_util_validity.c b/utils/mm_file_util_validity.c index 5d0b7d3..b800227 100755 --- a/utils/mm_file_util_validity.c +++ b/utils/mm_file_util_validity.c @@ -667,42 +667,7 @@ exit: EXPORT_API int MMFileFormatIsValidWMA(MMFileIOHandle *pFileIO, const char *mmfileuri, int dummy) { -#define _MMFILE_ASF_HEADER_LENGTH 16 - MMFileIOHandle *fp = pFileIO; - unsigned char buffer[_MMFILE_ASF_HEADER_LENGTH] = {0, }; - int readed = 0; - int ret = 0; - - if (fp == NULL) { - ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { - debug_error(DEBUG, "error: mmfile_open\n"); - goto exit; - } - } - - mmfile_seek(fp, 0L, MMFILE_SEEK_SET); - - readed = mmfile_read(fp, buffer, _MMFILE_ASF_HEADER_LENGTH); - - if (_MMFILE_ASF_HEADER_LENGTH != readed) { - debug_error(RELEASE, "read error. size = %d. Maybe end of file.\n", readed); - - ret = 0; - goto exit; - } - - if (1 == _MMFileIsASFHeader(buffer)) { - debug_msg(RELEASE, "Header Detected\n"); - ret = 1; - goto exit; - } - -exit: - if (pFileIO == NULL && fp != NULL) - mmfile_close(fp); - - return ret; + return MMFileFormatIsValidASF(pFileIO, mmfileuri, dummy); } @@ -713,41 +678,7 @@ exit: EXPORT_API int MMFileFormatIsValidWMV(MMFileIOHandle *pFileIO, const char *mmfileuri, int dummy) { -#define _MMFILE_ASF_HEADER_LENGTH 16 - MMFileIOHandle *fp = pFileIO; - unsigned char buffer[_MMFILE_ASF_HEADER_LENGTH] = {0, }; - int readed = 0; - int ret = 0; - - if (fp == NULL) { - ret = mmfile_open(&fp, mmfileuri, MMFILE_RDONLY); - if (ret == MMFILE_IO_FAILED) { - debug_error(DEBUG, "error: mmfile_open\n"); - goto exit; - } - } - - mmfile_seek(fp, 0L, MMFILE_SEEK_SET); - - readed = mmfile_read(fp, buffer, _MMFILE_ASF_HEADER_LENGTH); - - if (_MMFILE_ASF_HEADER_LENGTH != readed) { - debug_error(RELEASE, "read error. size = %d. Maybe end of file.\n", readed); - ret = 0; - goto exit; - } - - if (1 == _MMFileIsASFHeader(buffer)) { - debug_msg(RELEASE, "Header Detected\n"); - ret = 1; - goto exit; - } - -exit: - if (pFileIO == NULL && fp != NULL) - mmfile_close(fp); - - return ret; + return MMFileFormatIsValidASF(pFileIO, mmfileuri, dummy); }