Remove duplicated code and unused parameter pre_checked

Change-Id: I6118f7dabce399f4fd731ac4bede1fef4462de50

diff --git a/formats/ffmpeg/mm_file_format_aac.c b/formats/ffmpeg/mm_file_format_aac.c
index ab250ec..c2dd2c5 100644 (file)
--- a/formats/ffmpeg/mm_file_format_aac.c
+++ b/formats/ffmpeg/mm_file_format_aac.c
@@ -730,12 +730,10 @@ int mmfile_format_open_aac(MMFileFormatContext *formatContext)
                return MMFILE_FORMAT_FAIL;
        }
 
-       if (formatContext->pre_checked == 0) {
-               res = MMFileFormatIsValidAAC(NULL, formatContext->uriFileName, 0);
-               if (res == 0) {
-                       debug_error(DEBUG, "It is not AAC file\n");
-                       return MMFILE_FORMAT_FAIL;
-               }
+       res = MMFileFormatIsValidAAC(NULL, formatContext->uriFileName, 0);
+       if (res == 0) {
+               debug_error(DEBUG, "It is not AAC file\n");
+               return MMFILE_FORMAT_FAIL;
        }
 
        formatContext->ReadStream   = mmfile_format_read_stream_aac;

diff --git a/formats/ffmpeg/mm_file_format_imelody.c b/formats/ffmpeg/mm_file_format_imelody.c
index 2380946..41bfd64 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_imelody.c
+++ b/formats/ffmpeg/mm_file_format_imelody.c
@@ -107,12 +107,10 @@ int mmfile_format_open_imy(MMFileFormatContext *formatContext)
                return MMFILE_FORMAT_FAIL;
        }
 
-       if (formatContext->pre_checked == 0) {
-               ret = MMFileFormatIsValidIMY(NULL, formatContext->uriFileName, 0);
-               if (ret == 0) {
-                       debug_error(DEBUG, "It is not imelody file\n");
-                       return MMFILE_FORMAT_FAIL;
-               }
+       ret = MMFileFormatIsValidIMY(NULL, formatContext->uriFileName, 0);
+       if (ret == 0) {
+               debug_error(DEBUG, "It is not imelody file\n");
+               return MMFILE_FORMAT_FAIL;
        }
 
        formatContext->ReadStream   = mmfile_format_read_stream_imy;

diff --git a/formats/ffmpeg/mm_file_format_midi.c b/formats/ffmpeg/mm_file_format_midi.c
index d0fcd32..be9e679 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_midi.c
+++ b/formats/ffmpeg/mm_file_format_midi.c
@@ -258,12 +258,10 @@ int mmfile_format_open_mid(MMFileFormatContext *formatContext)
                return MMFILE_FORMAT_FAIL;
        }
 
-       if (formatContext->pre_checked == 0) {
-               res = MMFileFormatIsValidMID(NULL, formatContext->uriFileName, 0);
-               if (res == 0) {
-                       debug_error(DEBUG, "It is not MIDI file\n");
-                       return MMFILE_FORMAT_FAIL;
-               }
+       res = MMFileFormatIsValidMID(NULL, formatContext->uriFileName, 0);
+       if (res == 0) {
+               debug_error(DEBUG, "It is not MIDI file\n");
+               return MMFILE_FORMAT_FAIL;
        }
 
        formatContext->ReadStream   = mmfile_format_read_stream_mid;

diff --git a/formats/ffmpeg/mm_file_format_mmf.c b/formats/ffmpeg/mm_file_format_mmf.c
index 294713e..8d437b4 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_mmf.c
+++ b/formats/ffmpeg/mm_file_format_mmf.c
@@ -585,12 +585,10 @@ int mmfile_format_open_mmf(MMFileFormatContext *formatContext)
                return MMFILE_FORMAT_FAIL;
        }
 
-       if (formatContext->pre_checked == 0) {
-               ret = MMFileFormatIsValidMMF(NULL, formatContext->uriFileName, 0);
-               if (ret == 0) {
-                       debug_error(DEBUG, "error: it is not MMF file\n");
-                       return MMFILE_FORMAT_FAIL;
-               }
+       ret = MMFileFormatIsValidMMF(NULL, formatContext->uriFileName, 0);
+       if (ret == 0) {
+               debug_error(DEBUG, "error: it is not MMF file\n");
+               return MMFILE_FORMAT_FAIL;
        }
 
        formatContext->ReadStream   = mmfile_format_read_stream_mmf;

diff --git a/formats/ffmpeg/mm_file_format_mp3.c b/formats/ffmpeg/mm_file_format_mp3.c
index 4fdb3a8..8fa6d6f 100644 (file)
--- a/formats/ffmpeg/mm_file_format_mp3.c
+++ b/formats/ffmpeg/mm_file_format_mp3.c
@@ -97,15 +97,12 @@ int mmfile_format_open_mp3(MMFileFormatContext *formatContext)
                return MMFILE_FORMAT_FAIL;
        }
 
