fix invalid format argument types for dlog

Change-Id: Ia611bd5fccd8027d6fc3610c41562f59266543ec

diff --git a/formats/ffmpeg/mm_file_format_aac.c b/formats/ffmpeg/mm_file_format_aac.c
index f2451e6..9617245 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_aac.c
+++ b/formats/ffmpeg/mm_file_format_aac.c
@@ -208,7 +208,7 @@ int _parse_id3_tag(tMMFILE_AAC_HANDLE *pData)
        tagBuff = (unsigned char *) mmfile_malloc(hTag->fileLen);
        if (tagBuff == NULL) {
                ret = MMFILE_AAC_PARSER_FAIL;
        tagBuff = (unsigned char *) mmfile_malloc(hTag->fileLen);
        if (tagBuff == NULL) {
                ret = MMFILE_AAC_PARSER_FAIL;

-               debug_error(DEBUG, "failed to memory allocation. %d\n", hTag->fileLen);
+               debug_error(DEBUG, "failed to memory allocation. %lld\n", hTag->fileLen);

                goto failure;
        }
 
                goto failure;
        }
 


@@ -647,7 +647,7 @@ int mmfile_aacparser_get_stream_info(MMFileAACHandle handle, tMMFILE_AAC_STREAM_
                        debug_error(DEBUG, "Found corrupted frames!!! Ignoring\n");
                }
 
                        debug_error(DEBUG, "Found corrupted frames!!! Ignoring\n");
                }
 

-               debug_msg(RELEASE, "No of ADTS frames: %d\n", totalFrames);
+               debug_msg(RELEASE, "No of ADTS frames: %lld\n", totalFrames);

 
                privateData->streamInfo.frameRate = privateData->streamInfo.samplingRate / AAC_ADTS_SAMPLES_PER_FRAME;
 
 
                privateData->streamInfo.frameRate = privateData->streamInfo.samplingRate / AAC_ADTS_SAMPLES_PER_FRAME;
 

diff --git a/formats/ffmpeg/mm_file_format_frame.c b/formats/ffmpeg/mm_file_format_frame.c
index dd18fb3..65509c4 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_frame.c
+++ b/formats/ffmpeg/mm_file_format_frame.c
@@ -440,7 +440,7 @@ static int __mmfile_get_frame(AVFormatContext *pFormatCtx, double timestamp, boo
                        *frame = mmfile_malloc(*size);
 
                if (NULL == *frame) {
                        *frame = mmfile_malloc(*size);
 
                if (NULL == *frame) {

-                       debug_error(DEBUG, "error: avpicture_get_size. [%d]\n", size);
+                       debug_error(DEBUG, "error: avpicture_get_size. [%d]\n", *size);

                        ret = MMFILE_FORMAT_FAIL;
                        goto exception;
                }
                        ret = MMFILE_FORMAT_FAIL;
                        goto exception;
                }


@@ -448,7 +448,7 @@ static int __mmfile_get_frame(AVFormatContext *pFormatCtx, double timestamp, boo
                debug_msg(RELEASE, "size : %d", *size);
                debug_msg(RELEASE, "width : %d", *width);
                debug_msg(RELEASE, "height : %d", *height);
                debug_msg(RELEASE, "size : %d", *size);
                debug_msg(RELEASE, "width : %d", *width);
                debug_msg(RELEASE, "height : %d", *height);

-               debug_msg(RELEASE, "frame : %x", *frame);
+               debug_msg(RELEASE, "frame : %p", *frame);

 
                ret = avpicture_fill((AVPicture *)pFrameRGB, *frame, PIX_FMT_RGB24, *width, *height);
                if (ret < 0) {
 
                ret = avpicture_fill((AVPicture *)pFrameRGB, *frame, PIX_FMT_RGB24, *width, *height);
                if (ret < 0) {

diff --git a/formats/ffmpeg/mm_file_format_midi.c b/formats/ffmpeg/mm_file_format_midi.c
index 2977fa3..fafc988 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_midi.c
+++ b/formats/ffmpeg/mm_file_format_midi.c
@@ -1431,7 +1431,7 @@ __AvParseSkipXmf2Mid(UINT8 *pbFile, UINT32 dFSize)
                        skipVal++;
                        if (skipVal >= sizeOfpbFile) {
                                debug_error(DEBUG, "__AvParseSkipForXMF : MThd Header is not found!\n");
                        skipVal++;
                        if (skipVal >= sizeOfpbFile) {
                                debug_error(DEBUG, "__AvParseSkipForXMF : MThd Header is not found!\n");

-                               debug_error(DEBUG, "__AvParseSkipForXMF :skipVal(%d) sizeOfpbFile(%d) \n", skipVal, sizeOfpbFile);
+                               debug_error(DEBUG, "__AvParseSkipForXMF :skipVal(%lu) sizeOfpbFile(%lu) \n", skipVal, sizeOfpbFile);

                                return -1;
                        }
                }
                                return -1;
                        }
                }

diff --git a/formats/ffmpeg/mm_file_format_mmf.c b/formats/ffmpeg/mm_file_format_mmf.c
index 4864e38..43e74e4 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_mmf.c
+++ b/formats/ffmpeg/mm_file_format_mmf.c
@@ -1441,7 +1441,7 @@ _mmf_SeqDataCheck2(PTRACKINFO psTrack, unsigned char bSmafType)
        /* calculate playback time of this track        */
        psTrack->dPlayTime = psTrack->dStopTick - psTrack->dStartTick;
 
        /* calculate playback time of this track        */
        psTrack->dPlayTime = psTrack->dStopTick - psTrack->dStartTick;
 

-       debug_msg(RELEASE, "Play time: %ld\n", psTrack->dPlayTime);
+       debug_msg(RELEASE, "Play time: %u\n", psTrack->dPlayTime);

 
        return AV_MMF_FUNC_SUCCESS;
 }
 
        return AV_MMF_FUNC_SUCCESS;
 }


