* Better support DLNA profiles on a couple media types.

* Handle AAC files without optional extended header data in the esds atom.
This commit is contained in:
Justin Maggard
2009-05-30 04:31:18 +00:00
parent e65e367b06
commit 7e32fcbdb5
3 changed files with 63 additions and 23 deletions

View File

@ -61,7 +61,9 @@ _asf_read_audio_stream(FILE *fp, struct song_metadata *psong, int size)
{
case WMAV1:
case WMAV2:
if( psong->bitrate < 193000 )
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");
@ -105,7 +107,9 @@ _asf_read_media_stream(FILE *fp, struct song_metadata *psong, __u32 size)
{
case WMAV1:
case WMAV2:
if( psong->bitrate < 193000 )
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");