RIO-8970: Fixing media scanner inappropriate removal of media files (https://review...

[android-x86/external-opencore.git] / android / mediascanner.cpp

diff --git a/android/mediascanner.cpp b/android/mediascanner.cpp
index 3579c35..735b0c9 100644 (file)
--- a/android/mediascanner.cpp
+++ b/android/mediascanner.cpp
@@ -18,6 +18,7 @@
 
 
 #include <media/mediascanner.h>
+#include <private/media/VideoFrame.h>
 #include <stdio.h>
 
 
@@ -81,8 +82,9 @@ MediaScanner::~MediaScanner()
     free(mLocale);
 }
 
-static PVMFStatus parseMP3(const char *filename, MediaScannerClient& client)
+static PVMFStatus parseID3Tag(const char *filename, MediaScannerClient& client)
 {
+    // This method parses the ID3 tags in a source file.
     PVID3ParCom pvId3Param;
     PVFile fileHandle;
     Oscl_FileServer iFs;
@@ -363,19 +365,15 @@ static PVMFStatus parseMP4(const char *filename, MediaScannerClient& client)
                 uint32 trackType = mp4Input->getTrackMediaType(tracks[i]);
                 OSCL_HeapString<OsclMemAllocator> streamtype;
                 mp4Input->getTrackMIMEType(tracks[i], streamtype);
-                char streamtypeutf8[128];
-        strncpy (streamtypeutf8, streamtype.get_str(), streamtype.get_size());
-                if (streamtypeutf8[0])
-        {                                                                           
-                    if (strcmp(streamtypeutf8,"FORMATUNKNOWN") != 0) {
-                            if (trackType ==  MEDIA_TYPE_AUDIO) {
-                                hasAudio = true;
-                            } else if (trackType ==  MEDIA_TYPE_VISUAL) {
-                                hasVideo = true;
-                            }
-                    } else {
-                        //LOGI("@@@@@@@@ %100s: %s\n", filename, streamtypeutf8);
+
+                if (!(streamtype == "FORMATUNKNOWN")) {
+                    if (trackType ==  MEDIA_TYPE_AUDIO) {
+                        hasAudio = true;
+                    } else if (trackType ==  MEDIA_TYPE_VISUAL) {
+                        hasVideo = true;
                     }
+                } else {
+                    //LOGI("@@@@@@@@ %100s: %s\n", filename, streamtypeutf8);
                 }
             }
 
@@ -544,47 +542,55 @@ static PVMFStatus parseASF(const char *filename, MediaScannerClient& client)
     value = retriever->extractMetadata(METADATA_KEY_CD_TRACK_NUMBER);
     if (value)
         client.addStringTag("track-info/track-number", value);
-
+    value = retriever->extractMetadata(METADATA_KEY_DURATION);
+    if (value) {
+        client.addStringTag("duration",value);
+        LOGE("Duration Value %s for \n",value);
+    }
     retriever->disconnect();
     return PVMFSuccess;
 }
 
 status_t MediaScanner::processFile(const char *path, const char* mimeType, MediaScannerClient& client)
 {
-    status_t result;
+    status_t result = PVMFSuccess;
     int error = 0;
     InitializeForThread();
-    
+
     OSCL_TRY(error,
-            client.setLocale(mLocale);
-            client.beginFile();
-            
-            //LOGD("processFile %s mimeType: %s\n", path, mimeType);
-            const char* extension = strrchr(path, '.');
-
-            if (extension && strcasecmp(extension, ".mp3") == 0) {
-                result = parseMP3(path, client);
-            } else if (extension &&
-                (strcasecmp(extension, ".mp4") == 0 || strcasecmp(extension, ".m4a") == 0 ||
-                 strcasecmp(extension, ".3gp") == 0 || strcasecmp(extension, ".3gpp") == 0 ||
-                 strcasecmp(extension, ".3g2") == 0 || strcasecmp(extension, ".3gpp2") == 0)) {
-                result = parseMP4(path, client);
-            } else if (extension && strcasecmp(extension, ".ogg") == 0) {
-                result = parseOgg(path, client);
-            } else if (extension &&
-                ( strcasecmp(extension, ".mid") == 0 || strcasecmp(extension, ".smf") == 0
-                || strcasecmp(extension, ".imy") == 0)) {
-                result = parseMidi(path, client);
-            } else if (extension &&
-                (strcasecmp(extension, ".wma") == 0 || strcasecmp(extension, ".wmv") == 0 ||
-                     strcasecmp(extension, ".asf") == 0 )) { 
-                    result = parseASF(path, client);   
-            } else {
-                result = PVMFFailure;
-            }
+        client.setLocale(mLocale);
+        client.beginFile();
+
+        //LOGD("processFile %s mimeType: %s\n", path, mimeType);
+        const char* extension = strrchr(path, '.');
+
+        if (extension &&
+           (strcasecmp(extension, ".mp3") == 0 || strcasecmp(extension, ".aac") == 0)) {
+            // Both mp3 and aac files use ID3 tags to hold metadata
+            result = parseID3Tag(path, client);
+        } else if (extension &&
+            (strcasecmp(extension, ".mp4") == 0 || strcasecmp(extension, ".m4a") == 0 ||
+             strcasecmp(extension, ".3gp") == 0 || strcasecmp(extension, ".3gpp") == 0 ||
+             strcasecmp(extension, ".3g2") == 0 || strcasecmp(extension, ".m4b") == 0 || 
+               strcasecmp(extension, ".3gpp2") == 0)) {
+            result = parseMP4(path, client);
+        } else if (extension && strcasecmp(extension, ".ogg") == 0) {
+            result = parseOgg(path, client);
+        } else if (extension &&
+            (strcasecmp(extension, ".mid") == 0 || strcasecmp(extension, ".smf") == 0 || 
+             strcasecmp(extension, ".imy") == 0)) {
+            result = parseMidi(path, client);
+        } else if (extension &&
+            (strcasecmp(extension, ".wma") == 0 || strcasecmp(extension, ".wmv") == 0 ||
+             strcasecmp(extension, ".asf") == 0 || strcasecmp(extension, ".amr") == 0 || 
+             strcasecmp(extension, ".wav") == 0 || strcasecmp(extension, ".awb") == 0)) {
+            result = parseASF(path, client);   
+        } else {
+            result = PVMFFailure;
+        }
             client.endFile();
-            );
-    
+        );
+
     OSCL_FIRST_CATCH_ANY( error,LOGV("OSCL_LEAVE happened in processFile Exit with failure");return PVMFFailure);
     return result;
 }
