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

* Add generic DLNA client type detection and caching, and don't use DLNA-specific MIME types if the client doesn't support DLNA.

Browse Source
This commit is contained in:
Justin Maggard 2009-05-01 19:36:43 +00:00
parent 35352221b2
commit 401da95831
5 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
minidlnatypes.h
View File

@ -31,7 +31,8 @@ enum media_types {
enum client_types { enum client_types {
EXbox = 1, EXbox = 1,
EPS3, EPS3,
ESamsungTV ESamsungTV,
EUnknownClient
}; };
struct media_dir_s { struct media_dir_s {
@ -48,6 +49,7 @@ struct album_art_name_s {
struct client_cache_s { struct client_cache_s {
struct in_addr addr; struct in_addr addr;
enum client_types type; enum client_types type;
u_int32_t flags;
time_t age; time_t age;
}; };

9
upnphttp.c
View File

@ -215,10 +215,17 @@ intervening space) by either an integer or the keyword "infinite". */
else if(strncmp(p, "PLAYSTATION", 11)==0) else if(strncmp(p, "PLAYSTATION", 11)==0)
{ {
h->req_client = EPS3; h->req_client = EPS3;
h->reqflags |= FLAG_DLNA;
} }
else if(strncmp(p, "SamsungWiselinkPro", 18)==0) else if(strncmp(p, "SamsungWiselinkPro", 18)==0)
{ {
h->req_client = ESamsungTV; h->req_client = ESamsungTV;
h->reqflags |= FLAG_DLNA;
}
else if(strcasestr(p, "DLNADOC/"))
{
h->req_client = EUnknownClient;
h->reqflags |= FLAG_DLNA;
} }
} }
else if(strncasecmp(line, "Transfer-Encoding", 17)==0) else if(strncasecmp(line, "Transfer-Encoding", 17)==0)
@ -311,10 +318,12 @@ intervening space) by either an integer or the keyword "infinite". */
} }
} }
clients[n].type = h->req_client; clients[n].type = h->req_client;
clients[n].flags = h->reqflags & 0xFFF00000;
clients[n].age = time(NULL); clients[n].age = time(NULL);
} }
else if( n >= 0 ) else if( n >= 0 )
{ {
h->reqflags |= clients[n].flags;
h->req_client = clients[n].type; h->req_client = clients[n].type;
} }
} }

30
upnphttp.h
View File

@ -54,7 +54,7 @@ struct upnphttp {
long long int req_RangeStart; long long int req_RangeStart;
long long int req_RangeEnd; long long int req_RangeEnd;
long int req_chunklen; long int req_chunklen;
int reqflags; u_int32_t reqflags;
int respflags; int respflags;
/* response */ /* response */
char * res_buf; char * res_buf;
@ -65,21 +65,23 @@ struct upnphttp {
LIST_ENTRY(upnphttp) entries; LIST_ENTRY(upnphttp) entries;
}; };
#define FLAG_TIMEOUT 0x01 #define FLAG_TIMEOUT 0x00000001
#define FLAG_SID 0x02 #define FLAG_SID 0x00000002
#define FLAG_RANGE 0x04 #define FLAG_RANGE 0x00000004
#define FLAG_HOST 0x08 #define FLAG_HOST 0x00000008
#define FLAG_HTML 0x80 #define FLAG_HTML 0x00000080
#define FLAG_INVALID_REQ 0x10 #define FLAG_INVALID_REQ 0x00000010
#define FLAG_CHUNKED 0x0100 #define FLAG_CHUNKED 0x00000100
#define FLAG_TIMESEEK 0x0200 #define FLAG_TIMESEEK 0x00000200
#define FLAG_REALTIMEINFO 0x0400 #define FLAG_REALTIMEINFO 0x00000400
#define FLAG_PLAYSPEED 0x0800 #define FLAG_PLAYSPEED 0x00000800
#define FLAG_XFERSTREAMING 0x1000 #define FLAG_XFERSTREAMING 0x00001000
#define FLAG_XFERINTERACTIVE 0x2000 #define FLAG_XFERINTERACTIVE 0x00002000
#define FLAG_XFERBACKGROUND 0x4000 #define FLAG_XFERBACKGROUND 0x00004000
#define FLAG_DLNA 0x00100000
/* New_upnphttp() */ /* New_upnphttp() */
struct upnphttp * struct upnphttp *

13
upnpsoap.c
View File

@ -445,6 +445,9 @@ callback(void *args, int argc, char **argv, char **azColName)
strcpy(dlna_buf, "*"); strcpy(dlna_buf, "*");
if( strncmp(class, "item", 4) == 0 ) if( strncmp(class, "item", 4) == 0 )
{
/* We may need special handling for MIME types */
if( strncmp(mime, "video", 5) == 0 )
{ {
switch( passed_args->client ) switch( passed_args->client )
{ {
@ -463,6 +466,14 @@ callback(void *args, int argc, char **argv, char **azColName)
default: default:
break; break;
} }
if( !(passed_args->flags & FLAG_DLNA) )
{
if( strcmp(mime+6, "vnd.dlna.mpeg-tts") == 0 )
{
strcpy(mime+6, "mpeg");
}
}
}
ret = sprintf(str_buf, "<item id=\"%s\" parentID=\"%s\" restricted=\"1\"", id, parent); ret = sprintf(str_buf, "<item id=\"%s\" parentID=\"%s\" restricted=\"1\"", id, parent);
memcpy(passed_args->resp+passed_args->size, &str_buf, ret+1); memcpy(passed_args->resp+passed_args->size, &str_buf, ret+1);
passed_args->size += ret; passed_args->size += ret;
@ -720,6 +731,7 @@ BrowseContentDirectory(struct upnphttp * h, const char * action)
args.returned = 0; args.returned = 0;
args.requested = RequestedCount; args.requested = RequestedCount;
args.client = h->req_client; args.client = h->req_client;
args.flags = h->reqflags;
if( h->req_client == EXbox ) if( h->req_client == EXbox )
{ {
if( strcmp(ObjectId, "16") == 0 ) if( strcmp(ObjectId, "16") == 0 )
@ -848,6 +860,7 @@ SearchContentDirectory(struct upnphttp * h, const char * action)
args.returned = 0; args.returned = 0;
args.requested = RequestedCount; args.requested = RequestedCount;
args.client = h->req_client; args.client = h->req_client;
args.flags = h->reqflags;
if( h->req_client == EXbox ) if( h->req_client == EXbox )
{ {
if( strcmp(ContainerID, "4") == 0 ) if( strcmp(ContainerID, "4") == 0 )

1
upnpsoap.h
View File

@ -22,6 +22,7 @@ struct Response
int requested; int requested;
int size; int size;
u_int32_t filter; u_int32_t filter;
u_int32_t flags;
enum client_types client; enum client_types client;
}; };