DO NOT MERGE, Already merged to master.

1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data.

3 files changed, 8 insertions, 14 deletions

diff --git a/android/mediascanner.cpp b/android/mediascanner.cpp
index 521e66a5d..f778217c5 100644
--- a/android/mediascanner.cpp
+++ b/android/mediascanner.cpp
@@ -281,10 +281,10 @@ static PVMFStatus reportM4ATags(IMpeg4File *mp4Input, MediaScannerClient& client
         }
     }
 
-    // Writer/Composer
+    // Writer
     if (oscl_UnicodeToUTF8(mp4Input->getITunesWriter().get_cstr(),
         mp4Input->getITunesWriter().get_size(),buffer,sizeof(buffer)) > 0)
-        if (!client.addStringTag("composer", buffer)) goto failure;
+        if (!client.addStringTag("writer", buffer)) goto failure;
 
     // Track Data
     trackNum = mp4Input->getITunesThisTrackNo();
diff --git a/android/metadatadriver.cpp b/android/metadatadriver.cpp
index f0c299b21..dd2caf10f 100644
--- a/android/metadatadriver.cpp
+++ b/android/metadatadriver.cpp
@@ -31,7 +31,7 @@ using namespace android;
 const char* MetadataDriver::ALBUM_ART_KEY = "graphic";
 
 const char* MetadataDriver::METADATA_KEYS[NUM_METADATA_KEYS] = {
-        "tracknumber",
+        "track-info/track-number",
         "album",
         "artist",
         "author",
@@ -52,6 +52,7 @@ const char* MetadataDriver::METADATA_KEYS[NUM_METADATA_KEYS] = {
         "track-info/video/format",
         "track-info/video/height",
         "track-info/video/width",
+        "writer",
 };
 
 static void dumpkeystolog(PVPMetadataList list)
@@ -219,8 +220,6 @@ status_t MetadataDriver::extractMetadata(const char* key, char* value, uint32 va
                         return UNKNOWN_ERROR;
                     }
                     oscl_snprintf(value, length, "%s", mMetadataValueList[i].value.pChar_value);
-                    value[length] = '\0';
-                    LOGV("value of char: %s.", mMetadataValueList[i].value.pChar_value);
                     break;
                 }
                 case PVMI_KVPVALTYPE_WCHARPTR: {
@@ -230,43 +229,38 @@ status_t MetadataDriver::extractMetadata(const char* key, char* value, uint32 va
                         return UNKNOWN_ERROR;
                     }
                     length = oscl_UnicodeToUTF8(mMetadataValueList[i].value.pWChar_value, length, value, valueLength);
-                    value[length] = '\0';
-                    LOGV("value of wchar: %ls.", mMetadataValueList[i].value.pWChar_value);
                     break;
                 }
                 case PVMI_KVPVALTYPE_UINT32:
                     oscl_snprintf(value, valueLength, "%d", mMetadataValueList[i].value.uint32_value);
-                    value[valueLength] = '\0';
                     break;
 
                 case PVMI_KVPVALTYPE_INT32:
                     oscl_snprintf(value, valueLength, "%d", mMetadataValueList[i].value.int32_value);
-                    value[valueLength] = '\0';
                     break;
 
                 case PVMI_KVPVALTYPE_UINT8:
                     oscl_snprintf(value, valueLength, "%d", mMetadataValueList[i].value.uint8_value);
-                    value[valueLength] = '\0';
                     break;
 
                 case PVMI_KVPVALTYPE_FLOAT:
                     oscl_snprintf(value, valueLength, "%f", mMetadataValueList[i].value.float_value);
-                    value[valueLength] = '\0';
                     break;
 
                 case PVMI_KVPVALTYPE_DOUBLE:
                     oscl_snprintf(value, valueLength, "%f", mMetadataValueList[i].value.double_value);
-                    value[valueLength] = '\0';
                     break;
 
                 case PVMI_KVPVALTYPE_BOOL:
                     oscl_snprintf(value, valueLength, "%s", mMetadataValueList[i].value.bool_value? "true": "false");
-                    value[valueLength] = '\0';
                     break;
 
                 default:
                     return UNKNOWN_ERROR;
             }
+
+            LOGV("value is: %s.", value);
+
             break;
         }
     }
diff --git a/android/metadatadriver.h b/android/metadatadriver.h
index c0a0d462b..442a064fe 100644
--- a/android/metadatadriver.h
+++ b/android/metadatadriver.h
@@ -125,7 +125,7 @@ private:
     static const uint32 MAX_VIDEO_FRAME_SIZE = 640 * 480 * 4;  // Big enough?
     static const uint32 MAX_METADATA_STRING_LENGTH = 128;
     static const uint32 MAX_STRING_LENGTH = 512;
-    static const uint32 NUM_METADATA_KEYS = 21;
+    static const uint32 NUM_METADATA_KEYS = 22;
     static const char* METADATA_KEYS[NUM_METADATA_KEYS];
     static const char* ALBUM_ART_KEY;