Merge change 8673 into donutandroid-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1donut-release2donut-releasedonut

* changes:
  Redo perforce change 126665-p9, which fixed an issue with songs purchased from the iTunes music store, but was lost in opencore 2.0.

1 files changed, 6 insertions, 0 deletions

diff --git a/fileformats/mp4/parser/src/itunesilstatom.cpp b/fileformats/mp4/parser/src/itunesilstatom.cpp
index 6bdfa9936..6d6ad1929 100644
--- a/fileformats/mp4/parser/src/itunesilstatom.cpp
+++ b/fileformats/mp4/parser/src/itunesilstatom.cpp
@@ -1941,6 +1941,11 @@ ITunesILSTAtom::ITunesILSTAtom(MP4_FF_FILE *fp, uint32 size, uint32 type): Atom(
                 count -= _pITunesEncodedByAtom->getSize();
         }
 
+#if 0
+/* Disable this code for now, as there is an off-by-X bug in the free form atom
+ * parsing that causes subsequent atoms to be misparsed, which makes us not see
+ * metadata for some files purchased from the itunes music store
+ */
         else if (atomType == ITUNES_FREE_FORM_ATOM)
         {
 
@@ -2180,6 +2185,7 @@ ITunesILSTAtom::ITunesILSTAtom(MP4_FF_FILE *fp, uint32 size, uint32 type): Atom(
             } //End of While
 
         }
+#endif
         else if (atomType == ITUNES_ALBUM_ATOM)
         {
             PV_MP4_FF_NEW(fp->auditCB, ITunesAlbumAtom, (fp, atomsize, atomType), _pITunesAlbumAtom);