[Mplayer-cvslog] CVS: main/libmpdemux demuxer.c,1.75,1.76

[Arpi]

Hi,

> > Modified Files:
> > 	demuxer.c 
> > Log Message:
> > 10l... it detected mpeg1/2 ps files as mpeg audio...
> 	I tried one (I should have done more check) before and it played fine, so
> 	I thougth there were no clash.
> 	But now mp3 are detected as MPEG-PS and mp3 don't play anymore.
> 	The mp3 detection should do some more check than just use
> 	mp_decode_mp3_header. But I don't know this enouth. Anyway
> 	I think we should find a trick for better mp3 detection and then reverse
> 	this.
> 		Albeu

the main problem: mpeg-ps files have mpeg audio stream (the same format as
in .mp3 files) interleaved with mpeg video. it's very hard to detect :(
i think it's still more stable to check for mpeg-ps first, and then mpeg
audio, as mp3 files has no video at all, so they can be recognized. anyway
mpeg-ps files looks like mpeg audio with some junk data (video:)) in it.

i'll check if i can fix mpeg-ps demuxer to do not recignize mp3 files.
i think it finds 00 00 01 00 code in it and it switches to mpeg-es format as
fallback :(

anyway, improving mp3 detection also needed, read at least 2-3 frames close
enough, to be sure it's a valud file and not /dev/urandom dump.


A'rpi / Astral & ESP-team

--
Developer of MPlayer, the Movie Player for Linux - http://www.MPlayerHQ.hu