@@ -618,6 +624,10 @@ status_t MediaScanner::doProcessDirectory(char *path, int pathRemaining, const c
         strcpy(fileSpot, ".nomedia");
         if (access(path, F_OK) == 0) {
             LOGD("found .nomedia, skipping directory\n");
+            // restore path
+            fileSpot[0] = 0;
+            // notify client
+            client.addNoMediaFolder(path);
             return OK;
         }
 
@@ -835,6 +845,32 @@ static char* extractM4AAlbumArt(int fd)
     return result;
 }
 
+static char* extractASFAlbumArt(int fd)
+{
+    struct stat asfbuf;
+    char *data = NULL;
+    sp<MediaMetadataRetriever> retriever = new MediaMetadataRetriever();
+    if ((retriever == NULL) && (0 != (fstat(fd,&asfbuf)))) {
+        return data;
+    }
+    retriever->setMode( 1 /*MediaMetadataRetriever.MODE_GET_METADATA_ONLY*/);
+    status_t status = retriever->setDataSource(fd,0,asfbuf.st_size);
+    if (status == NO_ERROR) {
+        sp<IMemory> bitmap = retriever->extractAlbumArt();
+        if (bitmap != NULL) {
+            MediaAlbumArt *albumArtCopy = static_cast<MediaAlbumArt *>(bitmap->pointer());
+            data = (char*)malloc(albumArtCopy->mSize + 4);
+            if (data && albumArtCopy->mData) {
+                long *len = (long*)data;
+                *len = albumArtCopy->mSize;
+                albumArtCopy->mData = (uint8_t *)albumArtCopy + sizeof(MediaAlbumArt);
+                memcpy(data + 4, (const char*)albumArtCopy->mData, *len);
+            }
+        }
+    }
+    retriever->disconnect();
+    return data;
+}
 
 char* MediaScanner::extractAlbumArt(int fd)
 {
@@ -851,7 +887,10 @@ char* MediaScanner::extractAlbumArt(int fd)
                 // some kind of mpeg 4 stream
                 lseek(fd, 0, SEEK_SET);
                 albumArtData = extractM4AAlbumArt(fd);
-            } else {
+            }else if (ident == 0x11CF668E) {
+                lseek(fd, 0, SEEK_SET);
+                albumArtData = extractASFAlbumArt(fd);
+            }else {
                 // might be mp3
                 albumArtData = extractMP3AlbumArt(fd);
             }