summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* core: Better -nocorrect-pts pause and filter-added frames handlingUoti Urpala2009-01-144-58/+79
| | | | | | | | | | | | Rewrite the -nocorrect-pts frame creation code. The new version always updates the visible frame when seeking while pausing, and supports filter-added frames. It can not time those properly though. Now the handling of filter-added frames in MPlayer always uses the new method independently of the value of correct-pts but MEncoder still expects the old behavior. Add a global variable that is set under MEncoder only and change the filters to choose behavior based on that instead of the correct_pts option.
* core: Set OSD contents better while pausedUoti Urpala2009-01-141-2/+8
| | | | | | Handle timing out of OSD messages and set the OSD function symbol to pause instead of play. The implementation is hackish and should be cleaned up later with other pause loop changes.
* vo_gl: Support changing OSD over existing frameUoti Urpala2009-01-141-0/+6
|
* core: Rewrite some of the A/V sync related codeUoti Urpala2009-01-142-82/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | Notable functionality changes: * Timing change between any two frames is now accurately limited to 1/10 of their nominal distance. Previous code did not always use the correct duration. * The status line now keeps showing the same A-V sync value from one video frame change to the next. Previously it kept recalculating the value using a new audio position but the same video position when the status line was updated between video frames. This incorrectly showed the video losing sync with audio. * The status line now displays actual measured A-V difference in autosync mode too. The previous code displayed values that completely ignored real timing in autosync mode, showing 0 A-V difference even when video was significantly behind audio due to inadequate decoding speed. The new behavior can make the shown A-V values appear more unstable if the audio out has unreliable delay measurements (the most likely reason to use autosync), but this is a display change rather than a timing quality change. * Autosync mode now tries to adjust timing by the amount of time vo_flip() calls take, so the calls start earlier and finish at the time the frame should be shown. Previously non-autosync mode adjusted for this but autosync did not. * The warning about the system being too slow to decode the video in realtime is now displayed in autosync mode too.
* vo_xv: Always support updating OSD if none was drawn yetUoti Urpala2008-12-101-4/+19
| | | | | | | If the main image buffer was not altered for OSD then allow updating OSD even if no separate OSD-less copy was made. The code now makes a copy at that time (another possibility would be to not make a copy and disallow further updates).
* Update OSD while pausedUoti Urpala2008-12-0910-26/+115
| | | | | | | | | | | | When OSD contents change while paused, try to change the OSD drawn in the currently visible frame. If such OSD updates are not supported then advance by one frame and draw the OSD normally. Add some support for OSD redrawing to vo xv. The new xv code makes a copy of the original frame contents before drawing the OSD if MPlayer is already paused when the frame is drawn. If such a copy of the current frame exists then the frame contents can be restored and a different OSD drawn on top of the same frame.
* vo_xv: Reformat codeUoti Urpala2008-12-091-268/+221
| | | | | Reformat vo_xv.c completely to K & R style and remove a couple of outdated comments.
* Allow seeking while pausedUoti Urpala2008-12-093-28/+18
| | | | | | | | | | Screen is now updated immediately (doesn't always work without correct-pts yet though). Doing audio unpause after the seek reset can display errors. Main loop code now checks for possible reasons to stop command processing instead of relying on each command to also set an explicit 'break' flag.
* Start pause handling changesUoti Urpala2008-12-093-48/+88
| | | | | | | Add separate pause_player() / unpause_player functions(), move some pausing-related state into explicit variables and make commands while paused not unpause. Not everything works properly while paused yet (no screen updates etc).
* configure: Update required x264 versionUoti Urpala2008-12-091-1/+1
| | | | | configure accepted old versions which then caused a build failure later. Update required version number from 59 to 65.
* Work around vo gl/libass subtitle timing problemUoti Urpala2008-12-091-1/+1
| | | | | | | | | | vo gl generates bitmaps for EOSD content (libass subtitles) when DRAW_EOSD is called but actual drawing of both EOSD and OSD is done in draw_osd(). Since draw_osd() was called first it drew the EOSD content from the previous frame, so the subtitles were always one frame late. As a simple workaround update EOSD content first, then normal OSD. This makes vo gl work correctly and should have no effect on anything else.
* ao_alsa: If pause loses samples replace them with silenceUoti Urpala2008-12-081-0/+13
| | | | | | | If the ALSA pause functionality is not available the driver has to drop buffered samples when MPlayer calls pause(). Replace them by playing a corresponding amount of silence in resume() instead of shortening the overall audio duration.
* Makefile: prevent default build rules being used on FFmpeg filesUoti Urpala2008-12-061-1/+5
| | | | | | | | | After adding .o files to the dependencies of FFmpeg .a files make tried to build those .o files with default rules before recursing to the FFmpeg subdirs. Fix this by adding a dummy rule. Also fix incorrectly placed parentheses in the command creating the FFMPEGFILES list. That resulted in some files being listed multiple times, triggering warnings from the dummy rule.
* Makefile: Rebuild FFmpeg libraries when .asm and .o files changeUoti Urpala2008-12-061-1/+1
| | | | | | | There was a missing dependency that meant FFmpeg libraries were not recursed if only .asm files changed. Also add a dependency on .o files to update the corresponding .a (though this case should only happen if you run compilation commands manually).
* Makefile, common.mak: Create .d files when creating corresponding .oUoti Urpala2008-12-062-27/+11
| | | | | | | | | | | | | | | | The separate .d file creation logic has caused various problems, most notably cases where 'make' exits without doing anybut but without giving any error either. Change the Makefile so that .d files are always created or updated when the corresponding .o file is. This avoids the problems of current .d file generation and still gives correct dependencies. The common.mak change does the same for the libswscale build. However it does not affect the directories under ffmpeg/ because those use ffmpeg/common.mak. The MPlayer common.mak can be copied over the ffmpeg/common.mak file to make the fix apply to the FFmpeg directories too. This is not done automatically because the FFmpeg file is under version control and changing it could cause problems.
* Makefile: Don't use "install -d" on existing directoriesUoti Urpala2008-12-061-3/+5
| | | | | | | | | Makefile used "install -d" on directories like "/usr/local/bin". Because the install program always tries to set permissions this command causes an installation failure if the directory exists and is writable but you cannot change its permissions (default configuration for group staff on Debian for example). So avoid running such commands on existing directories.
* Merge svn changes up to r28103Uoti Urpala2008-12-0612-55/+250
|\
| * 10l, add forgotten a #ifndef GL_WIN32, fixes win32 builds.reimar2008-12-051-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28103 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix indentationreimar2008-12-051-12/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28102 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add experimental support for glXAllocateMemoryMESAreimar2008-12-053-5/+33
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28101 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync w/r28096gpoirier2008-12-051-6/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28100 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid one more duplicated logic.reimar2008-12-051-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28099 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify, do not duplicate buffer size calculationreimar2008-12-051-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28098 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set the base size window manager hint, otherwise some subtract the minimumreimar2008-12-051-0/+7
| | | | | | | | | | | | | | | | size of 4x4 from the numbers displayed to the user which might be confusing. Based on patch by Bert Wesarg [bert wesarg googlemail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28097 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Using rectangle=2 for vo_gl is probably a good idea nowadays.reimar2008-12-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28096 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Document missing vo_gl suboptionsreimar2008-12-051-2/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28095 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add some forgotten documentation for gl suboptionsreimar2008-12-051-1/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28094 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for YCBCR MESA texture format to vo_gl.reimar2008-12-053-0/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28093 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add a bunch of binary codecs with samples from this list: compn2008-12-051-11/+108
| | | | | | | | | | | | | | | | | | http://home.twmi.rr.com/compn/uncommon_video_codecs_final.txt change sif1 codec to vfw since the dshow codec was terrible mark videocodec alaris as working git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28092 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add const to avoid warnings about discarded qualifiers.reimar2008-12-051-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28091 b3059339-0415-0410-9bf9-f77b7e298cf2
| * synced with r28089Gabrov2008-12-052-15/+24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28090 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add entry for FFmpeg QCELP decoder, currently produces white noise.diego2008-12-041-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28089 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Re-add "extern"s incorrectly removed in r28085reimar2008-12-042-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28088 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-04119-693/+786
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Restore two mistakenly removed 'extern' keywords.diego2008-12-031-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28087 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow mp2 in mov.cehoyos2008-12-031-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28086 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of pointless 'extern' keywords.diego2008-12-03109-511/+510
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add bunch of fourccs and updates fromcompn2008-12-031-3/+30
| | | | | | | | | | | | | | http://tranquillity.ath.cx/uncommon_video_codecs_final.txt git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28084 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused declarations and references to vo_draw_text_osd(),diego2008-12-033-16/+1
| | | | | | | | | | | | | | vo_draw_text_progbar(), vo_draw_text_sub(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28083 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Delete unnecessary 'extern' keywords.diego2008-12-033-31/+31
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28082 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics in test programsdiego2008-12-031-22/+22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28081 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Treat video output objects the same as everything else in the build system,diego2008-12-032-51/+76
| | | | | | | | | | | | | | | | i.e. have lines that conditionally enable each in the Makefile and corresponding variables set from configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28080 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: consistent CONFIG_PNM definitiondiego2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28079 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add FFDS fourcccompn2008-12-031-0/+2
| | | | | | | | | | | | | | | | fixes FFDS avi files from this list: http://tranquillity.ath.cx/uncommon_video_codecs_final.txt git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28078 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename ZORAN Makefile variable to ZR for consistency.diego2008-12-032-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28077 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix indentation.reimar2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28076 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Treat audio output objects the same as everything else in the build system,diego2008-12-032-24/+34
| | | | | | | | | | | | | | | | i.e. have lines that conditionally enable each in the Makefile and corresponding variables set from configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28075 b3059339-0415-0410-9bf9-f77b7e298cf2
| * More robust w32 -wid size handlingreimar2008-12-031-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28074 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindent after previous commitreimar2008-12-031-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28073 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not override the vo_dwidth/vo_dheight values in vo_w32_configreimar2008-12-031-0/+3
| | | | | | | | | | | | | | in -wid mode because we ignore the requested size in that case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28072 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync w/r28056gpoirier2008-12-031-2/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28071 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics, whitespace and "... == NULL" to "!..."reimar2008-12-031-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28070 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Some whitespace and () cosmeticsreimar2008-12-031-17/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28069 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Pass "-f macho" to yasm when enabling YASM support on a 32-bits machine asgpoirier2008-12-031-1/+1
| | | | | | | | | | | | | | | | | | libavcodec/i386/x86inc.asm checks that __OUTPUT_FORMAT__ is 'macho' in 32-bits mode, not 'macho32'. This is a workaround until FFmpeg code is fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28068 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, actually put the PTHREAD_CACHE define into config.hreimar2008-12-021-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28067 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print ID_EXIT and exit reason message in identify mode when exiting.reimar2008-12-023-23/+44
| | | | | | | | | | | | | | Patch by rvm [rvm3000 ya com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28066 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux_rtp.cpp: Add missing #includeUoti Urpala2008-12-021-0/+1
| |
* | demux_rtp.cpp: Fix compilation issuesUoti Urpala2008-12-021-3/+3
| | | | | | | | This file hadn't been updated after some API changes.
* | Makefile, codec-cfg.c: Don't use EXTRA_INC flags for codec-cfg compileUoti Urpala2008-12-022-4/+6
| | | | | | | | | | | | | | | | codec-cfg runs on the host system but EXTRA_INC can have target system paths. The EXTRA_INC was added there for shared libavutil support. Copy the one #define codec-cfg.c needs from libmpdemux/aviheader.h (which in turn needed libavutil) instead of including the header, and drop the EXTRA_INC flags.
* | w32_common.c, vo_direct3d.c: Fix Windows compilation issuesUoti Urpala2008-12-022-3/+3
| | | | | | | | | | | | In w32_common.c the special "old_vo_defines.h" header was included too late. vo_direct3d.c was copied from svn without fixing the type of the control() function.
* | configure: Define HAVE_BSWAP and HAVE_FAST_64BIT for FFmpegUoti Urpala2008-12-021-1/