From d4bdd0473d6f43132257c9fb3848d829755167a3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 5 Nov 2012 17:02:04 +0100 Subject: Rename directories, move files (step 1 of 2) (does not compile) Tis drops the silly lib prefixes, and attempts to organize the tree in a more logical way. Make the top-level directory less cluttered as well. Renames the following directories: libaf -> audio/filter libao2 -> audio/out libvo -> video/out libmpdemux -> demux Split libmpcodecs: vf* -> video/filter vd*, dec_video.* -> video/decode mp_image*, img_format*, ... -> video/ ad*, dec_audio.* -> audio/decode libaf/format.* is moved to audio/ - this is similar to how mp_image.* is located in video/. Move most top-level .c/.h files to core. (talloc.c/.h is left on top- level, because it's external.) Park some of the more annoying files in compat/. Some of these are relicts from the time mplayer used ffmpeg internals. sub/ is not split, because it's too much of a mess (subtitle code is mixed with OSD display and rendering). Maybe the organization of core is not ideal: it mixes playback core (like mplayer.c) and utility helpers (like bstr.c/h). Should the need arise, the playback core will be moved somewhere else, while core contains all helper and common code. --- asxparser.c | 592 ----- asxparser.h | 27 - audio/decode/ad.c | 50 + audio/decode/ad.h | 54 + audio/decode/ad_dvdpcm.c | 162 ++ audio/decode/ad_internal.h | 46 + audio/decode/ad_lavc.c | 413 ++++ audio/decode/ad_mpg123.c | 489 ++++ audio/decode/ad_pcm.c | 220 ++ audio/decode/ad_spdif.c | 310 +++ audio/decode/dec_audio.c | 462 ++++ audio/decode/dec_audio.h | 38 + audio/filter/af.c | 700 ++++++ audio/filter/af.h | 349 +++ audio/filter/af_bs2b.c | 274 +++ audio/filter/af_center.c | 129 ++ audio/filter/af_channels.c | 306 +++ audio/filter/af_delay.c | 200 ++ audio/filter/af_dummy.c | 76 + audio/filter/af_equalizer.c | 248 ++ audio/filter/af_export.c | 273 +++ audio/filter/af_extrastereo.c | 157 ++ audio/filter/af_format.c | 519 +++++ audio/filter/af_format_alaw.h | 324 +++ audio/filter/af_format_ulaw.h | 837 +++++++ audio/filter/af_hrtf.c | 670 ++++++ audio/filter/af_hrtf.h | 511 +++++ audio/filter/af_karaoke.c | 98 + audio/filter/af_ladspa.c | 915 ++++++++ audio/filter/af_lavcac3enc.c | 332 +++ audio/filter/af_lavcresample.c | 213 ++ audio/filter/af_pan.c | 210 ++ audio/filter/af_resample.c | 394 ++++ audio/filter/af_resample_template.c | 171 ++ audio/filter/af_scaletempo.c | 581 +++++ audio/filter/af_sinesuppress.c | 184 ++ audio/filter/af_sub.c | 188 ++ audio/filter/af_surround.c | 273 +++ audio/filter/af_sweep.c | 103 + audio/filter/af_tools.c | 110 + audio/filter/af_volnorm.c | 353 +++ audio/filter/af_volume.c | 226 ++ audio/filter/control.h | 257 +++ audio/filter/dsp.h | 32 + audio/filter/equalizer.h | 48 + audio/filter/filter.c | 360 +++ audio/filter/filter.h | 75 + audio/filter/window.c | 213 ++ audio/filter/window.h | 43 + audio/format.c | 134 ++ audio/format.h | 137 ++ audio/mixer.c | 292 +++ audio/mixer.h | 61 + audio/out/ao.c | 294 +++ audio/out/ao.h | 140 ++ audio/out/ao_alsa.c | 868 +++++++ audio/out/ao_coreaudio.c | 1283 +++++++++++ audio/out/ao_dsound.c | 648 ++++++ audio/out/ao_jack.c | 361 +++ audio/out/ao_lavc.c | 621 +++++ audio/out/ao_null.c | 129 ++ audio/out/ao_openal.c | 280 +++ audio/out/ao_oss.c | 560 +++++ audio/out/ao_pcm.c | 256 +++ audio/out/ao_portaudio.c | 431 ++++ audio/out/ao_pulse.c | 554 +++++ audio/out/ao_rsound.c | 214 ++ audio/out/audio_out_internal.h | 65 + audio/reorder_ch.c | 1400 ++++++++++++ audio/reorder_ch.h | 133 ++ av_log.c | 137 -- av_log.h | 2 - av_opts.c | 51 - av_opts.h | 30 - bstr.c | 292 --- bstr.h | 175 -- cfg-mplayer.h | 750 ------ codec-cfg.c | 692 ------ codec-cfg.h | 93 - command.c | 2323 ------------------- command.h | 32 - compat/libav.h | 39 + compat/mangle.h | 46 + compat/mpbswap.h | 32 + compat/x86_cpu.h | 76 + core/asxparser.c | 592 +++++ core/asxparser.h | 27 + core/av_log.c | 137 ++ core/av_log.h | 2 + core/av_opts.c | 51 + core/av_opts.h | 30 + core/bstr.c | 292 +++ core/bstr.h | 175 ++ core/cfg-mplayer.h | 750 ++++++ core/codec-cfg.c | 692 ++++++ core/codec-cfg.h | 93 + core/command.c | 2323 +++++++++++++++++++ core/command.h | 32 + core/cpudetect.c | 56 + core/cpudetect.h | 40 + core/defaultopts.c | 77 + core/defaultopts.h | 2 + core/encode.h | 21 + core/encode_lavc.c | 1078 +++++++++ core/encode_lavc.h | 96 + core/input/appleir.c | 155 ++ core/input/ar.c | 469 ++++ core/input/ar.h | 35 + core/input/input.c | 1959 ++++++++++++++++ core/input/input.h | 219 ++ core/input/joystick.c | 162 ++ core/input/joystick.h | 26 + core/input/keycodes.h | 214 ++ core/input/lirc.c | 123 + core/input/lirc.h | 30 + core/m_config.c | 637 ++++++ core/m_config.h | 209 ++ core/m_option.c | 2117 +++++++++++++++++ core/m_option.h | 519 +++++ core/m_property.c | 365 +++ core/m_property.h | 142 ++ core/m_struct.c | 91 + core/m_struct.h | 112 + core/mp_common.c | 36 + core/mp_common.h | 88 + core/mp_core.h | 305 +++ core/mp_fifo.c | 79 + core/mp_fifo.h | 32 + core/mp_msg.c | 309 +++ core/mp_msg.h | 145 ++ core/mp_osd.h | 45 + core/mpc_info.h | 44 + core/mplayer.c | 4302 +++++++++++++++++++++++++++++++++++ core/mplayer.h | 49 + core/options.h | 187 ++ core/parser-cfg.c | 251 ++ core/parser-cfg.h | 26 + core/parser-mpcmd.c | 358 +++ core/parser-mpcmd.h | 33 + core/path.c | 207 ++ core/path.h | 47 + core/playlist.c | 192 ++ core/playlist.h | 67 + core/playlist_parser.c | 780 +++++++ core/playlist_parser.h | 34 + core/quvi.c | 83 + core/screenshot.c | 369 +++ core/screenshot.h | 38 + core/subopt-helper.c | 338 +++ core/subopt-helper.h | 64 + core/timeline/tl_cue.c | 428 ++++ core/timeline/tl_edl.c | 397 ++++ core/timeline/tl_matroska.c | 346 +++ core/version.c | 21 + cpudetect.c | 56 - cpudetect.h | 40 - defaultopts.c | 77 - defaultopts.h | 2 - demux/asf.h | 251 ++ demux/asfguid.h | 89 + demux/asfheader.c | 717 ++++++ demux/asfheader.h | 28 + demux/aviheader.c | 674 ++++++ demux/aviheader.h | 382 ++++ demux/aviprint.c | 197 ++ demux/aviprint.h | 35 + demux/demux.c | 1435 ++++++++++++ demux/demux.h | 414 ++++ demux/demux_asf.c | 697 ++++++ demux/demux_avi.c | 909 ++++++++ demux/demux_cue.c | 65 + demux/demux_edl.c | 58 + demux/demux_gif.c | 338 +++ demux/demux_lavf.c | 1092 +++++++++ demux/demux_mf.c | 226 ++ demux/demux_mkv.c | 2558 +++++++++++++++++++++ demux/demux_mng.c | 623 +++++ demux/demux_mpg.c | 1248 ++++++++++ demux/demux_packet.h | 40 + demux/demux_rawaudio.c | 127 ++ demux/demux_rawvideo.c | 172 ++ demux/demux_ts.c | 3537 ++++++++++++++++++++++++++++ demux/demux_ts.h | 24 + demux/ebml.c | 670 ++++++ demux/ebml.h | 107 + demux/extension.c | 104 + demux/matroska.h | 86 + demux/mf.c | 171 ++ demux/mf.h | 36 + demux/mp3_hdr.c | 144 ++ demux/mp3_hdr.h | 36 + demux/mp_taglists.c | 158 ++ demux/mp_taglists.h | 28 + demux/mpeg_hdr.c | 539 +++++ demux/mpeg_hdr.h | 55 + demux/ms_hdr.h | 114 + demux/parse_es.c | 158 ++ demux/parse_es.h | 45 + demux/stheader.h | 195 ++ demux/video.c | 622 +++++ encode.h | 21 - encode_lavc.c | 1078 --------- encode_lavc.h | 96 - ffmpeg_files/x86_cpu.h | 76 - fmt-conversion.c | 144 -- fmt-conversion.h | 27 - image_writer.c | 327 --- image_writer.h | 53 - input/appleir.c | 155 -- input/ar.c | 469 ---- input/ar.h | 35 - input/input.c | 1959 ---------------- input/input.h | 219 -- input/joystick.c | 162 -- input/joystick.h | 26 - input/keycodes.h | 214 -- input/lirc.c | 123 - input/lirc.h | 30 - libaf/af.c | 700 ------ libaf/af.h | 349 --- libaf/af_bs2b.c | 274 --- libaf/af_center.c | 129 -- libaf/af_channels.c | 306 --- libaf/af_delay.c | 200 -- libaf/af_dummy.c | 76 - libaf/af_equalizer.c | 248 -- libaf/af_export.c | 273 --- libaf/af_extrastereo.c | 157 -- libaf/af_format.c | 519 ----- libaf/af_format_alaw.h | 324 --- libaf/af_format_ulaw.h | 837 ------- libaf/af_hrtf.c | 670 ------ libaf/af_hrtf.h | 511 ----- libaf/af_karaoke.c | 98 - libaf/af_ladspa.c | 915 -------- libaf/af_lavcac3enc.c | 332 --- libaf/af_lavcresample.c | 213 -- libaf/af_pan.c | 210 -- libaf/af_resample.c | 394 ---- libaf/af_resample_template.c | 171 -- libaf/af_scaletempo.c | 581 ----- libaf/af_sinesuppress.c | 184 -- libaf/af_sub.c | 188 -- libaf/af_surround.c | 273 --- libaf/af_sweep.c | 103 - libaf/af_tools.c | 110 - libaf/af_volnorm.c | 353 --- libaf/af_volume.c | 226 -- libaf/control.h | 257 --- libaf/dsp.h | 32 - libaf/equalizer.h | 48 - libaf/filter.c | 360 --- libaf/filter.h | 75 - libaf/format.c | 134 -- libaf/format.h | 137 -- libaf/reorder_ch.c | 1400 ------------ libaf/reorder_ch.h | 133 -- libaf/window.c | 213 -- libaf/window.h | 43 - libao2/ao_alsa.c | 868 ------- libao2/ao_coreaudio.c | 1283 ----------- libao2/ao_dsound.c | 648 ------ libao2/ao_jack.c | 361 --- libao2/ao_lavc.c | 621 ----- libao2/ao_null.c | 129 -- libao2/ao_openal.c | 280 --- libao2/ao_oss.c | 560 ----- libao2/ao_pcm.c | 256 --- libao2/ao_portaudio.c | 431 ---- libao2/ao_pulse.c | 554 ----- libao2/ao_rsound.c | 214 -- libao2/audio_out.c | 294 --- libao2/audio_out.h | 140 -- libao2/audio_out_internal.h | 65 - libav_compat.h | 39 - libmpcodecs/ad.c | 50 - libmpcodecs/ad.h | 54 - libmpcodecs/ad_dvdpcm.c | 162 -- libmpcodecs/ad_ffmpeg.c | 413 ---- libmpcodecs/ad_internal.h | 46 - libmpcodecs/ad_mpg123.c | 489 ---- libmpcodecs/ad_pcm.c | 220 -- libmpcodecs/ad_spdif.c | 310 --- libmpcodecs/dec_audio.c | 462 ---- libmpcodecs/dec_audio.h | 38 - libmpcodecs/dec_video.c | 448 ---- libmpcodecs/dec_video.h | 51 - libmpcodecs/img_format.c | 233 -- libmpcodecs/img_format.h | 243 -- libmpcodecs/mp_image.c | 280 --- libmpcodecs/mp_image.h | 162 -- libmpcodecs/mpc_info.h | 44 - libmpcodecs/pullup.c | 817 ------- libmpcodecs/pullup.h | 102 - libmpcodecs/sws_utils.c | 199 -- libmpcodecs/sws_utils.h | 33 - libmpcodecs/vd.c | 273 --- libmpcodecs/vd.h | 60 - libmpcodecs/vd_ffmpeg.c | 857 ------- libmpcodecs/vf.c | 830 ------- libmpcodecs/vf.h | 189 -- libmpcodecs/vf_crop.c | 196 -- libmpcodecs/vf_delogo.c | 379 --- libmpcodecs/vf_divtc.c | 723 ------ libmpcodecs/vf_dlopen.c | 389 ---- libmpcodecs/vf_dlopen.h | 88 - libmpcodecs/vf_down3dright.c | 166 -- libmpcodecs/vf_dsize.c | 125 - libmpcodecs/vf_eq2.c | 519 ----- libmpcodecs/vf_expand.c | 350 --- libmpcodecs/vf_flip.c | 110 - libmpcodecs/vf_format.c | 91 - libmpcodecs/vf_gradfun.c | 450 ---- libmpcodecs/vf_hqdn3d.c | 373 --- libmpcodecs/vf_ilpack.c | 457 ---- libmpcodecs/vf_mirror.c | 131 -- libmpcodecs/vf_noformat.c | 77 - libmpcodecs/vf_noise.c | 470 ---- libmpcodecs/vf_phase.c | 303 --- libmpcodecs/vf_pp.c | 196 -- libmpcodecs/vf_pullup.c | 333 --- libmpcodecs/vf_rotate.c | 152 -- libmpcodecs/vf_scale.c | 718 ------ libmpcodecs/vf_screenshot.c | 219 -- libmpcodecs/vf_softpulldown.c | 182 -- libmpcodecs/vf_stereo3d.c | 527 ----- libmpcodecs/vf_sub.c | 309 --- libmpcodecs/vf_swapuv.c | 106 - libmpcodecs/vf_unsharp.c | 321 --- libmpcodecs/vf_vo.c | 202 -- libmpcodecs/vf_yadif.c | 533 ----- libmpcodecs/vfcap.h | 46 - libmpdemux/asf.h | 251 -- libmpdemux/asfguid.h | 89 - libmpdemux/asfheader.c | 717 ------ libmpdemux/asfheader.h | 28 - libmpdemux/aviheader.c | 674 ------ libmpdemux/aviheader.h | 382 ---- libmpdemux/aviprint.c | 197 -- libmpdemux/aviprint.h | 35 - libmpdemux/demux_asf.c | 697 ------ libmpdemux/demux_avi.c | 909 -------- libmpdemux/demux_cue.c | 65 - libmpdemux/demux_edl.c | 58 - libmpdemux/demux_gif.c | 338 --- libmpdemux/demux_lavf.c | 1092 --------- libmpdemux/demux_mf.c | 226 -- libmpdemux/demux_mkv.c | 2558 --------------------- libmpdemux/demux_mng.c | 623 ----- libmpdemux/demux_mpg.c | 1248 ---------- libmpdemux/demux_packet.h | 40 - libmpdemux/demux_rawaudio.c | 127 -- libmpdemux/demux_rawvideo.c | 172 -- libmpdemux/demux_ts.c | 3537 ---------------------------- libmpdemux/demux_ts.h | 24 - libmpdemux/demuxer.c | 1435 ------------ libmpdemux/demuxer.h | 414 ---- libmpdemux/ebml.c | 670 ------ libmpdemux/ebml.h | 107 - libmpdemux/extension.c | 104 - libmpdemux/matroska.h | 86 - libmpdemux/mf.c | 171 -- libmpdemux/mf.h | 36 - libmpdemux/mp3_hdr.c | 144 -- libmpdemux/mp3_hdr.h | 36 - libmpdemux/mp_taglists.c | 158 -- libmpdemux/mp_taglists.h | 28 - libmpdemux/mpeg_hdr.c | 539 ----- libmpdemux/mpeg_hdr.h | 55 - libmpdemux/ms_hdr.h | 114 - libmpdemux/parse_es.c | 158 -- libmpdemux/parse_es.h | 45 - libmpdemux/stheader.h | 195 -- libmpdemux/video.c | 622 ----- libvo/aspect.c | 148 -- libvo/aspect.h | 37 - libvo/bitmap_packer.c | 227 -- libvo/bitmap_packer.h | 68 - libvo/cocoa_common.h | 55 - libvo/cocoa_common.m | 865 ------- libvo/csputils.c | 391 ---- libvo/csputils.h | 151 -- libvo/d3d_shader_yuv.h | 142 -- libvo/d3d_shader_yuv.hlsl | 44 - libvo/d3d_shader_yuv_2ch.h | 170 -- libvo/fastmemcpy.h | 77 - libvo/filter_kernels.c | 279 --- libvo/filter_kernels.h | 45 - libvo/geometry.c | 112 - libvo/geometry.h | 29 - libvo/gl_common.c | 2654 --------------------- libvo/gl_common.h | 396 ---- libvo/gl_header_fixes.h | 257 --- libvo/gl_osd.c | 324 --- libvo/gl_osd.h | 43 - libvo/osx_common.c | 145 -- libvo/osx_common.h | 27 - libvo/video_out.c | 530 ----- libvo/video_out.h | 352 --- libvo/vo_caca.c | 395 ---- libvo/vo_corevideo.h | 28 - libvo/vo_corevideo.m | 457 ---- libvo/vo_direct3d.c | 2101 ----------------- libvo/vo_image.c | 198 -- libvo/vo_lavc.c | 553 ----- libvo/vo_null.c | 103 - libvo/vo_opengl.c | 2419 -------------------- libvo/vo_opengl_old.c | 1166 ---------- libvo/vo_opengl_shaders.glsl | 355 --- libvo/vo_vdpau.c | 1718 -------------- libvo/vo_x11.c | 620 ----- libvo/vo_xv.c | 716 ------ libvo/w32_common.c | 757 ------ libvo/w32_common.h | 66 - libvo/x11_common.c | 2404 ------------------- libvo/x11_common.h | 184 -- m_config.c | 637 ------ m_config.h | 209 -- m_option.c | 2117 ----------------- m_option.h | 519 ----- m_property.c | 365 --- m_property.h | 142 -- m_struct.c | 91 - m_struct.h | 112 - mangle.h | 46 - mixer.c | 292 --- mixer.h | 61 - mp_core.h | 305 --- mp_fifo.c | 79 - mp_fifo.h | 32 - mp_msg.c | 309 --- mp_msg.h | 145 -- mp_osd.h | 45 - mpbswap.h | 32 - mpcommon.c | 36 - mpcommon.h | 88 - mplayer.c | 4302 ----------------------------------- mplayer.h | 49 - options.h | 187 -- parser-cfg.c | 251 -- parser-cfg.h | 26 - parser-mpcmd.c | 358 --- parser-mpcmd.h | 33 - path.c | 207 -- path.h | 47 - playlist.c | 192 -- playlist.h | 67 - playlist_parser.c | 780 ------- playlist_parser.h | 34 - pnm_loader.c | 97 - pnm_loader.h | 52 - quvi.c | 83 - screenshot.c | 369 --- screenshot.h | 38 - stream/stream_ffmpeg.c | 170 -- stream/stream_lavf.c | 170 ++ subopt-helper.c | 338 --- subopt-helper.h | 64 - timeline/tl_cue.c | 428 ---- timeline/tl_edl.c | 397 ---- timeline/tl_matroska.c | 346 --- version.c | 21 - video/csputils.c | 391 ++++ video/csputils.h | 151 ++ video/decode/dec_video.c | 448 ++++ video/decode/dec_video.h | 51 + video/decode/vd.c | 273 +++ video/decode/vd.h | 60 + video/decode/vd_lavc.c | 857 +++++++ video/filter/pullup.c | 817 +++++++ video/filter/pullup.h | 102 + video/filter/vf.c | 830 +++++++ video/filter/vf.h | 189 ++ video/filter/vf_crop.c | 196 ++ video/filter/vf_delogo.c | 379 +++ video/filter/vf_divtc.c | 723 ++++++ video/filter/vf_dlopen.c | 389 ++++ video/filter/vf_dlopen.h | 88 + video/filter/vf_down3dright.c | 166 ++ video/filter/vf_dsize.c | 125 + video/filter/vf_eq2.c | 519 +++++ video/filter/vf_expand.c | 350 +++ video/filter/vf_flip.c | 110 + video/filter/vf_format.c | 91 + video/filter/vf_gradfun.c | 450 ++++ video/filter/vf_hqdn3d.c | 373 +++ video/filter/vf_ilpack.c | 457 ++++ video/filter/vf_mirror.c | 131 ++ video/filter/vf_noformat.c | 77 + video/filter/vf_noise.c | 470 ++++ video/filter/vf_phase.c | 303 +++ video/filter/vf_pp.c | 196 ++ video/filter/vf_pullup.c | 333 +++ video/filter/vf_rotate.c | 152 ++ video/filter/vf_scale.c | 718 ++++++ video/filter/vf_screenshot.c | 219 ++ video/filter/vf_softpulldown.c | 182 ++ video/filter/vf_stereo3d.c | 527 +++++ video/filter/vf_sub.c | 309 +++ video/filter/vf_swapuv.c | 106 + video/filter/vf_unsharp.c | 321 +++ video/filter/vf_vo.c | 202 ++ video/filter/vf_yadif.c | 533 +++++ video/fmt-conversion.c | 144 ++ video/fmt-conversion.h | 27 + video/image_writer.c | 327 +++ video/image_writer.h | 53 + video/img_format.c | 233 ++ video/img_format.h | 243 ++ video/memcpy_pic.h | 77 + video/mp_image.c | 280 +++ video/mp_image.h | 162 ++ video/out/aspect.c | 148 ++ video/out/aspect.h | 37 + video/out/bitmap_packer.c | 227 ++ video/out/bitmap_packer.h | 68 + video/out/cocoa_common.h | 55 + video/out/cocoa_common.m | 865 +++++++ video/out/d3d_shader_yuv.h | 142 ++ video/out/d3d_shader_yuv.hlsl | 44 + video/out/d3d_shader_yuv_2ch.h | 170 ++ video/out/filter_kernels.c | 279 +++ video/out/filter_kernels.h | 45 + video/out/geometry.c | 112 + video/out/geometry.h | 29 + video/out/gl_common.c | 2654 +++++++++++++++++++++ video/out/gl_common.h | 396 ++++ video/out/gl_header_fixes.h | 257 +++ video/out/gl_osd.c | 324 +++ video/out/gl_osd.h | 43 + video/out/osx_common.c | 145 ++ video/out/osx_common.h | 27 + video/out/pnm_loader.c | 97 + video/out/pnm_loader.h | 52 + video/out/vo.c | 530 +++++ video/out/vo.h | 352 +++ video/out/vo_caca.c | 395 ++++ video/out/vo_corevideo.h | 28 + video/out/vo_corevideo.m | 457 ++++ video/out/vo_direct3d.c | 2101 +++++++++++++++++ video/out/vo_image.c | 198 ++ video/out/vo_lavc.c | 553 +++++ video/out/vo_null.c | 103 + video/out/vo_opengl.c | 2419 ++++++++++++++++++++ video/out/vo_opengl_old.c | 1166 ++++++++++ video/out/vo_opengl_shaders.glsl | 355 +++ video/out/vo_vdpau.c | 1718 ++++++++++++++ video/out/vo_x11.c | 620 +++++ video/out/vo_xv.c | 716 ++++++ video/out/w32_common.c | 757 ++++++ video/out/w32_common.h | 66 + video/out/x11_common.c | 2404 +++++++++++++++++++ video/out/x11_common.h | 184 ++ video/sws_utils.c | 199 ++ video/sws_utils.h | 33 + video/vfcap.h | 46 + 556 files changed, 102000 insertions(+), 102000 deletions(-) delete mode 100644 asxparser.c delete mode 100644 asxparser.h create mode 100644 audio/decode/ad.c create mode 100644 audio/decode/ad.h create mode 100644 audio/decode/ad_dvdpcm.c create mode 100644 audio/decode/ad_internal.h create mode 100644 audio/decode/ad_lavc.c create mode 100644 audio/decode/ad_mpg123.c create mode 100644 audio/decode/ad_pcm.c create mode 100644 audio/decode/ad_spdif.c create mode 100644 audio/decode/dec_audio.c create mode 100644 audio/decode/dec_audio.h create mode 100644 audio/filter/af.c create mode 100644 audio/filter/af.h create mode 100644 audio/filter/af_bs2b.c create mode 100644 audio/filter/af_center.c create mode 100644 audio/filter/af_channels.c create mode 100644 audio/filter/af_delay.c create mode 100644 audio/filter/af_dummy.c create mode 100644 audio/filter/af_equalizer.c create mode 100644 audio/filter/af_export.c create mode 100644 audio/filter/af_extrastereo.c create mode 100644 audio/filter/af_format.c create mode 100644 audio/filter/af_format_alaw.h create mode 100644 audio/filter/af_format_ulaw.h create mode 100644 audio/filter/af_hrtf.c create mode 100644 audio/filter/af_hrtf.h create mode 100644 audio/filter/af_karaoke.c create mode 100644 audio/filter/af_ladspa.c create mode 100644 audio/filter/af_lavcac3enc.c create mode 100644 audio/filter/af_lavcresample.c create mode 100644 audio/filter/af_pan.c create mode 100644 audio/filter/af_resample.c create mode 100644 audio/filter/af_resample_template.c create mode 100644 audio/filter/af_scaletempo.c create mode 100644 audio/filter/af_sinesuppress.c create mode 100644 audio/filter/af_sub.c create mode 100644 audio/filter/af_surround.c create mode 100644 audio/filter/af_sweep.c create mode 100644 audio/filter/af_tools.c create mode 100644 audio/filter/af_volnorm.c create mode 100644 audio/filter/af_volume.c create mode 100644 audio/filter/control.h create mode 100644 audio/filter/dsp.h create mode 100644 audio/filter/equalizer.h create mode 100644 audio/filter/filter.c create mode 100644 audio/filter/filter.h create mode 100644 audio/filter/window.c create mode 100644 audio/filter/window.h create mode 100644 audio/format.c create mode 100644 audio/format.h create mode 100644 audio/mixer.c create mode 100644 audio/mixer.h create mode 100644 audio/out/ao.c create mode 100644 audio/out/ao.h create mode 100644 audio/out/ao_alsa.c create mode 100644 audio/out/ao_coreaudio.c create mode 100644 audio/out/ao_dsound.c create mode 100644 audio/out/ao_jack.c create mode 100644 audio/out/ao_lavc.c create mode 100644 audio/out/ao_null.c create mode 100644 audio/out/ao_openal.c create mode 100644 audio/out/ao_oss.c create mode 100644 audio/out/ao_pcm.c create mode 100644 audio/out/ao_portaudio.c create mode 100644 audio/out/ao_pulse.c create mode 100644 audio/out/ao_rsound.c create mode 100644 audio/out/audio_out_internal.h create mode 100644 audio/reorder_ch.c create mode 100644 audio/reorder_ch.h delete mode 100644 av_log.c delete mode 100644 av_log.h delete mode 100644 av_opts.c delete mode 100644 av_opts.h delete mode 100644 bstr.c delete mode 100644 bstr.h delete mode 100644 cfg-mplayer.h delete mode 100644 codec-cfg.c delete mode 100644 codec-cfg.h delete mode 100644 command.c delete mode 100644 command.h create mode 100644 compat/libav.h create mode 100644 compat/mangle.h create mode 100644 compat/mpbswap.h create mode 100644 compat/x86_cpu.h create mode 100644 core/asxparser.c create mode 100644 core/asxparser.h create mode 100644 core/av_log.c create mode 100644 core/av_log.h create mode 100644 core/av_opts.c create mode 100644 core/av_opts.h create mode 100644 core/bstr.c create mode 100644 core/bstr.h create mode 100644 core/cfg-mplayer.h create mode 100644 core/codec-cfg.c create mode 100644 core/codec-cfg.h create mode 100644 core/command.c create mode 100644 core/command.h create mode 100644 core/cpudetect.c create mode 100644 core/cpudetect.h create mode 100644 core/defaultopts.c create mode 100644 core/defaultopts.h create mode 100644 core/encode.h create mode 100644 core/encode_lavc.c create mode 100644 core/encode_lavc.h create mode 100644 core/input/appleir.c create mode 100644 core/input/ar.c create mode 100644 core/input/ar.h create mode 100644 core/input/input.c create mode 100644 core/input/input.h create mode 100644 core/input/joystick.c create mode 100644 core/input/joystick.h create mode 100644 core/input/keycodes.h create mode 100644 core/input/lirc.c create mode 100644 core/input/lirc.h create mode 100644 core/m_config.c create mode 100644 core/m_config.h create mode 100644 core/m_option.c create mode 100644 core/m_option.h create mode 100644 core/m_property.c create mode 100644 core/m_property.h create mode 100644 core/m_struct.c create mode 100644 core/m_struct.h create mode 100644 core/mp_common.c create mode 100644 core/mp_common.h create mode 100644 core/mp_core.h create mode 100644 core/mp_fifo.c create mode 100644 core/mp_fifo.h create mode 100644 core/mp_msg.c create mode 100644 core/mp_msg.h create mode 100644 core/mp_osd.h create mode 100644 core/mpc_info.h create mode 100644 core/mplayer.c create mode 100644 core/mplayer.h create mode 100644 core/options.h create mode 100644 core/parser-cfg.c create mode 100644 core/parser-cfg.h create mode 100644 core/parser-mpcmd.c create mode 100644 core/parser-mpcmd.h create mode 100644 core/path.c create mode 100644 core/path.h create mode 100644 core/playlist.c create mode 100644 core/playlist.h create mode 100644 core/playlist_parser.c create mode 100644 core/playlist_parser.h create mode 100644 core/quvi.c create mode 100644 core/screenshot.c create mode 100644 core/screenshot.h create mode 100644 core/subopt-helper.c create mode 100644 core/subopt-helper.h create mode 100644 core/timeline/tl_cue.c create mode 100644 core/timeline/tl_edl.c create mode 100644 core/timeline/tl_matroska.c create mode 100644 core/version.c delete mode 100644 cpudetect.c delete mode 100644 cpudetect.h delete mode 100644 defaultopts.c delete mode 100644 defaultopts.h create mode 100644 demux/asf.h create mode 100644 demux/asfguid.h create mode 100644 demux/asfheader.c create mode 100644 demux/asfheader.h create mode 100644 demux/aviheader.c create mode 100644 demux/aviheader.h create mode 100644 demux/aviprint.c create mode 100644 demux/aviprint.h create mode 100644 demux/demux.c create mode 100644 demux/demux.h create mode 100644 demux/demux_asf.c create mode 100644 demux/demux_avi.c create mode 100644 demux/demux_cue.c create mode 100644 demux/demux_edl.c create mode 100644 demux/demux_gif.c create mode 100644 demux/demux_lavf.c create mode 100644 demux/demux_mf.c create mode 100644 demux/demux_mkv.c create mode 100644 demux/demux_mng.c create mode 100644 demux/demux_mpg.c create mode 100644 demux/demux_packet.h create mode 100644 demux/demux_rawaudio.c create mode 100644 demux/demux_rawvideo.c create mode 100644 demux/demux_ts.c create mode 100644 demux/demux_ts.h create mode 100644 demux/ebml.c create mode 100644 demux/ebml.h create mode 100644 demux/extension.c create mode 100644 demux/matroska.h create mode 100644 demux/mf.c create mode 100644 demux/mf.h create mode 100644 demux/mp3_hdr.c create mode 100644 demux/mp3_hdr.h create mode 100644 demux/mp_taglists.c create mode 100644 demux/mp_taglists.h create mode 100644 demux/mpeg_hdr.c create mode 100644 demux/mpeg_hdr.h create mode 100644 demux/ms_hdr.h create mode 100644 demux/parse_es.c create mode 100644 demux/parse_es.h create mode 100644 demux/stheader.h create mode 100644 demux/video.c delete mode 100644 encode.h delete mode 100644 encode_lavc.c delete mode 100644 encode_lavc.h delete mode 100644 ffmpeg_files/x86_cpu.h delete mode 100644 fmt-conversion.c delete mode 100644 fmt-conversion.h delete mode 100644 image_writer.c delete mode 100644 image_writer.h delete mode 100644 input/appleir.c delete mode 100644 input/ar.c delete mode 100644 input/ar.h delete mode 100644 input/input.c delete mode 100644 input/input.h delete mode 100644 input/joystick.c delete mode 100644 input/joystick.h delete mode 100644 input/keycodes.h delete mode 100644 input/lirc.c delete mode 100644 input/lirc.h delete mode 100644 libaf/af.c delete mode 100644 libaf/af.h delete mode 100644 libaf/af_bs2b.c delete mode 100644 libaf/af_center.c delete mode 100644 libaf/af_channels.c delete mode 100644 libaf/af_delay.c delete mode 100644 libaf/af_dummy.c delete mode 100644 libaf/af_equalizer.c delete mode 100644 libaf/af_export.c delete mode 100644 libaf/af_extrastereo.c delete mode 100644 libaf/af_format.c delete mode 100644 libaf/af_format_alaw.h delete mode 100644 libaf/af_format_ulaw.h delete mode 100644 libaf/af_hrtf.c delete mode 100644 libaf/af_hrtf.h delete mode 100644 libaf/af_karaoke.c delete mode 100644 libaf/af_ladspa.c delete mode 100644 libaf/af_lavcac3enc.c delete mode 100644 libaf/af_lavcresample.c delete mode 100644 libaf/af_pan.c delete mode 100644 libaf/af_resample.c delete mode 100644 libaf/af_resample_template.c delete mode 100644 libaf/af_scaletempo.c delete mode 100644 libaf/af_sinesuppress.c delete mode 100644 libaf/af_sub.c delete mode 100644 libaf/af_surround.c delete mode 100644 libaf/af_sweep.c delete mode 100644 libaf/af_tools.c delete mode 100644 libaf/af_volnorm.c delete mode 100644 libaf/af_volume.c delete mode 100644 libaf/control.h delete mode 100644 libaf/dsp.h delete mode 100644 libaf/equalizer.h delete mode 100644 libaf/filter.c delete mode 100644 libaf/filter.h delete mode 100644 libaf/format.c delete mode 100644 libaf/format.h delete mode 100644 libaf/reorder_ch.c delete mode 100644 libaf/reorder_ch.h delete mode 100644 libaf/window.c delete mode 100644 libaf/window.h delete mode 100644 libao2/ao_alsa.c delete mode 100644 libao2/ao_coreaudio.c delete mode 100644 libao2/ao_dsound.c delete mode 100644 libao2/ao_jack.c delete mode 100644 libao2/ao_lavc.c delete mode 100644 libao2/ao_null.c delete mode 100644 libao2/ao_openal.c delete mode 100644 libao2/ao_oss.c delete mode 100644 libao2/ao_pcm.c delete mode 100644 libao2/ao_portaudio.c delete mode 100644 libao2/ao_pulse.c delete mode 100644 libao2/ao_rsound.c delete mode 100644 libao2/audio_out.c delete mode 100644 libao2/audio_out.h delete mode 100644 libao2/audio_out_internal.h delete mode 100644 libav_compat.h delete mode 100644 libmpcodecs/ad.c delete mode 100644 libmpcodecs/ad.h delete mode 100644 libmpcodecs/ad_dvdpcm.c delete mode 100644 libmpcodecs/ad_ffmpeg.c delete mode 100644 libmpcodecs/ad_internal.h delete mode 100644 libmpcodecs/ad_mpg123.c delete mode 100644 libmpcodecs/ad_pcm.c delete mode 100644 libmpcodecs/ad_spdif.c delete mode 100644 libmpcodecs/dec_audio.c delete mode 100644 libmpcodecs/dec_audio.h delete mode 100644 libmpcodecs/dec_video.c delete mode 100644 libmpcodecs/dec_video.h delete mode 100644 libmpcodecs/img_format.c delete mode 100644 libmpcodecs/img_format.h delete mode 100644 libmpcodecs/mp_image.c delete mode 100644 libmpcodecs/mp_image.h delete mode 100644 libmpcodecs/mpc_info.h delete mode 100644 libmpcodecs/pullup.c delete mode 100644 libmpcodecs/pullup.h delete mode 100644 libmpcodecs/sws_utils.c delete mode 100644 libmpcodecs/sws_utils.h delete mode 100644 libmpcodecs/vd.c delete mode 100644 libmpcodecs/vd.h delete mode 100644 libmpcodecs/vd_ffmpeg.c delete mode 100644 libmpcodecs/vf.c delete mode 100644 libmpcodecs/vf.h delete mode 100644 libmpcodecs/vf_crop.c delete mode 100644 libmpcodecs/vf_delogo.c delete mode 100644 libmpcodecs/vf_divtc.c delete mode 100644 libmpcodecs/vf_dlopen.c delete mode 100644 libmpcodecs/vf_dlopen.h delete mode 100644 libmpcodecs/vf_down3dright.c delete mode 100644 libmpcodecs/vf_dsize.c delete mode 100644 libmpcodecs/vf_eq2.c delete mode 100644 libmpcodecs/vf_expand.c delete mode 100644 libmpcodecs/vf_flip.c delete mode 100644 libmpcodecs/vf_format.c delete mode 100644 libmpcodecs/vf_gradfun.c delete mode 100644 libmpcodecs/vf_hqdn3d.c delete mode 100644 libmpcodecs/vf_ilpack.c delete mode 100644 libmpcodecs/vf_mirror.c delete mode 100644 libmpcodecs/vf_noformat.c delete mode 100644 libmpcodecs/vf_noise.c delete mode 100644 libmpcodecs/vf_phase.c delete mode 100644 libmpcodecs/vf_pp.c delete mode 100644 libmpcodecs/vf_pullup.c delete mode 100644 libmpcodecs/vf_rotate.c delete mode 100644 libmpcodecs/vf_scale.c delete mode 100644 libmpcodecs/vf_screenshot.c delete mode 100644 libmpcodecs/vf_softpulldown.c delete mode 100644 libmpcodecs/vf_stereo3d.c delete mode 100644 libmpcodecs/vf_sub.c delete mode 100644 libmpcodecs/vf_swapuv.c delete mode 100644 libmpcodecs/vf_unsharp.c delete mode 100644 libmpcodecs/vf_vo.c delete mode 100644 libmpcodecs/vf_yadif.c delete mode 100644 libmpcodecs/vfcap.h delete mode 100644 libmpdemux/asf.h delete mode 100644 libmpdemux/asfguid.h delete mode 100644 libmpdemux/asfheader.c delete mode 100644 libmpdemux/asfheader.h delete mode 100644 libmpdemux/aviheader.c delete mode 100644 libmpdemux/aviheader.h delete mode 100644 libmpdemux/aviprint.c delete mode 100644 libmpdemux/aviprint.h delete mode 100644 libmpdemux/demux_asf.c delete mode 100644 libmpdemux/demux_avi.c delete mode 100644 libmpdemux/demux_cue.c delete mode 100644 libmpdemux/demux_edl.c delete mode 100644 libmpdemux/demux_gif.c delete mode 100644 libmpdemux/demux_lavf.c delete mode 100644 libmpdemux/demux_mf.c delete mode 100644 libmpdemux/demux_mkv.c delete mode 100644 libmpdemux/demux_mng.c delete mode 100644 libmpdemux/demux_mpg.c delete mode 100644 libmpdemux/demux_packet.h delete mode 100644 libmpdemux/demux_rawaudio.c delete mode 100644 libmpdemux/demux_rawvideo.c delete mode 100644 libmpdemux/demux_ts.c delete mode 100644 libmpdemux/demux_ts.h delete mode 100644 libmpdemux/demuxer.c delete mode 100644 libmpdemux/demuxer.h delete mode 100644 libmpdemux/ebml.c delete mode 100644 libmpdemux/ebml.h delete mode 100644 libmpdemux/extension.c delete mode 100644 libmpdemux/matroska.h delete mode 100644 libmpdemux/mf.c delete mode 100644 libmpdemux/mf.h delete mode 100644 libmpdemux/mp3_hdr.c delete mode 100644 libmpdemux/mp3_hdr.h delete mode 100644 libmpdemux/mp_taglists.c delete mode 100644 libmpdemux/mp_taglists.h delete mode 100644 libmpdemux/mpeg_hdr.c delete mode 100644 libmpdemux/mpeg_hdr.h delete mode 100644 libmpdemux/ms_hdr.h delete mode 100644 libmpdemux/parse_es.c delete mode 100644 libmpdemux/parse_es.h delete mode 100644 libmpdemux/stheader.h delete mode 100644 libmpdemux/video.c delete mode 100644 libvo/aspect.c delete mode 100644 libvo/aspect.h delete mode 100644 libvo/bitmap_packer.c delete mode 100644 libvo/bitmap_packer.h delete mode 100644 libvo/cocoa_common.h delete mode 100644 libvo/cocoa_common.m delete mode 100644 libvo/csputils.c delete mode 100644 libvo/csputils.h delete mode 100644 libvo/d3d_shader_yuv.h delete mode 100644 libvo/d3d_shader_yuv.hlsl delete mode 100644 libvo/d3d_shader_yuv_2ch.h delete mode 100644 libvo/fastmemcpy.h delete mode 100644 libvo/filter_kernels.c delete mode 100644 libvo/filter_kernels.h delete mode 100644 libvo/geometry.c delete mode 100644 libvo/geometry.h delete mode 100644 libvo/gl_common.c delete mode 100644 libvo/gl_common.h delete mode 100644 libvo/gl_header_fixes.h delete mode 100644 libvo/gl_osd.c delete mode 100644 libvo/gl_osd.h delete mode 100644 libvo/osx_common.c delete mode 100644 libvo/osx_common.h delete mode 100644 libvo/video_out.c delete mode 100644 libvo/video_out.h delete mode 100644 libvo/vo_caca.c delete mode 100644 libvo/vo_corevideo.h delete mode 100644 libvo/vo_corevideo.m delete mode 100644 libvo/vo_direct3d.c delete mode 100644 libvo/vo_image.c delete mode 100644 libvo/vo_lavc.c delete mode 100644 libvo/vo_null.c delete mode 100644 libvo/vo_opengl.c delete mode 100644 libvo/vo_opengl_old.c delete mode 100644 libvo/vo_opengl_shaders.glsl delete mode 100644 libvo/vo_vdpau.c delete mode 100644 libvo/vo_x11.c delete mode 100644 libvo/vo_xv.c delete mode 100644 libvo/w32_common.c delete mode 100644 libvo/w32_common.h delete mode 100644 libvo/x11_common.c delete mode 100644 libvo/x11_common.h delete mode 100644 m_config.c delete mode 100644 m_config.h delete mode 100644 m_option.c delete mode 100644 m_option.h delete mode 100644 m_property.c delete mode 100644 m_property.h delete mode 100644 m_struct.c delete mode 100644 m_struct.h delete mode 100644 mangle.h delete mode 100644 mixer.c delete mode 100644 mixer.h delete mode 100644 mp_core.h delete mode 100644 mp_fifo.c delete mode 100644 mp_fifo.h delete mode 100644 mp_msg.c delete mode 100644 mp_msg.h delete mode 100644 mp_osd.h delete mode 100644 mpbswap.h delete mode 100644 mpcommon.c delete mode 100644 mpcommon.h delete mode 100644 mplayer.c delete mode 100644 mplayer.h delete mode 100644 options.h delete mode 100644 parser-cfg.c delete mode 100644 parser-cfg.h delete mode 100644 parser-mpcmd.c delete mode 100644 parser-mpcmd.h delete mode 100644 path.c delete mode 100644 path.h delete mode 100644 playlist.c delete mode 100644 playlist.h delete mode 100644 playlist_parser.c delete mode 100644 playlist_parser.h delete mode 100644 pnm_loader.c delete mode 100644 pnm_loader.h delete mode 100644 quvi.c delete mode 100644 screenshot.c delete mode 100644 screenshot.h delete mode 100644 stream/stream_ffmpeg.c create mode 100644 stream/stream_lavf.c delete mode 100644 subopt-helper.c delete mode 100644 subopt-helper.h delete mode 100644 timeline/tl_cue.c delete mode 100644 timeline/tl_edl.c delete mode 100644 timeline/tl_matroska.c delete mode 100644 version.c create mode 100644 video/csputils.c create mode 100644 video/csputils.h create mode 100644 video/decode/dec_video.c create mode 100644 video/decode/dec_video.h create mode 100644 video/decode/vd.c create mode 100644 video/decode/vd.h create mode 100644 video/decode/vd_lavc.c create mode 100644 video/filter/pullup.c create mode 100644 video/filter/pullup.h create mode 100644 video/filter/vf.c create mode 100644 video/filter/vf.h create mode 100644 video/filter/vf_crop.c create mode 100644 video/filter/vf_delogo.c create mode 100644 video/filter/vf_divtc.c create mode 100644 video/filter/vf_dlopen.c create mode 100644 video/filter/vf_dlopen.h create mode 100644 video/filter/vf_down3dright.c create mode 100644 video/filter/vf_dsize.c create mode 100644 video/filter/vf_eq2.c create mode 100644 video/filter/vf_expand.c create mode 100644 video/filter/vf_flip.c create mode 100644 video/filter/vf_format.c create mode 100644 video/filter/vf_gradfun.c create mode 100644 video/filter/vf_hqdn3d.c create mode 100644 video/filter/vf_ilpack.c create mode 100644 video/filter/vf_mirror.c create mode 100644 video/filter/vf_noformat.c create mode 100644 video/filter/vf_noise.c create mode 100644 video/filter/vf_phase.c create mode 100644 video/filter/vf_pp.c create mode 100644 video/filter/vf_pullup.c create mode 100644 video/filter/vf_rotate.c create mode 100644 video/filter/vf_scale.c create mode 100644 video/filter/vf_screenshot.c create mode 100644 video/filter/vf_softpulldown.c create mode 100644 video/filter/vf_stereo3d.c create mode 100644 video/filter/vf_sub.c create mode 100644 video/filter/vf_swapuv.c create mode 100644 video/filter/vf_unsharp.c create mode 100644 video/filter/vf_vo.c create mode 100644 video/filter/vf_yadif.c create mode 100644 video/fmt-conversion.c create mode 100644 video/fmt-conversion.h create mode 100644 video/image_writer.c create mode 100644 video/image_writer.h create mode 100644 video/img_format.c create mode 100644 video/img_format.h create mode 100644 video/memcpy_pic.h create mode 100644 video/mp_image.c create mode 100644 video/mp_image.h create mode 100644 video/out/aspect.c create mode 100644 video/out/aspect.h create mode 100644 video/out/bitmap_packer.c create mode 100644 video/out/bitmap_packer.h create mode 100644 video/out/cocoa_common.h create mode 100644 video/out/cocoa_common.m create mode 100644 video/out/d3d_shader_yuv.h create mode 100644 video/out/d3d_shader_yuv.hlsl create mode 100644 video/out/d3d_shader_yuv_2ch.h create mode 100644 video/out/filter_kernels.c create mode 100644 video/out/filter_kernels.h create mode 100644 video/out/geometry.c create mode 100644 video/out/geometry.h create mode 100644 video/out/gl_common.c create mode 100644 video/out/gl_common.h create mode 100644 video/out/gl_header_fixes.h create mode 100644 video/out/gl_osd.c create mode 100644 video/out/gl_osd.h create mode 100644 video/out/osx_common.c create mode 100644 video/out/osx_common.h create mode 100644 video/out/pnm_loader.c create mode 100644 video/out/pnm_loader.h create mode 100644 video/out/vo.c create mode 100644 video/out/vo.h create mode 100644 video/out/vo_caca.c create mode 100644 video/out/vo_corevideo.h create mode 100644 video/out/vo_corevideo.m create mode 100644 video/out/vo_direct3d.c create mode 100644 video/out/vo_image.c create mode 100644 video/out/vo_lavc.c create mode 100644 video/out/vo_null.c create mode 100644 video/out/vo_opengl.c create mode 100644 video/out/vo_opengl_old.c create mode 100644 video/out/vo_opengl_shaders.glsl create mode 100644 video/out/vo_vdpau.c create mode 100644 video/out/vo_x11.c create mode 100644 video/out/vo_xv.c create mode 100644 video/out/w32_common.c create mode 100644 video/out/w32_common.h create mode 100644 video/out/x11_common.c create mode 100644 video/out/x11_common.h create mode 100644 video/sws_utils.c create mode 100644 video/sws_utils.h create mode 100644 video/vfcap.h diff --git a/asxparser.c b/asxparser.c deleted file mode 100644 index 44236b8c18..0000000000 --- a/asxparser.c +++ /dev/null @@ -1,592 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include -#include -#include -#include -#include - -#include "playlist.h" -#include "playlist_parser.h" -#include "stream/stream.h" -#include "libmpdemux/demuxer.h" -#include "asxparser.h" -#include "mp_msg.h" - - -typedef struct ASX_Parser_t ASX_Parser_t; - -typedef struct { - char* buffer; - int line; -} ASX_LineSave_t; - -struct ASX_Parser_t { - int line; // Curent line - ASX_LineSave_t *ret_stack; - int ret_stack_size; - char* last_body; - int deep; - struct playlist *pl; -}; - -ASX_Parser_t *asx_parser_new(struct playlist *pl); - -void -asx_parser_free(ASX_Parser_t* parser); - -/* - * Return -1 on error, 0 when nothing is found, 1 on sucess - */ -int -asx_get_element(ASX_Parser_t* parser,char** _buffer, - char** _element,char** _body,char*** _attribs); - -int -asx_parse_attribs(ASX_Parser_t* parser,char* buffer,char*** _attribs); - -/////// Attribs utils - -char* -asx_get_attrib(const char* attrib,char** attribs); - -#define asx_free_attribs(a) asx_list_free(&a,free) - -////// List utils - -typedef void (*ASX_FreeFunc)(void* arg); - -void -asx_list_free(void* list_ptr,ASX_FreeFunc free_func); - - -////// List utils - -void -asx_list_free(void* list_ptr,ASX_FreeFunc free_func) { - void** ptr = *(void***)list_ptr; - if(ptr == NULL) return; - if(free_func != NULL) { - for( ; *ptr != NULL ; ptr++) - free_func(*ptr); - } - free(*(void**)list_ptr); - *(void**)list_ptr = NULL; -} - -/////// Attribs utils - -char* -asx_get_attrib(const char* attrib,char** attribs) { - char** ptr; - - if(attrib == NULL || attribs == NULL) return NULL; - for(ptr = attribs; ptr[0] != NULL; ptr += 2){ - if(strcasecmp(ptr[0],attrib) == 0) - return strdup(ptr[1]); - } - return NULL; -} - -#define asx_warning_attrib_required(p,e,a) mp_msg(MSGT_PLAYTREE,MSGL_WARN,"At line %d : element %s don't have the required attribute %s",p->line,e,a) -#define asx_warning_body_parse_error(p,e) mp_msg(MSGT_PLAYTREE,MSGL_WARN,"At line %d : error while parsing %s body",p->line,e) - -ASX_Parser_t *asx_parser_new(struct playlist *pl) -{ - ASX_Parser_t* parser = calloc(1,sizeof(ASX_Parser_t)); - parser->pl = pl; - return parser; -} - -void -asx_parser_free(ASX_Parser_t* parser) { - if(!parser) return; - free(parser->ret_stack); - free(parser); - -} - -#define LETTER "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define SPACE " \n\t\r" - -int -asx_parse_attribs(ASX_Parser_t* parser,char* buffer,char*** _attribs) { - char *ptr1, *ptr2, *ptr3; - int n_attrib = 0; - char **attribs = NULL; - char *attrib, *val; - - ptr1 = buffer; - while(1) { - for( ; strchr(SPACE,*ptr1) != NULL; ptr1++) { // Skip space - if(*ptr1 == '\0') break; - } - ptr3 = strchr(ptr1,'='); - if(ptr3 == NULL) break; - for(ptr2 = ptr3-1; strchr(SPACE,*ptr2) != NULL; ptr2--) { - if (ptr2 == ptr1) { - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : this should never append, back to attribute begin while skipping end space",parser->line); - break; - } - } - attrib = malloc(ptr2-ptr1+2); - strncpy(attrib,ptr1,ptr2-ptr1+1); - attrib[ptr2-ptr1+1] = '\0'; - - ptr1 = strchr(ptr3,'"'); - if(ptr1 == NULL || ptr1[1] == '\0') ptr1 = strchr(ptr3,'\''); - if(ptr1 == NULL || ptr1[1] == '\0') { - mp_msg(MSGT_PLAYTREE,MSGL_WARN,"At line %d : can't find attribute %s value",parser->line,attrib); - free(attrib); - break; - } - ptr2 = strchr(ptr1+1,ptr1[0]); - if (ptr2 == NULL) { - mp_msg(MSGT_PLAYTREE,MSGL_WARN,"At line %d : value of attribute %s isn't finished",parser->line,attrib); - free(attrib); - break; - } - ptr1++; - val = malloc(ptr2-ptr1+1); - strncpy(val,ptr1,ptr2-ptr1); - val[ptr2-ptr1] = '\0'; - n_attrib++; - - attribs = realloc(attribs, (2 * n_attrib + 1) * sizeof(char*)); - attribs[n_attrib*2-2] = attrib; - attribs[n_attrib*2-1] = val; - - ptr1 = ptr2+1; - } - - if(n_attrib > 0) - attribs[n_attrib*2] = NULL; - - *_attribs = attribs; - - return n_attrib; -} - -/* - * Return -1 on error, 0 when nothing is found, 1 on sucess - */ -int -asx_get_element(ASX_Parser_t* parser,char** _buffer, - char** _element,char** _body,char*** _attribs) { - char *ptr1,*ptr2, *ptr3, *ptr4; - char *attribs = NULL; - char *element = NULL, *body = NULL, *ret = NULL, *buffer; - int n_attrib = 0; - int body_line = 0,attrib_line,ret_line,in = 0; - int quotes = 0; - - if(_buffer == NULL || _element == NULL || _body == NULL || _attribs == NULL) { - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : asx_get_element called with invalid value",parser->line); - return -1; - } - - *_body = *_element = NULL; - *_attribs = NULL; - buffer = *_buffer; - - if(buffer == NULL) return 0; - - if(parser->ret_stack && /*parser->last_body && */buffer != parser->last_body) { - ASX_LineSave_t* ls = parser->ret_stack; - int i; - for(i = 0 ; i < parser->ret_stack_size ; i++) { - if(buffer == ls[i].buffer) { - parser->line = ls[i].line; - break; - } - - } - if( i < parser->ret_stack_size) { - i++; - if( i < parser->ret_stack_size) - memmove(parser->ret_stack,parser->ret_stack+i, (parser->ret_stack_size - i)*sizeof(ASX_LineSave_t)); - parser->ret_stack_size -= i; - if(parser->ret_stack_size > 0) - parser->ret_stack = realloc(parser->ret_stack,parser->ret_stack_size*sizeof(ASX_LineSave_t)); - else { - free(parser->ret_stack); - parser->ret_stack = NULL; - } - } - } - - ptr1 = buffer; - while(1) { - for( ; ptr1[0] != '<' ; ptr1++) { - if(ptr1[0] == '\0') { - ptr1 = NULL; - break; - } - if(ptr1[0] == '\n') parser->line++; - } - //ptr1 = strchr(ptr1,'<'); - if(!ptr1 || ptr1[1] == '\0') return 0; // Nothing found - - if(strncmp(ptr1,"",3) != 0 ; ptr1++) { - if(ptr1[0] == '\0') { - ptr1 = NULL; - break; - } - if(ptr1[0] == '\n') parser->line++; - } - //ptr1 = strstr(ptr1,"-->"); - if(!ptr1) { - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : unfinished comment",parser->line); - return -1; - } - } else { - break; - } - } - - // Is this space skip very useful ?? - for(ptr1++; strchr(SPACE,ptr1[0]) != NULL; ptr1++) { // Skip space - if(ptr1[0] == '\0') { - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : EOB reached while parsing element start",parser->line); - return -1; - } - if(ptr1[0] == '\n') parser->line++; - } - - for(ptr2 = ptr1; strchr(LETTER,*ptr2) != NULL;ptr2++) { // Go to end of name - if(*ptr2 == '\0'){ - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : EOB reached while parsing element start",parser->line); - return -1; - } - if(ptr2[0] == '\n') parser->line++; - } - - element = malloc(ptr2-ptr1+1); - strncpy(element,ptr1,ptr2-ptr1); - element[ptr2-ptr1] = '\0'; - - for( ; strchr(SPACE,*ptr2) != NULL; ptr2++) { // Skip space - if(ptr2[0] == '\0') { - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : EOB reached while parsing element start",parser->line); - free(element); - return -1; - } - if(ptr2[0] == '\n') parser->line++; - } - attrib_line = parser->line; - - - - for(ptr3 = ptr2; ptr3[0] != '\0'; ptr3++) { // Go to element end - if(ptr3[0] == '"') quotes ^= 1; - if(!quotes && (ptr3[0] == '>' || strncmp(ptr3,"/>",2) == 0)) - break; - if(ptr3[0] == '\n') parser->line++; - } - if(ptr3[0] == '\0' || ptr3[1] == '\0') { // End of file - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : EOB reached while parsing element start",parser->line); - free(element); - return -1; - } - - // Save attribs string - if(ptr3-ptr2 > 0) { - attribs = malloc(ptr3-ptr2+1); - strncpy(attribs,ptr2,ptr3-ptr2); - attribs[ptr3-ptr2] = '\0'; - } - //bs_line = parser->line; - if(ptr3[0] != '/') { // Not Self closed element - ptr3++; - for( ; strchr(SPACE,*ptr3) != NULL; ptr3++) { // Skip space on body begin - if(*ptr3 == '\0') { - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : EOB reached while parsing %s element body",parser->line,element); - free(element); - free(attribs); - return -1; - } - if(ptr3[0] == '\n') parser->line++; - } - ptr4 = ptr3; - body_line = parser->line; - while(1) { // Find closing element - for( ; ptr4[0] != '<' ; ptr4++) { - if(ptr4[0] == '\0') { - ptr4 = NULL; - break; - } - if(ptr4[0] == '\n') parser->line++; - } - if(ptr4 && strncmp(ptr4,"",3) != 0 ; ptr4++) { - if(ptr4[0] == '\0') { - ptr4 = NULL; - break; - } - if(ptr1[0] == '\n') parser->line++; - } - continue; - } - if(ptr4 == NULL || ptr4[1] == '\0') { - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : EOB reached while parsing %s element body",parser->line,element); - free(element); - free(attribs); - return -1; - } - if(ptr4[1] != '/' && strncasecmp(element,ptr4+1,strlen(element)) == 0) { - in++; - ptr4+=2; - continue; - } else if(strncasecmp(element,ptr4+2,strlen(element)) == 0) { // Extract body - if(in > 0) { - in--; - ptr4 += 2+strlen(element); - continue; - } - ret = ptr4+strlen(element)+3; - if(ptr4 != ptr3) { - ptr4--; - for( ; ptr4 != ptr3 && strchr(SPACE,*ptr4) != NULL; ptr4--) ;// Skip space on body end - // if(ptr4[0] == '\0') parser->line--; - //} - ptr4++; - body = malloc(ptr4-ptr3+1); - strncpy(body,ptr3,ptr4-ptr3); - body[ptr4-ptr3] = '\0'; - } - break; - } else { - ptr4 += 2; - } - } - } else { - ret = ptr3 + 2; // 2 is for /> - } - - for( ; ret[0] != '\0' && strchr(SPACE,ret[0]) != NULL; ret++) { // Skip space - if(ret[0] == '\n') parser->line++; - } - - ret_line = parser->line; - - if(attribs) { - parser->line = attrib_line; - n_attrib = asx_parse_attribs(parser,attribs,_attribs); - free(attribs); - if(n_attrib < 0) { - mp_msg(MSGT_PLAYTREE,MSGL_WARN,"At line %d : error while parsing element %s attributes",parser->line,element); - free(element); - free(body); - return -1; - } - } else - *_attribs = NULL; - - *_element = element; - *_body = body; - - parser->last_body = body; - parser->ret_stack_size++; - parser->ret_stack = realloc(parser->ret_stack,parser->ret_stack_size*sizeof(ASX_LineSave_t)); - if(parser->ret_stack_size > 1) - memmove(parser->ret_stack+1,parser->ret_stack,(parser->ret_stack_size-1)*sizeof(ASX_LineSave_t)); - parser->ret_stack[0].buffer = ret; - parser->ret_stack[0].line = ret_line; - parser->line = body ? body_line : ret_line; - - *_buffer = ret; - return 1; - -} - -static void -asx_parse_ref(ASX_Parser_t* parser, char** attribs) { - char *href; - - href = asx_get_attrib("HREF",attribs); - if(href == NULL) { - asx_warning_attrib_required(parser,"REF" ,"HREF" ); - return; - } -#if 0 - // replace http my mmshttp to avoid infinite loops - // disabled since some playlists for e.g. WinAMP use asx as well - // "-user-agent NSPlayer/4.1.0.3856" is a possible workaround - if (strncmp(href, "http://", 7) == 0) { - char *newref = malloc(3 + strlen(href) + 1); - strcpy(newref, "mms"); - strcpy(newref + 3, href); - free(href); - href = newref; - } -#endif - - playlist_add_file(parser->pl, href); - - mp_msg(MSGT_PLAYTREE,MSGL_V,"Adding file %s to element entry\n",href); - - free(href); - -} - -static void asx_parse_entryref(ASX_Parser_t* parser,char* buffer,char** _attribs) { - char *href; - stream_t* stream; - int f=DEMUXER_TYPE_UNKNOWN; - - if(parser->deep > 0) - return; - - href = asx_get_attrib("HREF",_attribs); - if(href == NULL) { - asx_warning_attrib_required(parser,"ENTRYREF" ,"HREF" ); - return; - } - stream=open_stream(href,0,&f); - if(!stream) { - mp_msg(MSGT_PLAYTREE,MSGL_WARN,"Can't open playlist %s\n",href); - free(href); - return; - } - - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Not recursively loading playlist %s\n",href); - - free_stream(stream); - free(href); - //mp_msg(MSGT_PLAYTREE,MSGL_INFO,"Need to implement entryref\n"); -} - -static void asx_parse_entry(ASX_Parser_t* parser,char* buffer,char** _attribs) { - char *element,*body,**attribs; - int r; - - while(buffer && buffer[0] != '\0') { - r = asx_get_element(parser,&buffer,&element,&body,&attribs); - if(r < 0) { - asx_warning_body_parse_error(parser,"ENTRY"); - return; - } else if (r == 0) { // No more element - break; - } - if(strcasecmp(element,"REF") == 0) { - asx_parse_ref(parser,attribs); - mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Adding element %s to entry\n",element); - } else - mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Ignoring element %s\n",element); - free(body); - asx_free_attribs(attribs); - } - -} - - -static void asx_parse_repeat(ASX_Parser_t* parser,char* buffer,char** _attribs) { - char *element,*body,**attribs; - int r; - - asx_get_attrib("COUNT",_attribs); - mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Ignoring repeated playlist entries\n"); - - while(buffer && buffer[0] != '\0') { - r = asx_get_element(parser,&buffer,&element,&body,&attribs); - if(r < 0) { - asx_warning_body_parse_error(parser,"REPEAT"); - return; - } else if (r == 0) { // No more element - break; - } - if(strcasecmp(element,"ENTRY") == 0) { - asx_parse_entry(parser,body,attribs); - } else if(strcasecmp(element,"ENTRYREF") == 0) { - asx_parse_entryref(parser,body,attribs); - } else if(strcasecmp(element,"REPEAT") == 0) { - asx_parse_repeat(parser,body,attribs); - } else - mp_msg(MSGT