@@ -1600,7 +1600,7 @@ _mmf_TrackChunkCheck2(PLOADINFO psLoad)
                }
        }
 
                }
        }
 

-       debug_msg(RELEASE, "Play time: %ld\n", psLoad->dPlayTime);
+       debug_msg(RELEASE, "Play time: %u\n", psLoad->dPlayTime);

 
        return AV_MMF_FUNC_SUCCESS;
 }
 
        return AV_MMF_FUNC_SUCCESS;
 }


@@ -1864,7 +1864,7 @@ _mmf_SeqDataCheck3(PLOADINFO psLoad, unsigned char bSmafType)
        /* calculate playback time of this track        */
        psTrk->dPlayTime = psTrk->dStopTick - psTrk->dStartTick;
 
        /* calculate playback time of this track        */
        psTrk->dPlayTime = psTrk->dStopTick - psTrk->dStartTick;
 

-       debug_msg(RELEASE, "Play time: %ld\n", psTrk->dPlayTime);
+       debug_msg(RELEASE, "Play time: %u\n", psTrk->dPlayTime);

 
        return AV_MMF_FUNC_SUCCESS;
 }
 
        return AV_MMF_FUNC_SUCCESS;
 }


@@ -2142,7 +2142,7 @@ _mmf_TrackChunkCheck3(PLOADINFO psLoad)
        psLoad->dStartTime      = psTrack->dStartTick;
        psLoad->dTimeBase       = psTrack->dTimeBase;
 
        psLoad->dStartTime      = psTrack->dStartTick;
        psLoad->dTimeBase       = psTrack->dTimeBase;
 

-       debug_msg(RELEASE, "Play time: %ld\n", psLoad->dPlayTime);
+       debug_msg(RELEASE, "Play time: %u\n", psLoad->dPlayTime);

 
        return AV_MMF_FUNC_SUCCESS;
 }
 
        return AV_MMF_FUNC_SUCCESS;
 }


@@ -2264,7 +2264,7 @@ _mmf_TrackChunkCheck5(PLOADINFO psLoad)
        psLoad->dStartTime      = psTrack->dStartTick;
        psLoad->dTimeBase       = psTrack->dTimeBase;
 
        psLoad->dStartTime      = psTrack->dStartTick;
        psLoad->dTimeBase       = psTrack->dTimeBase;
 

-       debug_msg(RELEASE, "Play time: %ld\n", psLoad->dPlayTime);
+       debug_msg(RELEASE, "Play time: %u\n", psLoad->dPlayTime);

 
        return AV_MMF_FUNC_SUCCESS;
 }
 
        return AV_MMF_FUNC_SUCCESS;
 }


@@ -2552,7 +2552,7 @@ _mmf_MALoad(unsigned char *pbFile, unsigned int dFSize)
        /* check playback time                  */
        if (sdResult != AV_MMF_FUNC_SUCCESS)            return sdResult;
 
        /* check playback time                  */
        if (sdResult != AV_MMF_FUNC_SUCCESS)            return sdResult;
 

