From e76676a7233fee6a3b7043443dda2bdbfe06703e Mon Sep 17 00:00:00 2001 From: Jorg Schuler Date: Sat, 8 Sep 2007 15:15:57 +0000 Subject: * src/db-image-parser.c src/itdb_device.c src/ithumb-writer.c src/db-image-parser.h src/itdb_device.h src/itdb.h src/itdb_artwork.c tests/test-covers.c: added support to read and write coverart on iPhones. New cover formats are: MEDIUM, XLARGE, XSMALL, SMEDIUM -- should be renamed if function becomes clearer. Introduced New image formats for the thumbnails (THUMB_FORMAT_RGB555, THUMB_FORMAT_REC_RGB555). Coding/decoding functions are pack_/unpack_RGB_555() and pack_/unpack_REC_RGB_555(). Introduced possible padding for thumbnail files (Itdb_ArtworkFormat). * src/db-artwork-parser.c: make output filename unique. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1691 f01d2545-417e-4e96-918e-98f8d0dbbcb6 --- src/itdb_device.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/itdb_device.c') diff --git a/src/itdb_device.c b/src/itdb_device.c index cc78dcf..21d09dc 100644 --- a/src/itdb_device.c +++ b/src/itdb_device.c @@ -213,7 +213,7 @@ static const Itdb_ArtworkFormat ipod_photo_artwork_info[] = { {ITDB_THUMB_PHOTO_SMALL, 42, 30, 1009, THUMB_FORMAT_RGB565_LE}, {ITDB_THUMB_PHOTO_LARGE, 130, 88, 1015, THUMB_FORMAT_RGB565_LE}, {ITDB_THUMB_PHOTO_FULL_SCREEN,220, 176, 1013, THUMB_FORMAT_RGB565_BE_90}, - {ITDB_THUMB_PHOTO_TV_SCREEN, 720, 480, 1019, THUMB_FORMAT_UYVY}, + {ITDB_THUMB_PHOTO_TV_SCREEN, 720, 480, 1019, THUMB_FORMAT_UYVY_BE}, {-1, -1, -1, -1, -1} }; @@ -231,7 +231,7 @@ static const Itdb_ArtworkFormat ipod_video_artwork_info[] = { {ITDB_THUMB_PHOTO_SMALL, 50, 41, 1036, THUMB_FORMAT_RGB565_LE}, {ITDB_THUMB_PHOTO_LARGE, 130, 88, 1015, THUMB_FORMAT_RGB565_LE}, {ITDB_THUMB_PHOTO_FULL_SCREEN,320, 240, 1024, THUMB_FORMAT_RGB565_LE}, - {ITDB_THUMB_PHOTO_TV_SCREEN, 720, 480, 1019, THUMB_FORMAT_UYVY}, + {ITDB_THUMB_PHOTO_TV_SCREEN, 720, 480, 1019, THUMB_FORMAT_UYVY_BE}, {-1, -1, -1, -1, -1} }; @@ -241,6 +241,16 @@ static const Itdb_ArtworkFormat ipod_mobile_1_artwork_info[] = { {-1, -1, -1, -1, -1} }; +static const Itdb_ArtworkFormat ipod_iphone_1_artwork_info[] = { + {ITDB_THUMB_COVER_LARGE, 256, 256, 3001, THUMB_FORMAT_REC_RGB555_LE}, + {ITDB_THUMB_COVER_MEDIUM, 128, 128, 3002, THUMB_FORMAT_REC_RGB555_LE}, + {ITDB_THUMB_COVER_SMALL, 64, 64, 3003, THUMB_FORMAT_REC_RGB555_LE}, + {ITDB_THUMB_COVER_XLARGE, 320, 320, 3005, THUMB_FORMAT_RGB555_LE}, + {ITDB_THUMB_COVER_XSMALL, 56, 56, 3006, THUMB_FORMAT_RGB555_LE, 8192}, /*pad data to 8192 bytes */ + {ITDB_THUMB_COVER_SMEDIUM, 88, 88, 3007, THUMB_FORMAT_RGB555_LE, 16364}, /*pad data to 16384 bytes */ + {-1, -1, -1, -1, -1} +}; + /* This will be indexed using a value from the ITDB_IPOD_MODEL enum */ static const Itdb_ArtworkFormat *ipod_artwork_info_table[] = { @@ -266,7 +276,7 @@ static const Itdb_ArtworkFormat *ipod_artwork_info_table[] = { ipod_nano_artwork_info, /* Nano (Blue) */ ipod_nano_artwork_info, /* Nano (Green) */ ipod_nano_artwork_info, /* Nano (Pink) */ - NULL, /* iPhone (1) -- FIXME! */ + ipod_iphone_1_artwork_info,/* iPhone (1) */ NULL }; -- cgit