storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix a couple DLNA HTTP header errors with resized images.

Browse Source
This commit is contained in:
Justin Maggard
2009-09-02 01:59:49 +00:00
parent 7f8d3ff7bb
commit bd0aabf933
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
upnphttp.c
View File

@ -1274,6 +1274,7 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
char sql_buf[256]; char sql_buf[256];
char **result; char **result;
char date[30]; char date[30];
char dlna_pn[4];
time_t curtime = time(NULL); time_t curtime = time(NULL);
int width=640, height=480, dstw, dsth, rotation, size; int width=640, height=480, dstw, dsth, rotation, size;
unsigned char * data; unsigned char * data;
@ -1399,17 +1400,24 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
imdst = image_resize(imsrc, dstw, dsth); imdst = image_resize(imsrc, dstw, dsth);
data = image_save_to_jpeg_buf(imdst, &size); data = image_save_to_jpeg_buf(imdst, &size);
DPRINTF(E_INFO, L_HTTP, "size: %d\n", size); if( dstw <= 640 && dsth <= 480 )
strcpy(dlna_pn, "SM");
else if( dstw <= 1024 && dsth <= 768 )
strcpy(dlna_pn, "MED");
else
strcpy(dlna_pn, "LRG");
//DPRINTF(E_INFO, L_HTTP, "size: %d\n", size);
strftime(date, 30,"%a, %d %b %Y %H:%M:%S GMT" , gmtime(&curtime)); strftime(date, 30,"%a, %d %b %Y %H:%M:%S GMT" , gmtime(&curtime));
snprintf(header, sizeof(header)-50, "%s 200 OK\r\n" snprintf(header, sizeof(header)-50, "HTTP/1.1 200 OK\r\n"
"Content-Type: image/jpeg\r\n" "Content-Type: image/jpeg\r\n"
"Content-Length: %d\r\n" "Content-Length: %d\r\n"
"Connection: close\r\n" "Connection: close\r\n"
"Date: %s\r\n" "Date: %s\r\n"
"EXT:\r\n" "EXT:\r\n"
"contentFeatures.dlna.org: DLNA.ORG_PN=JPEG_TN\r\n" "contentFeatures.dlna.org: DLNA.ORG_PN=JPEG_%s\r\n"
"Server: " MINIDLNA_SERVER_STRING "\r\n", "Server: " MINIDLNA_SERVER_STRING "\r\n",
h->HttpVer, size, date); size, date, dlna_pn);
if( h->reqflags & FLAG_XFERINTERACTIVE ) if( h->reqflags & FLAG_XFERINTERACTIVE )
{ {