-       debug_msg(RELEASE, "SUM %ld\n", psLoad_Info->dPlayTime * psLoad_Info->dTimeBase);
+       debug_msg(RELEASE, "SUM %u\n", psLoad_Info->dPlayTime * psLoad_Info->dTimeBase);

 
        if ((psLoad_Info->dPlayTime * psLoad_Info->dTimeBase) <= AV_MMF_PLAY_TIME_MIN) {
                return AV_MMF_ERR_SLENGTH;
 
        if ((psLoad_Info->dPlayTime * psLoad_Info->dTimeBase) <= AV_MMF_PLAY_TIME_MIN) {
                return AV_MMF_ERR_SLENGTH;

diff --git a/formats/ffmpeg/mm_file_format_mp3.c b/formats/ffmpeg/mm_file_format_mp3.c
index 03b6eba..4da5c2b 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_mp3.c
+++ b/formats/ffmpeg/mm_file_format_mp3.c
@@ -872,7 +872,7 @@ __AvFindStartOfMp3Header(MMFileIOHandle *hFile,  unsigned char *buf, AvFileConte
 
                id3v2TagLen = pInfo->tagV2Info.tagLen;
 
 
                id3v2TagLen = pInfo->tagV2Info.tagLen;
 

-               debug_msg(RELEASE, "id3v2TagLen(%d)\n", id3v2TagLen);
+               debug_msg(RELEASE, "id3v2TagLen(%lu)\n", id3v2TagLen);

 
                if (id3v2TagLen) {
                        if (mmfile_seek(hFile, id3v2TagLen, SEEK_SET) < 0) {
 
                if (id3v2TagLen) {
                        if (mmfile_seek(hFile, id3v2TagLen, SEEK_SET) < 0) {


@@ -952,7 +952,7 @@ __AvFindStartOfMp3Header(MMFileIOHandle *hFile,  unsigned char *buf, AvFileConte
                                                pInfo->datafileLen = pInfo->fileLen - pInfo->headerPos;
                                                frameLen = pInfo->frameSize;
                                                if (frameLen) {
                                                pInfo->datafileLen = pInfo->fileLen - pInfo->headerPos;
                                                frameLen = pInfo->frameSize;
                                                if (frameLen) {

-                                                       debug_msg(RELEASE, "<<< frameLen=[%d] >>> \n", frameLen);
+                                                       debug_msg(RELEASE, "<<< frameLen=[%lu] >>> \n", frameLen);

 
 #ifndef __MMFILE_NEW_FRAME_FUNC /* FIXME : what purpose to do this? */
                                                        /* Account for loss of precision in the frame length calculation*/
 
 #ifndef __MMFILE_NEW_FRAME_FUNC /* FIXME : what purpose to do this? */
                                                        /* Account for loss of precision in the frame length calculation*/


@@ -1006,7 +1006,7 @@ __AvFindStartOfMp3Header(MMFileIOHandle *hFile,  unsigned char *buf, AvFileConte
                return -1;
        }
        if (index > (bufLen - minLen)) {
                return -1;
        }
        if (index > (bufLen - minLen)) {

-               debug_warning(DEBUG, "Mp3 file sync is not found : index(%d) bufLen(%d), minLen(%d)\n", index, bufLen, minLen);
+               debug_warning(DEBUG, "Mp3 file sync is not found : index(%u) bufLen(%lu), minLen(%lu)\n", index, bufLen, minLen);

                return -1;
        }
 
                return -1;
        }
 


@@ -1189,7 +1189,7 @@ static int mmf_file_mp3_get_infomation(char *filename, AvFileContentInfo *pInfo)
        } else {
                __AvGetMp3FrameSize(pInfo);
                pInfo->datafileLen = pInfo->fileLen - pInfo->headerPos;
        } else {
                __AvGetMp3FrameSize(pInfo);
                pInfo->datafileLen = pInfo->fileLen - pInfo->headerPos;

-               debug_msg(RELEASE, "Mp3 File FrameSize (%d) pInfo->headerPos(%d)\n", pInfo->frameSize, pInfo->headerPos);
+               debug_msg(RELEASE, "Mp3 File FrameSize (%d) pInfo->headerPos(%ld)\n", pInfo->frameSize, pInfo->headerPos);

        }
 
        if (mmfile_seek(hFile, -(MP3TAGINFO_SIZE + TAGV1_SEEK_GAP), SEEK_END) < 0)
        }
 
        if (mmfile_seek(hFile, -(MP3TAGINFO_SIZE + TAGV1_SEEK_GAP), SEEK_END) < 0)