[MPlayer-dev-eng] demux acc problem[patch]

[qwen dux]

the last cvs version of mplayer demuxed some aac audio files with
undetermined sequence,my aac file was demuxed with mpeg audio,here is info:
Playing /home/qwdu/media/music/aac/100percent.aac.
get_path('sub/') -> '/home/qwdu/.mplayer/sub/'
[file] File size is 691925 bytes
STREAM: [file] /home/qwdu/media/music/aac/100percent.aac
STREAM: Description: File
STREAM: Author: Albeu
STREAM: Comment: based on the code from ??? (probably Arpi)
Checking for YUV4MPEG2
ASF_check: not ASF guid!
Checking for NuppelVideo
Checking for REAL
Checking for SMJPEG
Searching demuxer type for filename
/home/qwdu/media/music/aac/100percent.aac ext: .aac
Checking for Nullsoft Streaming Video
Checking for MOV
Checking for VIVO
AVS: avs_check_file - attempting to open file
/home/qwdu/media/music/aac/100percent.aac
AVS: File is too big, aborting...
Checking for PVA
Checking for MPEG-TS...
TRIED UP TO POSITION 69681, FOUND 47, packet_size= 0, SEEMS A TS? 0
Checking for LMLM4 Stream Format
Invalid packet in LMLM4 stream: ch=65521 size=618659030
LMLM4 Stream Format not found
sync_mpeg_ps: seems to be MP3 stream...
MPEG Stream reached EOF
ds_fill_buffer: EOF reached (stream: video)
MPEG packet stats: p100: 2  p101: 0 p1B6: 0 p12x: 2 sli: 1 a: 1 b: 0 c: 0
idr: 0 sps: 0 pps: 0 PES: 16  MP3: 104, synced: 0
Not MPEG System Stream format... (maybe Transport Stream?)
Encrypted VOB file! Read DOCS/HTML/en/dvd.html.
==> Found video stream: 8
  {ERROR5,c=26}
  {ERROR5,c=22}
  {ERROR5,c=27}
  {ERROR5,c=2}
  {ERROR5,c=26}
  {ERROR5,c=26}
  {ERROR5,c=31}
  {ERROR5,c=23}
  {ERROR5,c=24}
  {ERROR5,c=26}
  {ERROR5,c=27}
  {ERROR5,c=77}
  {ERROR5,c=0}
  {ERROR5,c=26}
  {ERROR5,c=24}
  {PTS_err:1}
==> Found audio stream: 0
  {ERROR5,c=7}
  {ERROR5,c=24}
  {ERROR5,c=22}
  {ERROR5,c=25}
  {ERROR5,c=26}
  {ERROR5,c=24}
  {ERROR5,c=28}
  {ERROR5,c=25}
  {ERROR5,c=24}
  {ERROR5,c=23}
  {PTS_err:2}
MPEG Stream reached EOF
ds_fill_buffer: EOF reached (stream: video)
stream_seek: WARNING! Can't seek to 0x2EDB5 !
Encrypted VOB file! Read DOCS/HTML/en/dvd.html.
MPEG-PES file format detected.
  {ERROR5,c=23}
  {ERROR5,c=23}
  {ERROR5,c=241}
  {ERROR5,c=241}
  {ERROR5,c=24}
  {ERROR5,c=26}
  {ERROR5,c=22}
  {ERROR5,c=27}
  {ERROR5,c=2}
  {ERROR5,c=26}
  {ERROR5,c=26}
  {ERROR5,c=31}
  {ERROR5,c=23}
  {ERROR5,c=24}
  {ERROR5,c=26}
  {ERROR5,c=27}
  {ERROR5,c=77}
  {ERROR5,c=0}
  {ERROR5,c=26}
  {ERROR5,c=24}
  {PTS_err:1}
Searching for sequence header...   {ERROR5,c=7}
  {ERROR5,c=24}
  {ERROR5,c=22}
  {ERROR5,c=25}
  {ERROR5,c=26}
  {ERROR5,c=24}
  {ERROR5,c=28}
  {ERROR5,c=25}
  {ERROR5,c=24}
  {ERROR5,c=23}
  {PTS_err:2}
MPEG Stream reached EOF
ds_fill_buffer: EOF reached (stream: video)
NONE :(
MPEG: FATAL: EOF while searching for sequence header.
Video: Cannot read properties.
==========================================================================
Opening audio decoder: [mp3lib] MPEG layer-2, layer-3
dec_audio: Allocating 4608 + 65536 = 70144 bytes for output buffer.
mp3lib: made decode tables with MMX optimization
mp3lib: using MMX optimized decore!
MP3lib: init layer2&3 finished, tables done
MPEG Stream reached EOF
ds_fill_buffer: EOF reached (stream: audio)
ADecoder init failed :(
ADecoder init failed :(
Opening audio decoder: [ffmpeg] FFmpeg/libavcodec audio decoders
dec_audio: Allocating 131072 + 65536 = 196608 bytes for output buffer.
FFmpeg's libavcodec audio codec
INFO: libavcodec init OK!
MPEG Stream reached EOF
ds_fill_buffer: EOF reached (stream: audio)
Unknown/missing audio format -> no sound
uninit audio: ffmpeg
ADecoder init failed :(
Opening audio decoder: [libmad] libmad mpeg audio decoder
dec_audio: Allocating 4096 bytes for input buffer.
dec_audio: Allocating 9216 + 65536 = 74752 bytes for output buffer.
MPEG Stream reached EOF
ds_fill_buffer: EOF reached (stream: audio)
Cannot sync MAD frame
ADecoder init failed :(
ADecoder init failed :(
Cannot find codec for audio format 0x50.
Read DOCS/HTML/en/codecs.html!
==========================================================================
Audio: no sound
Freeing 0 unused audio chunks.
Video: no video
Freeing 0 unused video chunks.

vo: x11 uninit called but X11 not inited..

Exiting... (End of file)


here is the modified version of demuxer.c,and the aac audio can be detected
and played normal.
Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.211
diff -u -r1.211 demuxer.c
--- demuxer.c   17 Dec 2005 10:46:48 -0000      1.211
+++ demuxer.c   29 Dec 2005 03:13:54 -0000
@@ -101,6 +101,7 @@
   &demuxer_desc_pva,
   &demuxer_desc_mpeg_ts,
   &demuxer_desc_lmlm4,
+  &demuxer_desc_aac,
   &demuxer_desc_mpeg_ps,
   &demuxer_desc_mpeg_pes,
   &demuxer_desc_mpeg_es,
@@ -122,7 +123,6 @@
 #ifdef USE_LIBAVFORMAT
   &demuxer_desc_lavf,
 #endif
-  &demuxer_desc_aac,
   NULL
 };