-       if (formatContext->pre_checked == 0) {
-               ret = MMFileFormatIsValidMP3(NULL, formatContext->uriFileName, 5);
-               if (ret == 0) {
-                       debug_error(DEBUG, "It is not mp3 file\n");
-                       return MMFILE_FORMAT_FAIL;
-               }
+       ret = MMFileFormatIsValidMP3(NULL, formatContext->uriFileName, 5);
+       if (ret == 0) {
+               debug_error(DEBUG, "It is not mp3 file\n");
+               return MMFILE_FORMAT_FAIL;
        }
 
-
        formatContext->ReadStream   = mmfile_format_read_stream_mp3;
        formatContext->ReadFrame    = mmfile_format_read_frame_mp3;
        formatContext->ReadTag      = mmfile_format_read_tag_mp3;

diff --git a/formats/ffmpeg/mm_file_format_wav.c b/formats/ffmpeg/mm_file_format_wav.c
index 28834fc..7d8e2a5 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_wav.c
+++ b/formats/ffmpeg/mm_file_format_wav.c
@@ -198,12 +198,10 @@ int mmfile_format_open_wav(MMFileFormatContext *formatContext)
                return MMFILE_FORMAT_FAIL;
        }
 
-       if (formatContext->pre_checked == 0) {
-               ret = MMFileFormatIsValidWAV(NULL, formatContext->uriFileName, 0);
-               if (ret == 0) {
-                       debug_error(DEBUG, "It is not wav file\n");
-                       return MMFILE_FORMAT_FAIL;
-               }
+       ret = MMFileFormatIsValidWAV(NULL, formatContext->uriFileName, 0);
+       if (ret == 0) {
+               debug_error(DEBUG, "It is not wav file\n");
+               return MMFILE_FORMAT_FAIL;
        }
 
        formatContext->ReadStream   = mmfile_format_read_stream_wav;

diff --git a/formats/ffmpeg/mm_file_formats.c b/formats/ffmpeg/mm_file_formats.c
index 2278098..6a4415f 100755 (executable)
--- a/formats/ffmpeg/mm_file_formats.c
+++ b/formats/ffmpeg/mm_file_formats.c
@@ -461,7 +461,6 @@ static int _mmfile_format_close(MMFileFormatContext *formatContext, bool clean_a
 EXPORT_API
 int mmfile_format_open(MMFileFormatContext **formatContext, MMFileSourceType *fileSrc)
 {
-       int index = 0;
        int ret = 0;
        MMFileFormatContext *formatObject = NULL;
 
@@ -485,8 +484,6 @@ int mmfile_format_open(MMFileFormatContext **formatContext, MMFileSourceType *fi
        /* parsing file extension */
        formatObject->filesrc = fileSrc;
 
-       formatObject->pre_checked = 0;  /*not yet format checked.*/
-
        /**
         * Format detect and validation check.
         */
@@ -497,17 +494,16 @@ int mmfile_format_open(MMFileFormatContext **formatContext, MMFileSourceType *fi
                goto exception;
        }
 
-       formatObject->pre_checked = 1;  /*already file format checked.*/
-
        /**
         * Open format function.
         */
+#if 0
        if (NULL == MMFileFunc[formatObject->formatType].Open) {
                debug_error(DEBUG, "error: Not implemented \n");
                ret = MMFILE_FORMAT_FAIL;
                goto find_valid_handler;
        }
-
+#endif
        ret = MMFileFunc[formatObject->formatType].Open(formatObject);
        if (MMFILE_FORMAT_FAIL == ret) {
                debug_error(DEBUG, "error: Try other formats\n");
@@ -519,6 +515,7 @@ int mmfile_format_open(MMFileFormatContext **formatContext, MMFileSourceType *fi
        *formatContext = formatObject;
        return MMFILE_FORMAT_SUCCESS;
 
+#if 0  //Below code is duplicated with _PreprocessFile()
 find_valid_handler:
        formatObject->pre_checked = 0;  /*do check file format*/
 
@@ -554,6 +551,7 @@ find_valid_handler:
        *formatContext = formatObject;
 
        return MMFILE_FORMAT_SUCCESS;
+#endif
 
 exception:
        _mmfile_format_close(formatObject, true);

diff --git a/include/mm_file_formats.h b/include/mm_file_formats.h
index 169733b..36f9634 100755 (executable)
--- a/include/mm_file_formats.h
+++ b/include/mm_file_formats.h
@@ -103,7 +103,6 @@ struct _MMFileFormatContext {
        int notsupport;
        int formatType;
        int commandType;        /* TAG or CONTENTS */
-       int pre_checked;        /*filefomat already detected.*/
 
        MMFileSourceType *filesrc;      /*ref only*/
        char *uriFileName;