[MPlayer-dev-eng] [PATCH] Faad update

[Diego Biurrun]

On Thu, Mar 16, 2006 at 11:08:48PM +0100, Roberto Togni wrote:
> 
> It works for me, please review and test it.

When compiling with -DFIXED_POINT (see libfaad2/Makefile):

cc -c -I. -I../libvo -I../../libvo -I/usr/X11R6/include -g -O4 -mcpu=7450 -mtune=7450 -maltivec -mabi=altivec -pipe -ffast-math -fomit-frame-pointer -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -DFIXED_POINT -o specrec.o specrec.c
specrec.c: In function 'reconstruct_single_channel': specrec.c:1037: error: 'struct <anonymous>' has no member named 'sbr_alloced'
make: *** [specrec.o] Error 1

I have another issue on my Mac: The following two samples fail to play
correctly:

http://www.mplayerhq.hu/MPlayer/samples/A-codecs/AAC/faad2-fail.mkv
http://www.mplayerhq.hu/MPlayer/samples/A-codecs/AAC/zx.eva.renewal.01.divx511.mkv

The following error message is printed to the console

FAAD: compressed input bitrate missing, assuming 128kbit/s!

and the audio is garbled.  It appears to be played very very slowly and
at a low volume, starting with some delay.  The effect is somewhat hard
to describe.  mplayer -v output below.

Also, if/when you apply this, please update the information about FAAD2
in the Copyright file.

Diego


MPlayer dev-CVS-060123-03:01-4.0.3 (C) 2000-2006 MPlayer Team

