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

* Improve WMA DLNA profile parsing.

Browse Source
This commit is contained in:
Justin Maggard
2011-05-17 00:25:03 +00:00
parent 595eaf5168
commit 5782be8ab2
3 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
tagutils/tagutils-asf.c
View File

@ -39,6 +39,29 @@ _asf_read_file_properties(FILE *fp, asf_file_properties_t *p, __u32 size)
return 0;
}
static void
_pick_dlna_profile(struct song_metadata *psong, uint16_t format)
{
/* DLNA Profile Name */
switch( le16_to_cpu(format) )
{
case WMA:
if( psong->max_bitrate < 193000 )
asprintf(&(psong->dlna_pn), "WMABASE");
else if( psong->max_bitrate < 385000 )
asprintf(&(psong->dlna_pn), "WMAFULL");
break;
case WMAPRO:
asprintf(&(psong->dlna_pn), "WMAPRO");
break;
case WMALSL:
asprintf(&(psong->dlna_pn), "WMALSL%s",
psong->channels > 2 ? "_MULT5" : "");
default:
break;
}
}
static int
_asf_read_audio_stream(FILE *fp, struct song_metadata *psong, int size)
{
@ -55,24 +78,9 @@ _asf_read_audio_stream(FILE *fp, struct song_metadata *psong, int size)
psong->channels = le16_to_cpu(s.wfx.nChannels);
psong->bitrate = le32_to_cpu(s.wfx.nAvgBytesPerSec) * 8;
psong->samplerate = le32_to_cpu(s.wfx.nSamplesPerSec);
/* DLNA Profile Name */
switch( le16_to_cpu(s.wfx.wFormatTag) )
{
case WMAV1:
case WMAV2:
if( (psong->bitrate/1000+1) >= 385 || psong->samplerate > 48000 )
asprintf(&(psong->dlna_pn), "WMAPRO");
else if( ((psong->bitrate+1) / 1000) <= 192 )
asprintf(&(psong->dlna_pn), "WMABASE");
else
asprintf(&(psong->dlna_pn), "WMAFULL");
break;
case WMAPRO:
asprintf(&(psong->dlna_pn), "WMAPRO");
break;
default:
break;
}
if (!psong->max_bitrate)
psong->max_bitrate = psong->bitrate;
_pick_dlna_profile(psong, s.wfx.wFormatTag);
return 0;
}
@ -101,25 +109,11 @@ _asf_read_media_stream(FILE *fp, struct song_metadata *psong, __u32 size)
psong->channels = le16_to_cpu(wfx.nChannels);
psong->bitrate = le32_to_cpu(wfx.nAvgBytesPerSec) * 8;
psong->samplerate = le32_to_cpu(wfx.nSamplesPerSec);
/* DLNA Profile Name */
switch( le16_to_cpu(wfx.wFormatTag) )
{
case WMAV1:
case WMAV2:
if( (psong->bitrate/1000+1) >= 385 || psong->samplerate > 48000 )
asprintf(&(psong->dlna_pn), "WMAPRO");
else if( (psong->bitrate / 1000)+1 < 192 )
asprintf(&(psong->dlna_pn), "WMABASE");
else
asprintf(&(psong->dlna_pn), "WMAFULL");
break;
case WMAPRO:
asprintf(&(psong->dlna_pn), "WMAPRO");
break;
default:
break;
}
if (!psong->max_bitrate)
psong->max_bitrate = psong->bitrate;
_pick_dlna_profile(psong, wfx.wFormatTag);
}
return 0;
}
@ -448,6 +442,7 @@ _get_asffileinfo(char *file, struct song_metadata *psong)
_asf_read_file_properties(fp, &FileProperties, tmp.Size);
psong->song_length = le64_to_cpu(FileProperties.PlayDuration) / 10000;
psong->bitrate = le64_to_cpu(FileProperties.MaxBitrate);
psong->max_bitrate = psong->bitrate;
}
else if(IsEqualGUID(&tmp.ID, &ASF_ContentDescription))
{