[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[654] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[654] mplayerxp
|
From: <nic...@us...> - 2013-06-14 16:28:06
|
Revision: 654
http://sourceforge.net/p/mplayerxp/code/654
Author: nickols_k
Date: 2013-06-14 16:28:01 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
convert MGS_xxx into mpxp_xxx and add printing of caller address
about illegal-patch
====================
------------------------ 8< -------------------------- 8< ---------------------------------
*** Antiviral protection was inited ***!!!
MPlayerXP svn.653 2002 Nickols_K 2000-2002 Arpad Gereoffy (?\209?\129?\208?\188. DOCS!)
Can't open input config file /root/.mplayerxp/input.conf : No such file or directory
Can't open input config file /usr/local/share/mplayerxp/input.conf : No such file or directory
Falling back on default (hardcoded) input config
Opening joystick device:/dev/input/js0
Can't open joystick device: /dev/input/js0 : No such file or directory
Can't init input joystick with using: /dev/input/js0
[OSDEP.0x5a44f8]:CPU: Advanced Micro Devices
(Type: 9, Stepping: 3)
extended cpuid-level: 26
extended cache-info: 33587520
Detected cache-line size is 64 bytes
cpudetect: MMX=1 MMX2=1 3DNow=1 3DNow2=1 SSE=1 SSE2=1 SSE3=1 SSSE3=0 SSE41=0 SSE42=0 AES=0 AVX=0 FMA=0
[PLAYER.0x467c67]:User corrected CPU flags: MMX=1 MMX2=1 3DNow=1 3DNow2=1 SSE=1 SSE2=1 SSE3=1 SSSE3=0 SSE41=0 SSE42=0 AES=0 AVX=0 FMA=0
mpxp_context().mplayer_accel=4160749568
Environment:
HOME => /root
LANG => ru_RU.UTF-8
LOGNAME => root
MAIL => /var/mail/root
PATH => /usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/core_perl
SHELL => /bin/bash
SUDO_COMMAND => ./mplayerxp -vo fbdev -ao alsa /...path.../trassa e95.avi -v -v -v
SUDO_GID => 1000
SUDO_UID => 1000
SUDO_USER => kas
TERM => linux
USER => root
USERNAME => root
CommandLine: '-vo' 'fbdev' '-ao' 'alsa' '/...path.../trassa e95.avi' '-v' '-v' '-v'
[LIBVO.0x59439c]:font: can't open file: /root/.mplayerxp/font/font.desc
font: can't open file: /usr/local/share/mplayerxp/font/font.desc
[PLAYER.0x460f6f]:Menu init failed
[LIBVO.0x59a858]:fbdev: using /dev/fb0
?\208?\146?\208?\190?\209?\129?\208?\191?\209?\128?\208?\190?\208?\184?\208?\183?\208?\178?\208?\181?\208?\180?\208?\181?\208?\189?\208?\184?\208?\181 /...path.../trassa e95.avi
[STREAM.0x47fecc]:Filename for url is now /...path.../trassa%20e95.avi
Not an URL!
[STREAM.0x473e98]:[Stream]: Opening *:// ... False
[DEMUX.0x49de5d]:[Demuxer]: Probing RAW audio parser ...:False
[Demuxer]: Probing RAW video parser ...:False
[Demuxer]: Probing AVI - Audio Video Interleaved parser ...:Ok
DEMUX.0x4b0bc4:LIST 'hdrl' len=8830
DEMUX.0x4b0c42:list_end=0x2292
DEMUX.0x4b0724:CHUNK 'avih' len=56
DEMUX.0x5036b5:======= AVI Header =======
us/frame: 40000 (fps=25.000)
max bytes/sec: 0
padding: 0
DEMUX.0x5035ba:MainAVIHeader.dwFlags: (272) HAS_INDEX IS_INTERLEAVED
DEMUX.0x50372b:frames total: 6198 initial: 0
streams: 2
Suggested BufferSize: 0
Size: 352 x 288
DEMUX.0x4b098a:list_end=0x2292 pos=0x58 chunksize=0x0 next=0x58
DEMUX.0x4b0bc4:LIST 'strl' len=4244
DEMUX.0x4b0c42:list_end=0x10F4
DEMUX.0x4b0724:CHUNK 'strh' len=56
[Demuxer]: ==> Found video stream: 0
[Demuxer]: ID_VIDEO_ID=0
DEMUX.0x5038f4:======= STREAM Header =======
Type: vids FCC: div3 (33766964)
Flags: 0
Priority: 0 Language: 0
InitialFrames: 0
Rate: 25000/1000 = 25.000
Start: 0 Len: 6198
Suggested BufferSize: 21412
Quality 10000
Sample size: 0
DEMUX.0x4b098a:list_end=0x10F4 pos=0xA4 chunksize=0x0 next=0xA4
DEMUX.0x4b0724:CHUNK 'strf' len=40
DEMUX.0x4b270f:found 'bih', 40 bytes of 40
DEMUX.0x503e61:======= VIDEO Format (chunk size: 40 )======
biSize 40
biWidth 352
biHeight 288
biPlanes 1
biBitCount 24
biCompression 33564944='DIV3'
biSizeImage 304128
biXPelPerMeter 0
biYPelPerMeter 0
biClrUsed 0
biClrIpmortant 0
DEMUX.0x503f1f:======= End of Video Format =======
DEMUX.0x4b2ca1:Regenerating keyframe table for DIVX 3 video
DEMUX.0x4b098a:list_end=0x10F4 pos=0xD4 chunksize=0x0 next=0xD4
DEMUX.0x4b0724:CHUNK 'JUNK' len=4120
DEMUX.0x4b098a:list_end=0x10F4 pos=0x10F4 chunksize=0x0 next=0x10F4
DEMUX.0x4b0bc4:LIST 'strl' len=4234
DEMUX.0x4b0c42:list_end=0x2186
DEMUX.0x4b0724:CHUNK 'strh' len=56
DEMUX.0x4b28a3:avi: Found audio stream
Demuxer: ==> Found audio stream: 1
Demuxer: ID_AUDIO_ID=1
DEMUX.0x5038f4:======= STREAM Header =======
Type: auds FCC: (0)
Flags: 0
Priority: 0 Language: 0
InitialFrames: 1
Rate: 15963/1 = 15963.000
Start: 0 Len: 3957330
Suggested BufferSize: 7467
Quality -1
Sample size: 1
DEMUX.0x4b098a:list_end=0x2186 pos=0x1140 chunksize=0x0 next=0x1140
DEMUX.0x4b0724:CHUNK 'strf' len=30
DEMUX.0x4b1f36:found 'wf', 30 bytes of 18
DEMUX.0x503a16:======= WAVE Format (chunk size: 30 )=======
Format Tag: 85 (0x55)
Channels: 2
Samplerate: 44100
avg byte/sec: 15963
Block align: 1
bits/sample: 0
cbSize: 12
DEMUX.0x503af6:mp3.wID=1
mp3.fdwFlags=0x2
mp3.nBlockSize=417
mp3.nFramesPerBlock=1
mp3.nCodecDelay=1393
DEMUX.0x503a6e:======= End of WAVE Format =======
DEMUX.0x4b098a:list_end=0x2186 pos=0x1166 chunksize=0x0 next=0x1166
DEMUX.0x4b0724:CHUNK 'JUNK' len=4120
DEMUX.0x4b098a:list_end=0x2186 pos=0x2186 chunksize=0x0 next=0x2186
DEMUX.0x4b0bc4:LIST 'odml' len=260
DEMUX.0x4b0c42:list_end=0x2292
DEMUX.0x4b0724:CHUNK 'dmlh' len=248
DEMUX.0x4b2451:Found ODML header 248 frames 6198
DEMUX.0x4b098a:list_end=0x2292 pos=0x2292 chunksize=0x0 next=0x2292
DEMUX.0x4b0724:CHUNK 'JUNK' len=1382
DEMUX.0x4b098a:list_end=0x2292 pos=0x2800 chunksize=0x0 next=0x2800
DEMUX.0x4b0a0b:Broken chunk? chunksize=0 (id=JUNK)
DEMUX.0x4b0724:CHUNK 'JUNK' len=1382
DEMUX.0x4b098a:list_end=0x0 pos=0x2800 chunksize=0x0 next=0x2800
DEMUX.0x4b0bc4:LIST 'movi' len=23710356
DEMUX.0x4b0c42:list_end=0x169F29C
DEMUX.0x4b0ce7:Found movie at 0x280C - 0x169F29C
DEMUX.0x4b0724:CHUNK 'idx1' len=198144
DEMUX.0x4b11ff:Reading INDEX block, 12384 chunks for 6198 frames
DEMUX.0x504304: 0: 01wb 10 00000004 len: 7467 pos: 0-> 0.000 0-> 0.000
DEMUX.0x504304: 1: 00dc 10 00001D38 len: 556 pos: 0-> 0.000 0-> 0.000
DEMUX.0x504304: 2: 01wb 10 00001F6C len: 419 pos: 7467-> 0.398 1-> 0.042
DEMUX.0x504304: 3: 00dc 0 00002118 len: 106 pos: 556-> 0.030 1-> 0.042
DEMUX.0x504304: 4: 01wb 10 0000218A len: 825 pos: 7886-> 0.421 2-> 0.083
DEMUX.0x504304: 5: 00dc 0 000024CC len: 201 pos: 662-> 0.035 2-> 0.083
DEMUX.0x504304: 6: 01wb 10 0000259E len: 421 pos: 8711-> 0.465 3-> 0.125
DEMUX.0x504304: 7: 00dc 0 0000274C len: 256 pos: 863-> 0.046 3-> 0.125
DEMUX.0x504304: 8: 01wb 10 00002854 len: 841 pos: 9132-> 0.487 4-> 0.167
DEMUX.0x504304: 9: 00dc 0 00002BA6 len: 129 pos: 1119-> 0.060 4-> 0.167
DEMUX.0x504304: 10: 01wb 10 00002C30 len: 416 pos: 9973-> 0.532 5-> 0.209
DEMUX.0x504304: 11: 00dc 0 00002DD8 len: 211 pos: 1248-> 0.067 5-> 0.209
DEMUX.0x504304: 12: 01wb 10 00002EB4 len: 823 pos: 10389-> 0.554 6-> 0.250
DEMUX.0x504304: 13: 00dc 0 000031F4 len: 249 pos: 1459-> 0.078 6-> 0.250
DEMUX.0x504304: 14: 01wb 10 000032F6 len: 423 pos: 11212-> 0.598 7-> 0.292
DEMUX.0x504304: 15: 00dc 0 000034A6 len: 65 pos: 1708-> 0.091 7-> 0.292
DEMUX.0x504304: 16: 01wb 10 000034F0 len: 840 pos: 11635-> 0.621 8-> 0.334
DEMUX.0x504304: 17: 00dc 0 00003840 len: 53 pos: 1773-> 0.095 8-> 0.334
[snip]...[/snip]
DEMUX.0x504304:12377: 00dc 0 0169C3B6 len: 320 pos:19646018->1047.955 6191->258.217
DEMUX.0x504304:12378: 00dc 0 0169C4FE len: 140 pos:19646338->1047.972 6192->258.258
DEMUX.0x504304:12379: 00dc 0 0169C592 len: 250 pos:19646478->1047.980 6193->258.300
DEMUX.0x504304:12380: 00dc 0 0169C694 len: 330 pos:19646728->1047.993 6194->258.342
DEMUX.0x504304:12381: 00dc 0 0169C7E6 len: 122 pos:19647058->1048.011 6195->258.383
DEMUX.0x504304:12382: 00dc 0 0169C868 len: 247 pos:19647180->1048.017 6196->258.425
DEMUX.0x504304:12383: 00dc 0 0169C968 len: 292 pos:19647427->1048.031 6197->258.467
DEMUX.0x4b098a:list_end=0x0 pos=0x16CF8A4 chunksize=0x0 next=0x16CF8A4
DEMUX.0x4b0724:CHUNK 'JUNK' len=1876
DEMUX.0x4b098a:list_end=0x0 pos=0x16D0000 chunksize=0x0 next=0x16D0000
DEMUX.0x4b3ff5:AVI index offset: 0x2808 (movi=0x280C idx0=0x4 idx1=0x1D38)
DEMUX.0x4af6f0:Auto-selected AVI audio ID = 1
DEMUX.0x4af7ba:Auto-selected AVI video ID = 0
[DEMUX.0x4a1e6c]:ds_fill_buffer(d_video) called
DEMUX.0x4afb43:demux_avi.read_packet: 62773130
DEMUX.0x4afbbd:DEMUX_AVI: Read 7467 data bytes from packet 62773130
[DEMUX.0x4a1811]:DEMUX: Append packet: len=7467 pts=0 pos=0 [_packs: A=1 V=0]
ds_read_packet(7467,0,0,0)
DEMUX.0x4aff5c:DEMUX_AVI: Skipping 1 bytes from packet 62773130
DEMUX.0x4afb43:demux_avi.read_packet: 63643030
DEMUX.0x4afbbd:DEMUX_AVI: Read 556 data bytes from packet 63643030
DEMUX: Append packet: len=556 pts=0 pos=1 [_packs: A=1 V=1]
ds_read_packet(556,0,0,0)
DEMUX.0x4b3c82:AVI: Searching for audio stream (id:1)
ds_fill_buffer(d_audio) called
DEMUX.0x4b403a:AVI video size=19647719 (6198) audio size=3957330 (3957330)
DEMUX.0x4b3fcc:VIDEO: [DIV3] 352x288 24bpp 25.00 fps
[DEMUX.0x49dcb3]:[Demuxer]: Using: AVI - Audio Video Interleaved parser
[Stream]:Video=DIV3 Audio=00000055
[V] filefmt:6fourcc:0x33564944 size:160x120 fps:25 ftime:=0.04
[MPSUB.0x52f0d4]:SPU: Display only forced subs now disabled
[GLOBAL.0x51a012]:[codec_ld] ?\208?\145?\208?\184?\208?\177?\208?\187?\208?\184?\208?\190?\209?\130?\208?\181?\208?\186?\208?\176 ?\208?\183?\208?\176?\208?\179?\209?\128?\209?\131?\208?\182?\208?\181?\208?\189?\208?\176 ?\209?\131?\209?\129?\208?\191?\208?\181?\209?\136?\208?\189?\208?\190:libmpg123.so
[DEMUX.0x4a2a22]:initial_apts from: stream_pts=0 pts_bytes=7467 got_bytes=7467 i_bps=15963
initial_apts is: 0
[DECAUD.0x5190e1]:mpg123_init: MPEG-1.0 [Layer:III (CBR)], Hz=44100 128-kbit Joint-Stereo, BPF=417 Out=32-bit
mpg123_init: Copyrght=No Orig=Yes CRC=No Priv=No Emphas=0 Optimiz=x86-64
[DECAUD.0x509a24]:Probing: mp3libok
Driver: mp3lib supports these outfmt for 00000055
100000 10 0
[OSDEP.0x5a52f7]:Using SSE2 optimized memcpy
[OSDEP.0x5a54a7]:fast_memcpy(0x33f5ae0, 0x7fff3a4d9718, 64) [cl_size=64]
[DECAUD.0x50a3d4]:dec_audio: Allocating 8192 + 65536 = 73728 bytes for output buffer
[DECAUD.0x50a527]:[AC] Selecting drv:mp3lib.libmpg123.so ratio 15963->352800
[LIBAO.0x549376]:alsa-init: compiled for ALSA-1.0.27.1
alsa-init: got device=0, subdevice=0
[LIBAO.0x549516]:alsa-init: Testing & bugs are welcome. Found 1 cards, use: hw:0,0
alsa-init: pcm opend in block-mode
[LIBAO.0x549996]:snd_pcm_hw_params_any()
snd_pcm_hw_params_set_access(SND_PCM_ACCESS_RW_INTERLEAVED)
Initializing audio codec...
AUDIO: srate=ac44 chans=2 bps=4 sfmt=0x100000 ratio: 3e5b->0
[POSTPR.0x54f7de]:vo2(NULL, NULL)
[DECVID.0x50908c]:Probing: raw
failed
Probing: nuv
failed
Probing: mpeg2
failed
Probing: xvid
failed
Probing: mpegpes
failed
Probing: huffyuv
failed
Probing: theora
failed
Probing: libdv
failed
Probing: lavc
[DECVID.0x50ee0f]:libavcodec.size: 352 x 288
[DECVID.0x50f083]:Using 4 threads in lavc
INFO: libavcodec.so (0) video codec[DIV3] init OK!
[DECVID.0x506ec6]:VDec: vo config request - 352 x 288
[LIBVO.0x590370]:dri_vo_dbg: vo_query_format(00000000)
[LIBVO.0x590480]:dri_vo: request for Unknown 0x0000 fourcc: 0
[POSTPR.0x57ae17]:[vf_vo2] 0=query_format(Unknown 0x0000)
vf_vo2->config(352,288,352,288,4,Unknown 0x0000)
dri_vo_dbg: vo_config
priv.video_out->config(352,288,352,288, 0x4,'MPlayerXP',Unknown 0x0000)
fbdev: Can't set graphics mode: Inappropriate ioctl for device
[LIBVO.0x59bb1c]:fbdev: var info:
fbdev: xres: 1920
fbdev: yres: 1200
fbdev: xres_virtual: 1920
fbdev: yres_virtual: 1200
fbdev: xoffset: 0
fbdev: yoffset: 0
fbdev: bits_per_pixel: 32
fbdev: grayscale: 0
fbdev: red: 16 8 0
fbdev: green: 8 8 0
fbdev: blue: 0 8 0
fbdev: transp: 24 8 0
fbdev: nonstd: 0
fbdev: activate: 0
fbdev: height: 4294967295
fbdev: width: 4294967295
fbdev: accel_flags: 1
fbdev: timing:
fbdev: pixclock: 0
fbdev: left_margin: 0
fbdev: right_margin: 0
fbdev: upper_margin: 0
fbdev: lower_margin: 0
fbdev: hsync_len: 0
fbdev: vsync_len: 0
fbdev: sync: 0
fbdev: vmode: 0
fbdev: fix info:
fbdev: framebuffer size: 9216000 bytes
fbdev: type: 0
fbdev: type_aux: 0
fbdev: visual: 2
fbdev: line_length: 7680 bytes
fbdev: id: radeondrmfb
fbdev: smem_start: 0xc0142000
fbdev: xpanstep: 1
fbdev: ypanstep: 1
fbdev: ywrapstep: 0
fbdev: mmio_start: 0
fbdev: mmio_len: 0 bytes
fbdev: accel: 0
fbdev: priv.bpp: 32
fbdev: priv.real_bpp: 24
fbdev: priv.pixel_size: 4 bytes
fbdev: other:
fbdev: priv.in_width: 352
fbdev: priv.in_height: 288
fbdev: priv.out_width: 352
fbdev: priv.out_height: 288
fbdev: priv.last_row: 816
fbdev: frame_buffer @ 7f5515842000
fbdev: L123123875 @ 7f5515b99c40
fbdev: pixel per line: 1920
fbdev: vt_set_textarea(330,4b0): 34,4b
[stream: vf_reinit_vo]
Call vf_reinit_vo <vo2: 352x288@Unknown 0x0000> -> <vo: 352x288@BGRA>
vf->first: 352x288@Unknown 0x0000
[352x288@Unknown 0x0000](NULL<-vo2->NULL)
Using(first:vo2) 352x288@Unknown 0x0000
vf_reinit->config_vf 352 288 Unknown 0x0000=> 352 288 BGRA
Open video filter: [fmtcvt] <352x288 Unknown 0x0000>
[POSTPR.0x575564]:SwScale params: -1 x -1 (-1=no scaling)
dri_vo_dbg: vo_query_format(51343434)
dri_vo: request for Planar 444P 16-bit little-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 444P 16-bit little-endian)
[POSTPR.0x5736ba]:scale: query(Planar 444P 16-bit little-endian) -> 0
dri_vo_dbg: vo_query_format(34343451)
dri_vo: request for Planar 444P 16-bit big-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 444P 16-bit big-endian)
scale: query(Planar 444P 16-bit big-endian) -> 0
dri_vo_dbg: vo_query_format(51323234)
dri_vo: request for Planar 422P 16-bit little-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 422P 16-bit little-endian)
scale: query(Planar 422P 16-bit little-endian) -> 0
dri_vo_dbg: vo_query_format(34323251)
dri_vo: request for Planar 422P 16-bit big-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 422P 16-bit big-endian)
scale: query(Planar 422P 16-bit big-endian) -> 0
dri_vo_dbg: vo_query_format(51303234)
dri_vo: request for Planar 420P 16-bit little-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 420P 16-bit little-endian)
scale: query(Planar 420P 16-bit little-endian) -> 0
dri_vo_dbg: vo_query_format(34323051)
dri_vo: request for Planar 420P 16-bit big-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 420P 16-bit big-endian)
scale: query(Planar 420P 16-bit big-endian) -> 0
dri_vo_dbg: vo_query_format(41303234)
dri_vo: request for Planar YV12 with alpha fourcc: 0
[vf_vo2] 0=query_format(Planar YV12 with alpha)
scale: query(Planar YV12 with alpha) -> 0
dri_vo_dbg: vo_query_format(50343434)
dri_vo: request for Planar 444P fourcc: 0
[vf_vo2] 0=query_format(Planar 444P)
scale: query(Planar 444P) -> 0
dri_vo_dbg: vo_query_format(50323234)
dri_vo: request for Planar 422P fourcc: 0
[vf_vo2] 0=query_format(Planar 422P)
scale: query(Planar 422P) -> 0
dri_vo_dbg: vo_query_format(32315659)
dri_vo: request for Planar YV12 fourcc: 0
[vf_vo2] 0=query_format(Planar YV12)
scale: query(Planar YV12) -> 0
dri_vo_dbg: vo_query_format(30323449)
dri_vo: request for Planar I420 fourcc: 0
[vf_vo2] 0=query_format(Planar I420)
scale: query(Planar I420) -> 0
dri_vo_dbg: vo_query_format(56555949)
dri_vo: request for Planar IYUV fourcc: 0
[vf_vo2] 0=query_format(Planar IYUV)
scale: query(Planar IYUV) -> 0
dri_vo_dbg: vo_query_format(39555659)
dri_vo: request for Planar YVU9 fourcc: 0
[vf_vo2] 0=query_format(Planar YVU9)
scale: query(Planar YVU9) -> 0
dri_vo_dbg: vo_query_format(39304649)
dri_vo: request for Planar IF09 fourcc: 0
[vf_vo2] 0=query_format(Planar IF09)
scale: query(Planar IF09) -> 0
dri_vo_dbg: vo_query_format(50313134)
dri_vo: request for Planar 411P fourcc: 0
[vf_vo2] 0=query_format(Planar 411P)
scale: query(Planar 411P) -> 0
dri_vo_dbg: vo_query_format(32595559)
dri_vo: request for Packed YUY2 fourcc: 0
[vf_vo2] 0=query_format(Packed YUY2)
scale: query(Packed YUY2) -> 0
dri_vo_dbg: vo_query_format(59565955)
dri_vo: request for Packed UYVY fourcc: 0
[vf_vo2] 0=query_format(Packed UYVY)
scale: query(Packed UYVY) -> 0
dri_vo_dbg: vo_query_format(52474230)
dri_vo: request for RGB 48-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 48-bit)
scale: query(RGB 48-bit) -> 0
dri_vo_dbg: vo_query_format(524742b0)
dri_vo: request for BGR 48-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 48-bit)
scale: query(BGR 48-bit) -> 0
dri_vo_dbg: vo_query_format(42475220)
dri_vo: request for BGRA fourcc: 1
[vf_vo2] 1=query_format(BGRA)
scale: query(BGRA) -> 1
dri_vo_dbg: vo_query_format(52474220)
dri_vo: request for RGBA fourcc: 0
[vf_vo2] 0=query_format(RGBA)
scale: query(RGBA) -> 0
dri_vo_dbg: vo_query_format(42475218)
dri_vo: request for BGR 24-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 24-bit)
scale: query(BGR 24-bit) -> 0
dri_vo_dbg: vo_query_format(52474218)
dri_vo: request for RGB 24-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 24-bit)
scale: query(RGB 24-bit) -> 0
dri_vo_dbg: vo_query_format(42475210)
dri_vo: request for BGR 16-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 16-bit)
scale: query(BGR 16-bit) -> 0
dri_vo_dbg: vo_query_format(52474210)
dri_vo: request for RGB 16-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 16-bit)
scale: query(RGB 16-bit) -> 0
dri_vo_dbg: vo_query_format(4247520f)
dri_vo: request for BGR 15-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 15-bit)
scale: query(BGR 15-bit) -> 0
dri_vo_dbg: vo_query_format(5247420f)
dri_vo: request for RGB 15-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 15-bit)
scale: query(RGB 15-bit) -> 0
dri_vo_dbg: vo_query_format(30303859)
dri_vo: request for Planar Y800 fourcc: 0
[vf_vo2] 0=query_format(Planar Y800)
scale: query(Planar Y800) -> 0
dri_vo_dbg: vo_query_format(20203859)
dri_vo: request for Planar Y8 fourcc: 0
[vf_vo2] 0=query_format(Planar Y8)
scale: query(Planar Y8) -> 0
dri_vo_dbg: vo_query_format(42475208)
dri_vo: request for BGR 8-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 8-bit)
scale: query(BGR 8-bit) -> 0
dri_vo_dbg: vo_query_format(52474208)
dri_vo: request for RGB 8-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 8-bit)
scale: query(RGB 8-bit) -> 0
dri_vo_dbg: vo_query_format(42475204)
dri_vo: request for BGR 4-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 4-bit)
scale: query(BGR 4-bit) -> 0
dri_vo_dbg: vo_query_format(52474204)
dri_vo: request for RGB 4-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 4-bit)
scale: query(RGB 4-bit) -> 0
dri_vo_dbg: vo_query_format(42475284)
dri_vo: request for BGR 4-bit per byte fourcc: 0
[vf_vo2] 0=query_format(BGR 4-bit per byte)
scale: query(BGR 4-bit per byte) -> 0
dri_vo_dbg: vo_query_format(52474284)
dri_vo: request for RGB 4-bit per byte fourcc: 0
[vf_vo2] 0=query_format(RGB 4-bit per byte)
scale: query(RGB 4-bit per byte) -> 0
dri_vo_dbg: vo_query_format(42475201)
dri_vo: request for BGR 1-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 1-bit)
scale: query(BGR 1-bit) -> 0
dri_vo_dbg: vo_query_format(52474201)
dri_vo: request for RGB 1-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 1-bit)
scale: query(RGB 1-bit) -> 0
dri_vo_dbg: vo_query_format(42475220)
dri_vo: request for BGRA fourcc: 1
[vf_vo2] 1=query_format(BGRA)
vf_scale: 1025=vf_next_query_format(42475220,160,120);
vf_scale: sws_getFlagsAndFilterFromCmdLine(...);
vf_scale: sws_getContext(160, 120, Unknown 0x0000, 160, 120, BGRA, e0001004);
[swscaler @ 0x4d267c0] (null) is not supported as input pixel format
[POSTPR.0x5748bf]:Couldn't init SwScaler for this setup
[POSTPR.0x55024f]:FATAL: ?\208?\157?\208?\181 ?\208?\188?\208?\190?\208?\179?\209?\131 ?\208?\191?\209?\128?\208?\190?\208?\184?\208?\189?\208?\184?\209?\134?\208?\184?\208?\176?\208?\187?\208?\184?\208?\183?\208?\184?\209?\128?\208?\190?\208?\178?\208?\176?\209?\130?\209?\140 ?\208?\178?\208?\184?\208?\180?\208?\181?\208?\190 ?\208?\180?\209?\128?\208?\176?\208?\185?\208?\178?\208?\181?\209?\128!
vf->first: 352x288@Unknown 0x0000
[352x288@Unknown 0x0000](fmtcvt<-vo2->NULL)
dri_vo_caps: driver does support DRI
dri_vo_caps: caps=00000000 fourcc=42475220(BGRA) x,y,w,h(0 0 160 120)
dri_vo_caps: width,height(160,120) strides(580000) priv.dri.bpp=20
dri_vo_src: w,h(160,120) d_w,d_h(160,120
dri_vo_src: flags=00000004 fourcc=00000000(Unknown 0x0000)
dri_vo_dbg: vo_query_format(30323449)
dri_vo: request for Planar I420 fourcc: 0
[vf_vo2] 0=query_format(Planar I420)
[DECVID.0x5072e7]:vo_debug[step i=0]: query(Planar I420 352x288) returned 0x0 for:
[POSTPR.0x54cf00]:[libvf] Using video filters chain:
[POSTPR.0x57b671]:VO-CONF: [fbdev] 352x288 => 352x288 Unknown 0x0000 [zoom]
[POSTPR.0x57b7e8]:VO: Description: Framebuffer Device
VO: Author: Szabolcs Berecz <sz...@in...>
[DECVID.0x506fd6]:Can't find colorspace for: 'Planar I420'
Trying -vf fmtcvt...
Open video filter: [fmtcvt] <352x288 Planar I420>
SwScale params: -1 x -1 (-1=no scaling)
[POSTPR.0x573fb2]:vf_scale: query_format(30323449(Planar I420), 160, 120
dri_vo_dbg: vo_query_format(51343434)
dri_vo: request for Planar 444P 16-bit little-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 444P 16-bit little-endian)
scale: query(Planar 444P 16-bit little-endian) -> 0
dri_vo_dbg: vo_query_format(34343451)
dri_vo: request for Planar 444P 16-bit big-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 444P 16-bit big-endian)
scale: query(Planar 444P 16-bit big-endian) -> 0
dri_vo_dbg: vo_query_format(51323234)
dri_vo: request for Planar 422P 16-bit little-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 422P 16-bit little-endian)
scale: query(Planar 422P 16-bit little-endian) -> 0
dri_vo_dbg: vo_query_format(34323251)
dri_vo: request for Planar 422P 16-bit big-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 422P 16-bit big-endian)
scale: query(Planar 422P 16-bit big-endian) -> 0
dri_vo_dbg: vo_query_format(51303234)
dri_vo: request for Planar 420P 16-bit little-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 420P 16-bit little-endian)
scale: query(Planar 420P 16-bit little-endian) -> 0
dri_vo_dbg: vo_query_format(34323051)
dri_vo: request for Planar 420P 16-bit big-endian fourcc: 0
[vf_vo2] 0=query_format(Planar 420P 16-bit big-endian)
scale: query(Planar 420P 16-bit big-endian) -> 0
dri_vo_dbg: vo_query_format(41303234)
dri_vo: request for Planar YV12 with alpha fourcc: 0
[vf_vo2] 0=query_format(Planar YV12 with alpha)
scale: query(Planar YV12 with alpha) -> 0
dri_vo_dbg: vo_query_format(50343434)
dri_vo: request for Planar 444P fourcc: 0
[vf_vo2] 0=query_format(Planar 444P)
scale: query(Planar 444P) -> 0
dri_vo_dbg: vo_query_format(50323234)
dri_vo: request for Planar 422P fourcc: 0
[vf_vo2] 0=query_format(Planar 422P)
scale: query(Planar 422P) -> 0
dri_vo_dbg: vo_query_format(32315659)
dri_vo: request for Planar YV12 fourcc: 0
[vf_vo2] 0=query_format(Planar YV12)
scale: query(Planar YV12) -> 0
dri_vo_dbg: vo_query_format(30323449)
dri_vo: request for Planar I420 fourcc: 0
[vf_vo2] 0=query_format(Planar I420)
scale: query(Planar I420) -> 0
dri_vo_dbg: vo_query_format(56555949)
dri_vo: request for Planar IYUV fourcc: 0
[vf_vo2] 0=query_format(Planar IYUV)
scale: query(Planar IYUV) -> 0
dri_vo_dbg: vo_query_format(39555659)
dri_vo: request for Planar YVU9 fourcc: 0
[vf_vo2] 0=query_format(Planar YVU9)
scale: query(Planar YVU9) -> 0
dri_vo_dbg: vo_query_format(39304649)
dri_vo: request for Planar IF09 fourcc: 0
[vf_vo2] 0=query_format(Planar IF09)
scale: query(Planar IF09) -> 0
dri_vo_dbg: vo_query_format(50313134)
dri_vo: request for Planar 411P fourcc: 0
[vf_vo2] 0=query_format(Planar 411P)
scale: query(Planar 411P) -> 0
dri_vo_dbg: vo_query_format(32595559)
dri_vo: request for Packed YUY2 fourcc: 0
[vf_vo2] 0=query_format(Packed YUY2)
scale: query(Packed YUY2) -> 0
dri_vo_dbg: vo_query_format(59565955)
dri_vo: request for Packed UYVY fourcc: 0
[vf_vo2] 0=query_format(Packed UYVY)
scale: query(Packed UYVY) -> 0
dri_vo_dbg: vo_query_format(52474230)
dri_vo: request for RGB 48-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 48-bit)
scale: query(RGB 48-bit) -> 0
dri_vo_dbg: vo_query_format(524742b0)
dri_vo: request for BGR 48-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 48-bit)
scale: query(BGR 48-bit) -> 0
dri_vo_dbg: vo_query_format(42475220)
dri_vo: request for BGRA fourcc: 1
[vf_vo2] 1=query_format(BGRA)
scale: query(BGRA) -> 1
dri_vo_dbg: vo_query_format(52474220)
dri_vo: request for RGBA fourcc: 0
[vf_vo2] 0=query_format(RGBA)
scale: query(RGBA) -> 0
dri_vo_dbg: vo_query_format(42475218)
dri_vo: request for BGR 24-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 24-bit)
scale: query(BGR 24-bit) -> 0
dri_vo_dbg: vo_query_format(52474218)
dri_vo: request for RGB 24-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 24-bit)
scale: query(RGB 24-bit) -> 0
dri_vo_dbg: vo_query_format(42475210)
dri_vo: request for BGR 16-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 16-bit)
scale: query(BGR 16-bit) -> 0
dri_vo_dbg: vo_query_format(52474210)
dri_vo: request for RGB 16-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 16-bit)
scale: query(RGB 16-bit) -> 0
dri_vo_dbg: vo_query_format(4247520f)
dri_vo: request for BGR 15-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 15-bit)
scale: query(BGR 15-bit) -> 0
dri_vo_dbg: vo_query_format(5247420f)
dri_vo: request for RGB 15-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 15-bit)
scale: query(RGB 15-bit) -> 0
dri_vo_dbg: vo_query_format(30303859)
dri_vo: request for Planar Y800 fourcc: 0
[vf_vo2] 0=query_format(Planar Y800)
scale: query(Planar Y800) -> 0
dri_vo_dbg: vo_query_format(20203859)
dri_vo: request for Planar Y8 fourcc: 0
[vf_vo2] 0=query_format(Planar Y8)
scale: query(Planar Y8) -> 0
dri_vo_dbg: vo_query_format(42475208)
dri_vo: request for BGR 8-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 8-bit)
scale: query(BGR 8-bit) -> 0
dri_vo_dbg: vo_query_format(52474208)
dri_vo: request for RGB 8-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 8-bit)
scale: query(RGB 8-bit) -> 0
dri_vo_dbg: vo_query_format(42475204)
dri_vo: request for BGR 4-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 4-bit)
scale: query(BGR 4-bit) -> 0
dri_vo_dbg: vo_query_format(52474204)
dri_vo: request for RGB 4-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 4-bit)
scale: query(RGB 4-bit) -> 0
dri_vo_dbg: vo_query_format(42475284)
dri_vo: request for BGR 4-bit per byte fourcc: 0
[vf_vo2] 0=query_format(BGR 4-bit per byte)
scale: query(BGR 4-bit per byte) -> 0
dri_vo_dbg: vo_query_format(52474284)
dri_vo: request for RGB 4-bit per byte fourcc: 0
[vf_vo2] 0=query_format(RGB 4-bit per byte)
scale: query(RGB 4-bit per byte) -> 0
dri_vo_dbg: vo_query_format(42475201)
dri_vo: request for BGR 1-bit fourcc: 0
[vf_vo2] 0=query_format(BGR 1-bit)
scale: query(BGR 1-bit) -> 0
dri_vo_dbg: vo_query_format(52474201)
dri_vo: request for RGB 1-bit fourcc: 0
[vf_vo2] 0=query_format(RGB 1-bit)
scale: query(RGB 1-bit) -> 0
dri_vo_dbg: vo_query_format(42475220)
dri_vo: request for BGRA fourcc: 1
[vf_vo2] 1=query_format(BGRA)
[sw_scale] BGRA supported on vo2 like 401
[sw_scale] returning: 441
vo_debug[step i=0]: query(Planar I420 160x120) returned 0x441 for:
[libvf] Using video filters chain:
[POSTPR.0x573c4e]:[vf_fmtcvt]: video[0x0] in[Unknown 0x0000] -> out[Unknown 0x0000]
VO-CONF: [fbdev] 352x288 => 352x288 Unknown 0x0000 [zoom]
VO: Description: Framebuffer Device
VO: Author: Szabolcs Berecz <sz...@in...>
------------------------ 8< -------------------------- 8< ---------------------------------
let detect some addresses!
[OSDEP.0x5a44f8]
$addr2line -s -e mplayerxp 0x5a44f8
cpudetect.cpp:101
[PLAYER.0x467c67] main.cpp:466
[LIBVO.0x59439c] font_load.cpp:64
[STREAM.0x47fecc] url.cpp:50
DEMUX.0x5036b5:======= AVI Header ======= basic_string.h:293
DEMUX.0x5038f4:======= STREAM Header ======= basic_string.h:293
DEMUX.0x504304: basic_string.h:293
let investigate address DEMUX.0x504304 with beye!
------------------------ 8< -------------------------- 8< ---------------------------------
Current position information
File offset: 104304H
Virt. address: 504304H
Prev. entry: _Z11print_indexP13AVIINDEXEBTRYi
Next. entry: _Z23print_avistdindex_chunkP18_avistdindex_chunk
Curr. object: #13 CODE USE64 A840H=7350B4H .text
;
;Disassembler dump of 'mplayerxp'
;Range : 1041D7H- 10442DH
;Written by Binary Viewer v 6.1.0-x86_64.Linux64 Build: Feb 6 2012
;Dumped : Fri Jun 14 17:19:56 2013
;Format : ELF (Executable and Linking Format)
SEGMENT .text BYTE PUBLIC USE64 'CODE'
; size: 7514228 bytes
public _Z18print_video_headerP16BITMAPINFOHEADERj:
; ...
L001041D7: nop ax,[rax+rax+00000000] ; 660F1F840000000000
public _Z11print_indexP13AVIINDEXENTRYi:
L001041E0: push r15 ; 4157
L001041E2: xor eax,eax ; 31C0
L001041E4: push r14 ; 4156
L001041E6: push r13 ; 4155
L001041E8: push r12 ; 4154
L001041EA: push rbp ; 55
L001041EB: push rbx ; 53
L001041EC: sub rsp,+00000858 ; 4881EC58080000
L001041F3: mov [rsp+24],esi ; 89742424
L001041F7: nop ax,[rax+rax+00000000] ; 660F1F840000000000
L00104200: mov (d) [rax+rsp+50],00000000 ; C744045000000000
L00104208: mov (d) [rax+rsp+00000450],00000000; C784045004000000000000
L00104213: add (q) rax,+04 ; 4883C004
L00104217: cmp rax,00000400 ; 483D00040000
L0010421D: jne L00104200 ; 75E1
L0010421F: mov esi,[rsp+24] ; 8B742424
L00104223: test esi,esi ; 85F6
L00104225: jle L0010433C ; 0F8E11010000
L0010422B: mov rbx,rdi ; 4889FB
L0010422E: xor r12d,r12d ; 4531E4
L00104231: nop eax,[cs:rax+rax+00000000] ; 6666666666662E0F1F840000000000
L00104240: mov edi,[rbx] ; 8B3B
L00104242: calln _Z13avi_stream_idj ; E859C3FAFF
L00104247: mov ecx,000000FF ; B9FF000000
L0010424C: cmp eax,00000100 ; 3D00010000
L00104251: mov r9d,[rbx+08] ; 448B4B08
L00104255: mov r8d,[rbx+04] ; 448B4304
L00104259: cmovnc eax,ecx ; 0F43C1
L0010425C: lea rdx,[rsp+3E] ; 488D54243E
L00104261: mov esi,00B52F20 ; ->"%5d: %.4s %4X %08X len:%6d pos:%7d->%7.3f %7d->%7.3f" ; BE202FB500
L00104266: movsxd rbp,rax ; 4863E8
L00104269: lea rdi,[rsp+40] ; 488D7C2440
L0010426E: mov r15d,[rbx+0C] ; 448B7B0C
L00104272: mov [rsp+20],r9d ; 44894C2420
L00104277: mov [rsp+1C],r8d ; 448944241C
L0010427C: mov r13d,[rbp*4+rsp+00000450] ; 448BACAC50040000
L00104284: mov r14d,[rbp*4+rsp+50] ; 448B74AC50
L00104289: calln *_ZNSsC1EPKcRKSaIcE ; E81259F0FF
L0010428E: mov ecx,[rip+00AF8DC4] ; 8B0DC48DAF00
L00104294: mov r8d,[rsp+1C] ; 448B44241C
L00104299: mov r9d,[rsp+20] ; 448B4C2420
L0010429E: test ecx,ecx ; 85C9
L001042A0: je L00104304 ; 7462
L001042A2: mov eax,r13d ; 4489E8
L001042A5: mov [rsp+10],r13d ; 44896C2410
L001042AA: mov [rsp+08],r14d ; 4489742408
L001042AF: mov [rsp+28],rax ; 4889442428
L001042B4: mov eax,r14d ; 4489F0
L001042B7: mov [rsp],r15d ; 44893C24
L001042BB: cvtsi2ss xmm1,[rsp+28] ; F3480F2A4C2428
L001042C2: mov [rsp+28],rax ; 4889442428
L001042C7: cvtsi2ss xmm0,[rsp+28] ; F3480F2A442428
L001042CE: mov rcx,rbx ; 4889D9
L001042D1: mov edx,r12d ; 4489E2
L001042D4: lea rsi,[rsp+40] ; 488D742440
L001042D9: mov edi,70000010 ; BF10000070
L001042DE: mov eax,00000002 ; B802000000
L001042E3: divss xmm1,[rip+0064F095] ; F30F5E0D95F06400
L001042EB: divss xmm0,[rip+0064F091] ; ->"A" ; F30F5E0591F06400
L001042F3: unpcklps xmm1,xmm1 ; 0F14C9
L001042F6: cvtps2pd xmm1,xmm1 ; 0F5AC9
L001042F9: unpcklps xmm0,xmm0 ; 0F14C0
L001042FC: cvtps2pd xmm0,xmm0 ; 0F5AC0
L001042FF: calln _ZN3usr11mpxp_printfEjRKSsz; E89CB8F6FF
L00104304: mov rax,[rsp+40] ; 488B442440
L00104309: lea rdi,[rax-18] ; 488D78E8
L0010430D: cmp rdi,00FFC040 ; 4881FF40C0FF00
L00104314: jne L0010434E ; 7538
L00104316: add r14d,[rbx+0C] ; 4403730C
L0010431A: inc r13d ; 41FFC5
L0010431D: inc r12d ; 41FFC4
L00104320: add (q) rbx,+10 ; 4883C310
L00104324: cmp r12d,[rsp+24] ; 443B642424
L00104329: mov [rbp*4+rsp+00000450],r13d ; 4489ACAC50040000
L00104331: mov [rbp*4+rsp+50],r14d ; 448974AC50
L00104336: jne L00104240 ; 0F8504FFFFFF
L0010433C: add rsp,+00000858 ; 4881C458080000
L00104343: pop rbx ; 5B
L00104344: pop rbp ; 5D
L00104345: pop r12 ; 415C
L00104347: pop r13 ; 415D
L00104349: pop r14 ; 415E
L0010434B: pop r15 ; 415F
L0010434D: retn ; C3
L0010434E: mov ecx,0040A430 ; B930A44000
L00104353: lea rdx,[rdi+10] ; 488D5710
L00104357: test rcx,rcx ; 4885C9
L0010435A: je L00104393 ; 7437
L0010435C: mov eax,FFFFFFFF ; B8FFFFFFFF
L00104361: lock; xadd [rdx],eax ; F00FC102
L00104365: test eax,eax ; 85C0
L00104367: jg L00104316 ; 7FAD
L00104369: lea rsi,[rsp+3F] ; 488D74243F
L0010436E: calln *_ZNSs4_Rep10_M_destroyERKSaIcE; E8AD53F0FF
L00104373: jmps L00104316 ; EBA1
L00104375: mov rbx,rax ; 4889C3
L00104378: mov rax,[rsp+40] ; 488B442440
L0010437D: lea rsi,[rsp+3F] ; 488D74243F
L00104382: lea rdi,[rax-18] ; 488D78E8
L00104386: calln *_ZNSs4_Rep10_M_disposeERKSaIcE; E89550F0FF
L0010438B: mov rdi,rbx ; 4889DF
L0010438E: calln *_Unwind_Resume ; E8BD61F0FF
L00104393: mov edx,[rax-08] ; 8B50F8
L00104396: lea ecx,[rdx-01] ; 8D4AFF
L00104399: mov [rax-08],ecx ; 8948F8
L0010439C: mov eax,edx ; 89D0
L0010439E: jmps L00104365 ; EBC5
public _Z23print_avistdindex_chunkP18_avistdindex_chunk:
L001043A0: push r15 ; 4157
L001043A2: mov esi,00B52F60 ; ->"====== AVI Standard Index Header ========" ; BE602FB500
L001043A7: push r14 ; 4156
L001043A9: push r13 ; 4155
L001043AB: push r12 ; 4154
L001043AD: push rbp ; 55
L001043AE: mov rbp,rdi ; 4889FD
L001043B1: push rbx ; 53
L001043B2: sub (q) rsp,+58 ; 'X' ; 4883EC58
L001043B6: movzx eax,[rdi+0A] ; 0FB6470A
L001043BA: mov ecx,[rdi+04] ; 8B4F04
L001043BD: mov r15d,[rdi+1C] ; 448B7F1C
L001043C1: mov r14,[rdi+14] ; 4C8B7714
L001043C5: lea rdx,[rsp+3E] ; 488D54243E
L001043CA: mov r13d,[rdi+0C] ; 448B6F0C
L001043CE: movzx r12d,[rdi+0B] ; 440FB6670B
L001043D3: movzx ebx,[rdi+08] ; 0FB75F08
L001043D7: lea rdi,[rsp+40] ; 488D7C2440
L001043DC: mov [rsp+28],ecx ; 894C2428
L001043E0: mov [rsp+2F],al ; 8844242F
L001043E4: calln *_ZNSsC1EPKcRKSaIcE ; E8B757F0FF
L001043E9: mov edi,[rip+00AF8C69] ; 8B3D698CAF00
L001043EF: mov ecx,[rsp+28] ; 8B4C2428
L001043F3: test edi,edi ; 85FF
L001043F5: je L00104431 ; 743A
L001043F7: movzx r9d,[rsp+2F] ; 440FB64C242F
L001043FD: lea rdx,[rbp+10] ; 488D5510
L00104401: mov [rsp+20],r15d ; 44897C2420
L00104406: mov [rsp+10],rdx ; 4889542410
L0010440B: mov [rsp+18],r14 ; 4C89742418
L00104410: movzx r8d,bx ; 440FB7C3
L00104414: mov [rsp+08],r13d ; 44896C2408
L00104419: mov [rsp],r12d ; 44892424
L0010441D: mov rdx,rbp ; 4889EA
L00104420: lea rsi,[rsp+40] ; 488D742440
L00104425: mov edi,70000010 ; BF10000070
L0010442A: xor eax,eax ; 31C0
L0010442C: calln _ZN3usr11mpxp_printfEjRKSsz; E86FB7F6FF
------------------------ 8< -------------------------- 8< ---------------------------------
this tells me that malefactor damaged addr2line utility on my development computer.
Revision Links:
--------------
http://sourceforge.net/p/mplayerxp/code/15
http://sourceforge.net/p/mplayerxp/code/14
http://sourceforge.net/p/mplayerxp/code/13
http://sourceforge.net/p/mplayerxp/code/12
http://sourceforge.net/p/mplayerxp/code/12
http://sourceforge.net/p/mplayerxp/code/13
http://sourceforge.net/p/mplayerxp/code/14
http://sourceforge.net/p/mplayerxp/code/15
http://sourceforge.net/p/mplayerxp/code/15
http://sourceforge.net/p/mplayerxp/code/14
http://sourceforge.net/p/mplayerxp/code/13
http://sourceforge.net/p/mplayerxp/code/12
http://sourceforge.net/p/mplayerxp/code/14
http://sourceforge.net/p/mplayerxp/code/14
Modified Paths:
--------------
mplayerxp/dump.cpp
mplayerxp/input2/input.cpp
mplayerxp/libao3/ao_sdl.cpp
mplayerxp/libmpcodecs/dec_audio.cpp
mplayerxp/libmpcodecs/dec_video.cpp
mplayerxp/libmpcodecs/libdca/parse.cpp
mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp
mplayerxp/libmpcodecs/vd_lavc.cpp
mplayerxp/libmpcodecs/vd_xanim.cpp
mplayerxp/libmpdemux/demux_ts.cpp
mplayerxp/libmpstream2/cookies.cpp
mplayerxp/libmpstream2/librtsp/rtsp_rtp.cpp
mplayerxp/libmpstream2/network_asf.cpp
mplayerxp/libmpstream2/s_tv.cpp
mplayerxp/libmpstream2/tvi/tvi_bsdbt848.cpp
mplayerxp/libmpstream2/tvi/tvi_dummy.cpp
mplayerxp/libmpstream2/tvi/tvi_v4l.cpp
mplayerxp/libmpsub/find_sub.cpp
mplayerxp/libmpsub/spudec.cpp
mplayerxp/libmpsub/subreader.cpp
mplayerxp/libmpsub/vobsub.cpp
mplayerxp/libvo2/jpeg_enc.cpp
mplayerxp/libvo2/screenshot.cpp
mplayerxp/libvo2/screenshot.h
mplayerxp/libvo2/sub.cpp
mplayerxp/libvo2/video_out.cpp
mplayerxp/libvo2/video_out.h
mplayerxp/libvo2/vo_fbdev.cpp
mplayerxp/libvo2/vo_sdl.cpp
mplayerxp/libvo2/vo_vesa.cpp
mplayerxp/main.cpp
mplayerxp/mpxp_msg.cpp
mplayerxp/mpxp_msg.h
mplayerxp/nls/mpxp_help-en.h
mplayerxp/nls/mpxp_help-ru.h
mplayerxp/postproc/af.cpp
mplayerxp/postproc/af_ao3.cpp
mplayerxp/postproc/af_channels.cpp
mplayerxp/postproc/af_crystality.cpp
mplayerxp/postproc/af_delay.cpp
mplayerxp/postproc/af_dyn.cpp
mplayerxp/postproc/af_echo3d.cpp
mplayerxp/postproc/af_equalizer.cpp
mplayerxp/postproc/af_extrastereo.cpp
mplayerxp/postproc/af_ffenc.cpp
mplayerxp/postproc/af_format.cpp
mplayerxp/postproc/af_hrtf.cpp
mplayerxp/postproc/af_lp.cpp
mplayerxp/postproc/af_pan.cpp
mplayerxp/postproc/af_raw.cpp
mplayerxp/postproc/af_resample.cpp
mplayerxp/postproc/af_scaletempo.cpp
mplayerxp/postproc/af_sinesuppress.cpp
mplayerxp/postproc/af_sub.cpp
mplayerxp/postproc/af_surround.cpp
mplayerxp/postproc/af_tools.cpp
mplayerxp/postproc/af_volnorm.cpp
mplayerxp/postproc/af_volume.cpp
mplayerxp/postproc/libmenu/menu_filesel.cpp
mplayerxp/postproc/postprocess.cpp
mplayerxp/postproc/vf.cpp
mplayerxp/postproc/vf_1bpp.cpp
mplayerxp/postproc/vf_delogo.cpp
mplayerxp/postproc/vf_dint.cpp
mplayerxp/postproc/vf_eq.cpp
mplayerxp/postproc/vf_format.cpp
mplayerxp/postproc/vf_framestep.cpp
mplayerxp/postproc/vf_menu.cpp
mplayerxp/postproc/vf_mirror.cpp
mplayerxp/postproc/vf_palette.cpp
mplayerxp/postproc/vf_panscan.cpp
mplayerxp/postproc/vf_raw.cpp
mplayerxp/postproc/vf_rectangle.cpp
mplayerxp/postproc/vf_rotate.cpp
mplayerxp/postproc/vf_scale.cpp
mplayerxp/postproc/vf_softpulldown.cpp
mplayerxp/postproc/vf_test.cpp
mplayerxp/postproc/vf_unsharp.cpp
mplayerxp/postproc/vf_yuy2.cpp
mplayerxp/postproc/vf_yvu9.cpp
Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp 2013-06-12 14:05:09 UTC (rev 653)
+++ mplayerxp/dump.cpp 2013-06-14 16:28:01 UTC (rev 654)
@@ -5,6 +5,7 @@
dump.c - stream dumper
*/
#include <iostream>
+#include <sstream>
#include <fstream>
#include <stdexcept>
@@ -59,10 +60,10 @@
name=buf;
f.open(name,std::ios_base::out|std::ios_base::binary);
if(!f.is_open()){
- MSG_FATAL(MSGTR_CantOpenDumpfile);
+ mpxp_fatal<<MSGTR_CantOpenDumpfile<<"!!!"<<std::endl;
throw std::runtime_error(MSGTR_Fatal_error);
}
- MSG_INFO("Dumping stream to %s\n",name);
+ mpxp_info<<"Dumping stream to "<<name<<std::endl;
while(!stream->eof()){
binary_packet bp=stream->read(4096);
if(bp.size()>0) f.write(bp.cdata(),bp.size());
@@ -139,17 +140,17 @@
else if(strcmp(media,"mpxp") == 0) strcat(stream_dump_name,"dump.mpxp");
else if(strcmp(media,"raw") == 0) strcat(stream_dump_name,"dump.raw");
else {
- MSG_FATAL("Unsupported muxer format %s found\n",media);
+ mpxp_fatal<<"Unsupported muxer format "<<media<<" found"<<std::endl;
throw std::runtime_error(MSGTR_Fatal_error);
}
priv->mux_file.open(stream_dump_name,std::ios_base::out|std::ios_base::binary);
- MSG_DBG2("Preparing stream dumping: %s\n",stream_dump_name);
+ mpxp_dbg2<<"Preparing stream dumping: "<<stream_dump_name<<std::endl;
if(!priv->mux_file.is_open()){
- MSG_FATAL(MSGTR_CantOpenDumpfile);
+ mpxp_fatal<<MSGTR_CantOpenDumpfile<<"!!!"<<std::endl;
throw std::runtime_error(MSGTR_Fatal_error);
}
if(!(priv->muxer=muxer_new_muxer(media,port,priv->mux_file))) {
- MSG_FATAL("Can't initialize muxer\n");
+ mpxp_fatal<<"Can't initialize muxer"<<std::endl;
throw std::runtime_error(MSGTR_Fatal_error);
}
if(sha && (priv->mux_type&MUX_HAVE_AUDIO)) {
@@ -158,7 +159,7 @@
priv->m_audio->source=sha;
priv->m_audio->codec=0;
if(!sha->wf) {
- sha->wf=(WAVEFORMATEX*)mp_malloc(sizeof(WAVEFORMATEX));
+ sha->wf=new(zeromem) WAVEFORMATEX;
sha->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize;
sha->wf->wFormatTag = sha->wtag;
sha->wf->nChannels = sha->nch;
@@ -194,7 +195,7 @@
priv->m_video->h.dwRate=priv->m_video->h.dwScale*shv->fps;
priv->m_video->h.dwSuggestedBufferSize=shv->video.dwSuggestedBufferSize;
if(!shv->bih) {
- shv->bih=(BITMAPINFOHEADER*)mp_malloc(sizeof(BITMAPINFOHEADER));
+ shv->bih=new(zeromem) BITMAPINFOHEADER;
shv->bih->biSize=sizeof(BITMAPINFOHEADER);
shv->bih->biWidth=shv->src_w;
shv->bih->biHeight=shv->src_h;
@@ -215,8 +216,8 @@
priv->m_subs->source=NULL;
priv->m_subs->codec=0;
} else priv->m_subs=NULL;
- MSG_DBG2("Opening dump: %X\n",demuxer);
- MSG_INFO("Dumping stream to %s\n",stream_dump_name);
+ mpxp_dbg2<<"Opening dump: "<<std::hex<<demuxer<<std::endl;
+ mpxp_info<<"Dumping stream to "<<stream_dump_name<<std::endl;
muxer_fix_parameters(priv->muxer);
muxer_write_header(priv->muxer,demuxer);
}
@@ -229,16 +230,13 @@
sh_audio_t* sha=reinterpret_cast<sh_audio_t*>(d_audio->sh);
sh_video_t* shv=reinterpret_cast<sh_video_t*>(d_video->sh);
if(priv) {
- MSG_DBG2("Closing dump: %X %f secs\n"
- "As video %X-%ix%i audio %X-%ix%ix%i\n"
- ,demuxer,shv?priv->vtimer:sha->timer
- ,priv->m_video?priv->m_video->bih->biCompression:-1
- ,priv->m_video?priv->m_video->bih->biWidth:-1
- ,priv->m_video?priv->m_video->bih->biHeight:-1
- ,priv->m_audio?priv->m_audio->wf->wFormatTag:-1
- ,priv->m_audio?priv->m_audio->wf->nSamplesPerSec:-1
- ,priv->m_audio?priv->m_audio->wf->wBitsPerSample:-1
- ,priv->m_audio?priv->m_audio->wf->nChannels:-1);
+ mpxp_dbg2<<"Closing dump: "<<(shv?priv->vtimer:sha->timer)<<" secs"<<std::endl;
+ mpxp_dbg2<<"As video "<<std::hex<<(priv->m_video?priv->m_video->bih->biCompression:-1)
+ <<"-"<<(priv->m_video?priv->m_video->bih->biWidth:-1)<<"x"
+ <<(priv->m_video?priv->m_video->bih->biHeight:-1)<<" audio "
+ <<(priv->m_audio?priv->m_audio->wf->wFormatTag:-1)<<"-"
+ <<(priv->m_audio?priv->m_audio->wf->nSamplesPerSec:-1)
+ <<"x"<<(priv->m_audio?priv->m_audio->wf->wBitsPerSample:-1)<<"x"<<(priv->m_audio?priv->m_audio->wf->nChannels:-1)<<std::endl;
if(shv && (priv->mux_type&MUX_HAVE_VIDEO)) priv->m_video->source=shv;
if(sha && (priv->mux_type&MUX_HAVE_AUDIO)) priv->m_audio->source=sha;
muxer_write_index(priv->muxer);
@@ -248,28 +246,20 @@
if(priv->m_video) {
priv->m_video->h.dwRate=priv->m_video->h.dwScale*shv->fps;
priv->m_video->h.dwSuggestedBufferSize=priv->vsize/priv->decoded_frameno;
- MSG_V("Finishing vstream as: scale %u rate %u fps %f (frames=%u timer=%f)\n"
- ,priv->m_video->h.dwScale
- ,priv->m_video->h.dwRate
- ,shv->fps
- ,priv->decoded_frameno
- ,priv->vtimer+priv->timer_corr);
+ mpxp_v<<"Finishing vstream as: scale "<<priv->m_video->h.dwScale<<" rate "<<priv->m_video->h.dwRate
+ <<" fps "<<shv->fps<<" (frames="<<priv->decoded_frameno<<" timer="<<priv->vtimer+priv->timer_corr<<")"<<std::endl;
}
}
if(sha) {
if(priv->m_audio) {
priv->m_audio->h.dwSuggestedBufferSize=priv->asize/priv->a_frameno;
- MSG_V("Finishing astream as: scale %u rate %u (frames=%u timer=%f) avg=%i size=%u\n"
- ,priv->m_audio->h.dwScale
- ,priv->m_audio->h.dwRate
- ,priv->a_frameno
- ,sha->timer+priv->timer_corr
- ,priv->m_audio->wf->nAvgBytesPerSec
- ,priv->asize);
+ mpxp_v<<"Finishing astream as: scale "<<priv->m_audio->h.dwScale<<" rate "<<priv->m_audio->h.dwRate
+ <<" (frames="<<priv->a_frameno<<" timer="<<sha->timer+priv->timer_corr
+ <<") avg="<<priv->m_audio->wf->nAvgBytesPerSec<<" size="<<priv->asize<<std::endl;
}
}
if(demuxer->sub->sh) {
- if(priv->m_subs) MSG_V("Finishing sstream as\n");
+ if(priv->m_subs) mpxp_v<<"Finishing sstream as"<<std::endl;
}
priv->mux_file.seekp(0,std::ios_base::beg);
muxer_write_header(priv->muxer,demuxer);
@@ -297,47 +287,67 @@
MP_UNIT("dump");
priv->my_use_pts=use_pts;
/* test stream property */
- MSG_INFO("%s using PTS method\n",use_pts?"":"not");
+ mpxp_info<<(use_pts?"":"not")<<" using PTS method"<<std::endl;
if(priv->m_video) {
- if(!shv) { MSG_ERR("Video not found!!!Skip this stream\n"); return; }
- if(!shv->bih) { MSG_ERR("Video property not found!!!Skip this stream\n"); return; }
+ if(!shv) { mpxp_err<<"Video not found!!!Skip this stream"<<std::endl; return; }
+ if(!shv->bih) { mpxp_err<<"Video property not found!!!Skip this stream"<<std::endl; return; }
if(memcmp(shv->bih,priv->m_video->bih,sizeof(BITMAPINFOHEADER))!=0) {
- MSG_ERR("Found different video properties(%X-%ix%i)!=(%X-%ix%i)!!!\nSkip this stream\n",
- shv->bih->biCompression,shv->bih->biWidth,shv->bih->biHeight,
- priv->m_video->bih->biCompression,priv->m_video->bih->biWidth,
- priv->m_video->bih->biHeight);
+ mpxp_err<<"Found different video properties("<<std::hex<<shv->bih->biCompression
+ <<"-"<<shv->bih->biWidth<<"x"<<shv->bih->biHeight<<")!=("<<std::hex<<priv->m_video->bih->biCompression
+ <<"-"<<priv->m_video->bih->biWidth<<"x"<<priv->m_video->bih->biHeight<<")!!!"<<std::endl;
+ mpxp_err<<"Skip this stream"<<std::endl;
return;
}
priv->m_video->source=shv;
}
if(priv->m_audio) {
- if(!sha) { MSG_ERR("Audio not found!!!Skip this stream\n"); return; }
- if(!sha->wf) { MSG_ERR("Audio property not found!!!Skip this stream\n"); return; }
+ if(!sha) { mpxp_err<<"Audio not found!!! Skip this stream"<<std::endl; return; }
+ if(!sha->wf) { mpxp_err<<"Audio property not found!!! Skip this stream"<<std::endl; return; }
if(memcmp(sha->wf,priv->m_audio->wf,sizeof(WAVEFORMATEX))!=0) {
- MSG_ERR("Found different audio properties(%X-%ix%ix%i)!=(%X-%ix%ix%i)X!!!\nSkip this stream\n",
- sha->wf->wFormatTag,sha->wf->nSamplesPerSec,sha->wf->wBitsPerSample,sha->wf->nChannels,
- priv->m_audio->wf->wFormatTag,priv->m_audio->wf->nSamplesPerSec,
- priv->m_audio->wf->wBitsPerSample,priv->m_audio->wf->nChannels);
+ mpxp_err<<"Found different audio properties("<<std::hex<<sha->wf->wFormatTag
+ <<"-"<<sha->wf->nSamplesPerSec<<"x"<<sha->wf->wBitsPerSample<<"x"<<sha->wf->nChannels
+ <<")!=("<<std::hex<<priv->m_audio->wf->wFormatTag<<"-"<<priv->m_audio->wf->nSamplesPerSec
+ <<"x"<<priv->m_audio->wf->wBitsPerSample<<"x"<<priv->m_audio->wf->nChannels
+ <<")X!!!"<<std::endl;
+ mpxp_err<<"Skip this stream"<<std::endl;
return;
}
priv->m_audio->source=sha;
}
if (seek_to_sec) {
- float d;
- float rel_seek_secs=0;
- seek_args_t seek_p = { 0, 1};
- int a,b;
- if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3)
- rel_seek_secs += 3600*a +60*b +d ;
- else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2)
- rel_seek_secs += 60*a +d;
- else if (sscanf(seek_to_sec, "%f", &d)==1)
- rel_seek_secs += d;
+ int a,b;
+ float d;
+ char c;
+ int ok=1;
+ float rel_seek_secs=0;
+ seek_args_t seek_p = { 0, 1};
+ std::istringstream iss(seek_to_sec);
- seek_to_sec = NULL;
- MSG_INFO("seeking to %u seconds\n");
- seek_p.secs=rel_seek_secs;
- demux_seek_r(*demuxer,&seek_p);
+ iss>>a; iss>>c;
+ if(!iss.good() || c!=':') ok=0;
+ iss>>b; iss>>c;
+ if(!iss.good() || c!=':') ok=0;
+ iss>>d;
+ if(!iss.good()) ok=0;
+ if (ok) rel_seek_secs += 3600*a +60*b +d ;
+ else {
+ ok=1;
+ iss.str(seek_to_sec);
+ iss>>a; iss>>c;
+ if(!iss.good() || c!=':') ok=0;
+ iss>>b;
+ if(!iss.good()) ok=0;
+ if (ok) rel_seek_secs += 60*a +d;
+ else {
+ iss.str(mp_conf.seek_to_sec);
+ iss>>d;
+ if (iss.good()) rel_seek_secs += d;
+ }
+ }
+ seek_to_sec = NULL;
+ mpxp_info<<"seeking to "<<rel_seek_secs<<" seconds"<<std::endl;
+ seek_p.secs=rel_seek_secs;
+ demux_seek_r(*demuxer,&seek_p);
}
aeof=sha?0:1;
veof=shv?0:1;
@@ -364,14 +374,14 @@
}
if(use_pts) sha->timer=a_pts;
else sha->timer=mpeg_atimer;
- MSG_V("Got audio frame: %f %u\n",a_pts,(!aeof)?priv->a_frameno:-1);
+ mpxp_v<<"Got audio frame: "<<a_pts<<" "<<((!aeof)?priv->a_frameno:-1)<<std::endl;
aeof=sha->ds->eof;
priv->a_frameno++;
if(aeof) break;
if(priv->m_audio) {
priv->m_audio->buffer=start;
if(in_size>0) {
- MSG_V("put audio: %f %f %u\n",a_pts,sha->timer+priv->timer_corr,in_size);
+ mpxp_v<<"put audio: "<<a_pts<<" "<<(sha->timer+priv->timer_corr)<<" "<<in_size<<std::endl;
if(priv->m_audio)
muxer_write_chunk(priv->m_audio,in_size,priv->m_video?0:AVIIF_KEYFRAME,sha->timer+priv->timer_corr);
}
@@ -396,15 +406,15 @@
else priv->vtimer=mpeg_vtimer;
++priv->decoded_frameno;
veof=shv->ds->eof;
- MSG_V("Got video frame %f %i\n",v_pts,(!veof)?priv->decoded_frameno:-1);
+ mpxp_v<<"Got video frame "<<v_pts<<" "<<((!veof)?priv->decoded_frameno:-1)<<std::endl;
if(priv->m_video) priv->m_video->buffer=start;
if(in_size>0) {
- MSG_V("put video: %f %f %u flg=%u\n",v_pts,priv->vtimer+priv->timer_corr,in_size,shv->ds->flags);
+ mpxp_v<<"put video: "<<v_pts<<" "<<(priv->vtimer+priv->timer_corr)<<" "<<in_size<<" flg="<<shv->ds->flags<<std::endl;
if(priv->m_video) muxer_write_chunk(priv->m_video,in_size,(shv->ds->flags&1)?AVIIF_KEYFRAME:0,priv->vtimer+priv->timer_corr);
priv->vsize += in_size;
}
if(!(priv->decoded_frameno%100))
- MSG_STATUS("Done %u frames\r",priv->decoded_frameno);
+ mpxp_status<<"Done "<<priv->decoded_frameno<<" frames\r";
}
if(demuxer->sub->sh) {
float s_pts=0;
@@ -415,11 +425,11 @@
cmd = check_cmd(priv);
if(cmd == -1) goto done;
else
- MSG_V("Got sub frame: %f\n",s_pts);
+ mpxp_v<<"Got sub frame: "<<s_pts<<std::endl;
if(priv->m_subs) {
priv->m_subs->buffer=start;
if(in_size>0) {
- MSG_V("put subs: %f %u\n",s_pts,in_size);
+ mpxp_v<<"put subs: "<<s_pts<<" "<<in_size<<std::endl;
if(priv->m_subs)
muxer_write_chunk(priv->m_subs,in_size,priv->m_video?0:AVIIF_KEYFRAME,s_pts);
}
@@ -435,17 +445,11 @@
if(priv->m_audio->wf->nAvgBytesPerSec)
priv->timer_corr+=((float)d_audio->tell_pts())/((float)priv->m_audio->wf->nAvgBytesPerSec);
}
- MSG_STATUS("Done %u frames (video(%X-%ix%i): %llu bytes audio(%X-%ix%ix%i): %llu bytes)\n"
- ,priv->decoded_frameno
- ,priv->m_video?priv->m_video->bih->biCompression:-1
- ,priv->m_video?priv->m_video->bih->biWidth:-1
- ,priv->m_video?priv->m_video->bih->biHeight:-1
- ,priv->vsize
- ,priv->m_audio?priv->m_audio->wf->wFormatTag:-1
- ,priv->m_audio?priv->m_audio->wf->nSamplesPerSec:-1
- ,priv->m_audio?priv->m_audio->wf->wBitsPerSample:-1
- ,priv->m_audio?priv->m_audio->wf->nChannels:-1
- ,priv->asize);
+ mpxp_status<<"Done "<<priv->decoded_frameno<<" frames (video("<<std::hex<<(priv->m_video?priv->m_video->bih->biCompression:-1)
+ <<"-"<<(priv->m_video?priv->m_video->bih->biWidth:-1)<<"x"<<(priv->m_video?priv->m_video->bih->biHeight:-1)
+ <<"): "<<priv->vsize<<" bytes audio("<<std::hex<<(priv->m_audio?priv->m_audio->wf->wFormatTag:-1)
+ <<"-"<<(priv->m_audio?priv->m_audio->wf->nSamplesPerSec:-1)<<"x"<<(priv->m_audio?priv->m_audio->wf->wBitsPerSample:-1)
+ <<"x"<<(priv->m_audio?priv->m_audio->wf->nChannels:-1)<<"): "<<priv->asize<<" bytes)"<<std::endl;
}
} // namespace usr
Modified: mplayerxp/input2/input.cpp
===================================================================
--- mplayerxp/input2/input.cpp 2013-06-12 14:05:09 UTC (rev 653)
+++ mplayerxp/input2/input.cpp 2013-06-14 16:28:01 UTC (rev 654)
@@ -548,7 +548,7 @@
cmd_def = &mp_cmds[i];
- cmd = (mp_cmd_t*)mp_malloc(sizeof(mp_cmd_t));
+ cmd = new mp_cmd_t;
cmd->id = cmd_def->id;
cmd->name = mp_strdup(cmd_def->name);
@@ -605,7 +605,7 @@
break;
} else if(!e) e = ptr+strlen(ptr);
l = e-start;
- cmd->args[i].v.s = (char*)mp_malloc((l+1)*sizeof(char));
+ cmd->args[i].v.s = new char[l+1];
strncpy(cmd->args[i].v.s,start,l);
cmd->args[i].v.s[l] = '\0';
ptr2 = start;
@@ -662,7 +662,7 @@
// Allocate the buffer if it dont exist
if(!mp_fd->buffer) {
- mp_fd->buffer = (char*)mp_malloc(MP_CMD_MAX_SIZE*sizeof(char));
+ mp_fd->buffer = new char[MP_CMD_MAX_SIZE];
mp_fd->pos = 0;
mp_fd->size = MP_CMD_MAX_SIZE;
}
@@ -711,7 +711,7 @@
l = end - mp_fd->buffer;
// Not dropping : put the cmd in ret
if( ! (mp_fd->flags & MP_FD_DROP)) {
- (*ret) = (char*)mp_malloc((l+1)*sizeof(char));
+ (*ret) = new char[l+1];
strncpy((*ret),mp_fd->buffer,l);
(*ret)[l] = '\0';
} else { // Remove the dropping flag
Modified: mplayerxp/libao3/ao_sdl.cpp
===================================================================
--- mplayerxp/libao3/ao_sdl.cpp 2013-06-12 14:05:09 UTC (rev 653)
+++ mplayerxp/libao3/ao_sdl.cpp 2013-06-14 16:28:01 UTC (rev 654)
@@ -128,15 +128,13 @@
/* setenv is missing on solaris and HPUX */
static void setenv(const char *name, const char *val, int _xx)
{
- int len = strlen(name) + strlen(val) + 2;
- char *env = mp_malloc(len);
+ int len = strlen(name) + strlen(val) + 2;
+ char *env = new char [len];
- if (env != NULL) {
strcpy(env, name);
strcat(env, "=");
strcat(env, val);
putenv(env);
- }
}
#endif
Modified: mplayerxp/libmpcodecs/dec_audio.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.cpp 2013-06-12 14:05:09 UTC (rev 653)
+++ mplayerxp/libmpcodecs/dec_audio.cpp 2013-06-14 16:28:01 UTC (rev 654)
@@ -69,7 +69,7 @@
sh.o_bps=0;
priv.mpadec=ai->query_interface(sh,priv.afi,sh.wtag);
} catch(const bad_format_exception&) {
- MSG_ERR(MSGTR_CODEC_BAD_AFAMILY,ac, afm);
+ mpxp_err<<MSGTR_CODEC_BAD_AFAMILY<<" "<<ac<<" ("<<afm<<")"<<std::endl;
goto bye;
}
}
@@ -119,7 +119,7 @@
sh.a_buffer=new char [sh.a_buffer_size];
if(!sh.a_buffer) {
- MSG_ERR(MSGTR_CantAllocAudioBuf);
+ mpxp_err<<MSGTR_CantAllocAudioBuf<<std::endl;
goto bye;
}
sh.a_buffer_len=0;
@@ -127,7 +127,7 @@
if(!sh.nch || !sh.rate) {
mpxp_v<<"audio format wrong: nch="<<sh.nch<<" rate="<<sh.rate<<std::endl;
- MSG_WARN(MSGTR_UnknownAudio);
+ mpxp_warn<<MSGTR_UnknownAudio<<std::endl;
goto bye;
}
@@ -137,7 +137,7 @@
static int warned=0;
if(!warned) {
warned=1;
- MSG_WARN(MSGTR_CODEC_INITAL_AV_RESYNC);
+ mpxp_warn<<MSGTR_CODEC_INITIAL_AV_RESYNC<<std::endl;
}
} else if(mpxp_context().engine().xp_core->initial_apts_corr.need_correction==1) {
mpxp_context().engine().xp_core->initial_apts += ((float)(mpxp_context().engine().xp_core->initial_apts_corr.pts_bytes-mpxp_context().engine().xp_core->initial_apts_corr.nbytes))/(float)sh.i_bps;
@@ -291,7 +291,7 @@
if(!sh.inited) return 0; // no codec
- if(minlen>maxlen) MSG_WARN(MSGTR_CODEC_XP_INT_ERR,minlen,maxlen);
+ if(minlen>maxlen) mpxp_warn<<MSGTR_CODEC_XP_INT_ERR<<": "<<minlen<<">"<<maxlen<<std::endl;
if(sh.af_buffer_len) {
cp_size=std::min(buflen,sh.af_buffer_len);
memcpy(buf,sh.af_buffer,cp_size);
@@ -309,7 +309,7 @@
if(sh.af_bps>sh.o_bps)
maxlen=std::min(maxlen,buflen*sh.o_bps/sh.af_bps);
len=priv.mpadec->run(buf, minlen, maxlen,pts);
- if(len>buflen) MSG_WARN(MSGTR_CODEC_BUF_OVERFLOW,sh.codec->driver_name,len,buflen);
+ if(len>buflen) mpxp_warn<<"["<<sh.codec->driver_name<<"] "<<MSGTR_CODEC_BUF_OVERFLOW<<":"<<len<<">"<<buflen<<std::endl;
mpxp_dbg2<<"decaudio: "<<len<<" bytes "<<pts<<" pts min "<<minlen<<" max "<<maxlen<<" buflen "<<buflen<<" o_bps="<<sh.o_bps<<" f_bps="<<sh.af_bps<<std::endl;
if(len==0 || !priv.afi.afilter) return 0; // EOF?
// run the filters:
Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp 2013-06-12 14:05:09 UTC (rev 653)
+++ mplayerxp/libmpcodecs/dec_video.cpp 2013-06-14 16:28:01 UTC (rev 654)
@@ -161,7 +161,7 @@
try{
priv.mpvdec=vi->query_interface(*this,sh,priv.psi,sh.fourcc);
} catch(const bad_format_exception&) {
- MSG_ERR(MSGTR_CODEC_CANT_INITV);
+ mpxp_err<<MSGTR_CODEC_CANT_INITV<<std::endl;
delete priv.mpvdec;
goto bye;
}
@@ -376,7 +376,7 @@
sh.src_w,sh.src_h,
mpxp_context().video().output->flags,
out_fmt)==0){
- MSG_WARN(MSGTR_CannotInitVO);
+ mpxp_warn<<MSGTR_CannotInitVO<<std::endl;
priv.vfilter_inited=-1;
return MPXP_False;
}
@@ -438,7 +438,7 @@
// Remove the scale filter if we added it ourself
if(strcmp(vf_get_first_name(s),"fmtcvt")==0) vf_remove_first(s);
}
- MSG_WARN(MSGTR_VOincompCodec);
+ mpxp_warn<<MSGTR_VOincompCodec<<std::endl;
priv.vfilter_inited=-1;
return MPXP_False; // failed
}
@@ -512,7 +512,7 @@
screen_size_x,screen_size_y,
mpxp_context().video().output->flags,
out_fmt)==0){
- MSG_WARN(MSGTR_CannotInitVO);
+ mpxp_warn<<MSGTR_CannotInitVO<<std::endl;
priv.vfilter_inited=-1;
return MPXP_False;
}
Modified: mplayerxp/libmpcodecs/libdca/parse.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/parse.cpp 2013-06-12 14:05:09 UTC (rev 653)
+++ mplayerxp/libmpcodecs/libdca/parse.cpp 2013-06-14 16:28:01 UTC (rev 654)
@@ -65,20 +65,11 @@
dca_state_t * state;
int i;
- state = (dca_state_t *) mp_malloc (sizeof (dca_state_t));
- if (state == NULL)
- return NULL;
+ state = new(zeromem) dca_state_t;
- memset (state, 0, sizeof(dca_state_t));
-
state->samples = new(alignmem,16) sample_t[256 * 12];
- if (state->samples == NULL) {
- delete state;
- return NULL;
- }
- for (i = 0; i < 256 * 12; i++)
- state->samples[i] = 0;
+ for (i = 0; i < 256 * 12; i++) state->samples[i] = 0;
/* Pre-calculate cosine modulation coefficients */
pre_calc_cosmod( state );
Modified: mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp 2013-06-12 14:05:09 UTC (rev 653)
+++ mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp 2013-06-14 16:28:01 UTC (rev 654)
@@ -52,7 +52,7 @@
{
#ifdef KEEP_BUFFER
if (!previous_buffer)
- previous_buffer = ( unsigned char * ) mp_malloc ( width * height + ( width * height ) / 2 );
+ previous_buffer = new unsigned char[width * height + ( width * height ) / 2];
#endif
if (((encodedh->comptype == '2') ||
@@ -77,7 +77,7 @@
break;
case '2': /* RTJpeg with LZO */
if (!buffer)
- buffer = ( unsigned char * ) mp_malloc ( width * height + ( width * height ) / 2 );
+ buffer = new unsigned char[width * height + ( width * height ) / 2];
if (!buffer)
{
printf ( "Error decompressing\n" );
Modified: mplayerxp/libmpcodecs/vd_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_lavc.cpp 2013-06-12 14:05:09 UTC (rev 653)
+++ mplayerxp/libmpcodecs/vd_lavc.cpp 2013-06-14 16:28:01 UTC (rev 654)
@@ -234,14 +234,14 @@
}
lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh.codec->dll_name);
if(!lavc_codec){
- MSG_V(MSGTR_MissingLAVCcodec,sh.codec->dll_name);
+ mpxp_v<<MSGTR_MissingLAVCcodec<<sh.codec->dll_name<<std::endl;
throw bad_format_exception();
}
ctx = avcodec_alloc_context3(lavc_codec);
lavc_picture = avcodec_alloc_frame();
if(!(ctx && lavc_picture)) {
- MSG_ERR(MSGTR_OutOfMemory);
+ mpxp_err<<MSGTR_OutOfMemory<<std::endl;
throw std::bad_a...
[truncated message content] |