CommandLine: '-v' '/home/diego/samples/AAC/faad2-fail.mkv'
Using nanosleep() timing
get_path('faad2-fail.mkv.conf') -> '/home/diego/.mplayer/faad2-fail.mkv.conf'
Playing /home/diego/samples/AAC/faad2-fail.mkv.
get_path('sub/') -> '/home/diego/.mplayer/sub/'
[file] File size is 1470057 bytes
STREAM: [file] /home/diego/samples/AAC/faad2-fail.mkv
Checking for YUV4MPEG2
ASF_check: not ASF guid!
Checking for NuppelVideo
Checking for REAL
Checking for SMJPEG
[mkv] Found the head...
[mkv] + a segment...
[mkv] /---- [ parsing seek head ] ---------
[mkv] \---- [ parsing seek head ] ---------
[mkv] |+ segment information...
[mkv] | + duration: 1451.386s
[mkv] |+ segment tracks...
[mkv] | + a track...
[mkv] |  + Track number: 1
[mkv] |  + Track type: Video
[mkv] |  + Codec ID: V_MS/VFW/FOURCC
[mkv] |  + CodecPrivate, length 40
[mkv] |  + Default duration: 41.708ms ( = 23.976 fps)
[mkv] |  + Default flag: 1
[mkv] |  + Language: eng
[mkv] |  + Video track
[mkv] |   + Pixel width: 640
[mkv] |   + Pixel height: 480
[mkv] |   + Display width: 640
[mkv] |   + Display height: 480
[mkv] | + a track...
[mkv] |  + Track number: 2
[mkv] |  + Track type: Audio
[mkv] |  + Codec ID: A_AAC/MPEG4/LC/SBR
[mkv] |  + Default duration: 46.440ms ( = 21.533 fps)
[mkv] |  + Default flag: 1
[mkv] |  + Language: eng
[mkv] |  + Audio track
[mkv] |   + Sampling frequency: 22050.000000
[mkv] |   + Channels: 6
[mkv] | + a track...
[mkv] |  + Track number: 3
[mkv] |  + Track type: Audio
[mkv] |  + Codec ID: A_AAC/MPEG4/LC/SBR
[mkv] |  + Default duration: 46.440ms ( = 21.533 fps)
[mkv] |  + Default flag: 0
[mkv] |  + Language: jpn
[mkv] |  + Audio track
[mkv] |   + Sampling frequency: 22050.000000
[mkv] |   + Channels: 6
[mkv] | + a track...
[mkv] |  + Track number: 4
[mkv] |  + Track type: Subtitle
[mkv] |  + Codec ID: S_TEXT/UTF8
[mkv] |  + Default flag: 1
[mkv] |  + Language: eng
[mkv] | + a track...
[mkv] |  + Track number: 5
[mkv] |  + Track type: Subtitle
[mkv] |  + Codec ID: S_VOBSUB
[mkv] |  + CodecPrivate, length 348
[mkv] |  + Default flag: 0
[mkv] |  + Language: eng
[mkv] |+ found cluster, headers are parsed completely :)
[mkv] Track ID 1: video (V_MS/VFW/FOURCC), -vid 0
[mkv] Track ID 2: audio (A_AAC/MPEG4/LC/SBR), -aid 0, -alang eng
[mkv] Track ID 3: audio (A_AAC/MPEG4/LC/SBR), -aid 1, -alang jpn
[mkv] Track ID 4: subtitles (S_TEXT/UTF8), -sid 0, -slang eng
[mkv] Track ID 5: subtitles (S_VOBSUB), -sid 1, -slang eng
==> Found video stream: 1
[mkv] Aspect: 1.333333
[mkv] Will play video track 1
==> Found audio stream: 2
[mkv] Will play audio track 2
[mkv] VobSub size: 720x480
[mkv] VobSub forced subs: 0
[mkv] VobSub palette: 008080,1e8080,ff8080,4aef5b,7e8080,be8080,b110a4,67ddca,c6a41f,1b6daf,49515b,24b76d,584891,33aea4,6f8848,ff8080
[mkv] VobSub custom colors: OFF
[mkv] VobSub colors: 000000,000000,000000,000000
Matroska file format detected.
VIDEO:  [DX50]  640x480  24bpp  23.976 fps    0.0 kbps ( 0.0 kbyte/s)
[V] filefmt:31  fourcc:0x30355844  size:640x480  fps:23.98  ftime:=0.0417
get_path('sub/') -> '/home/diego/.mplayer/sub/'
get_path('default.sub') -> '/home/diego/.mplayer/default.sub'
File not found: '/home/diego/.mplayer/default.sub'
Failed to open /home/diego/.mplayer/default.sub
==========================================================================
Opening audio decoder: [faad] AAC (MPEG2/4 Advanced Audio Coding)
dec_audio: Allocating 4608 bytes for input buffer.
dec_audio: Allocating 49152 + 65536 = 114688 bytes for output buffer.
FAAD: Decoder init done (0Bytes)!
FAAD: Negotiated samplerate: 44100Hz  channels: 6
FAAD: compressed input bitrate missing, assuming 128kbit/s!
AUDIO: 44100 Hz, 2 ch, s16be, 128.0 kbit/9.07% (ratio: 16000->176400)
Selected audio codec: [faad] afm: faad (FAAD AAC (MPEG-2/MPEG-4 Audio) decoder)
==========================================================================
X11 opening display: :0.0
vo: X11 color mask:  FFFFFF  (R:FF0000 G:FF00 B:FF)
vo: X11 running at 1024x768 with depth 24 and 32 bpp (":0.0" => local display)
[x11] Unknown wm type...
[x11] Current fstype setting doesn't honour any X atoms
Disabling DPMS
DPMSDisable stat: 1
[xv common] Drawing colorkey manually.
[xv common] Using colorkey from Xv (0x0101fe).
[xv common] Maximum source image dimensions: 2046x2046
==========================================================================
Opening video decoder: [ffmpeg] FFmpeg's libavcodec codec family
INFO: libavcodec init OK!
Selected video codec: [ffodivx] vfm: ffmpeg (FFmpeg MPEG-4)
==========================================================================
Building audio filter chain for 44100Hz/2ch/s16be -> 0Hz/0ch/s8...
[libaf] Adding filter dummy 
[dummy] Was reinitialized: 44100Hz/2ch/s16be
[dummy] Was reinitialized: 44100Hz/2ch/s16be
alsa-init: requested format: 44100 Hz, 2 channels, 8
alsa-init: using ALSA 1.0.10
alsa-init: setup for 1/2 channel(s)
alsa-init: using device default
alsa-init: pcm opend in blocking mode
alsa-init: chunksize set to 1024
alsa-init: fragcount=8
alsa-init: got buffersize=32768
alsa-init: got period size 1024
alsa: 44100 Hz/2 channels/4 bpf/32768 bytes buffer/Signed 16 bit Big Endian
AO: [alsa] 44100Hz 2ch s16be (2 bytes per sample)
AO: Description: ALSA-0.9.x-1.x audio output
AO: Author: Alex Beregszaszi, Zsolt Barat <joy at streamminister.de>
AO: Comment: under developement
Building audio filter chain for 44100Hz/2ch/s16be -> 44100Hz/2ch/s16be...
[dummy] Was reinitialized: 44100Hz/2ch/s16be
[dummy] Was reinitialized: 44100Hz/2ch/s16be
Starting playback...
[ffmpeg] aspect_ratio: 1.333333
VDec: vo config request - 640 x 480 (preferred colorspace: Planar YV12)
Trying filter chain: vo
VDec: using Planar YV12 as output csp (no 0)
Movie-Aspect is 1.33:1 - prescaling to correct movie aspect.
VO Config (640x480->640x480,flags=0,'MPlayer',0x32315659)
VO: [xv] 640x480 => 640x480 Planar YV12 
VO: Description: X11/Xv
VO: Author: Gerd Knorr <kraxel at goldbach.in-berlin.de> and others
Xvideo image format: 0x32595559 (2YUY) packed
Xvideo image format: 0x32315659 (21VY) planar
Xvideo image format: 0x59565955 (YVYU) packed
Xvideo image format: 0x30323449 (024I) planar
using Xvideo port 65 for hw scaling
[xv] dx: 0 dy: 0 dw: 640 dh: 480
*** [vo] Allocating (slices) mp_image_t, 640x480x12bpp YUV planar, 460800 bytes
[xv] dx: 0 dy: 0 dw: 404 dh: 733

Uninit audio filters...
[libaf] Removing filter dummy 
uninit audio: faad
FAAD: Closing decoder!
uninit video: ffmpeg
Successfully enabled DPMS
alsa-uninit: pcm closed
vo: uninit ...

Exiting... (End of file)