aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
| * font_load_ft.c: fix possible crash with recent FontconfigGravatar Uoti Urpala2012-05-17
| | | | | | | | | | | | | | | | | | | | | | Calling FcFontMatch with last argument NULL triggers an assertion failure in latest libfontconfig (2.9.0). Change the code to use a dummy address, like another nearby call to FcFontMatch already did. Whether the code triggering the assertion failure was run depended on font settings and/or available system fonts (the code looks like you'd have to get a non-scalable font first). Thus it didn't usually happen even with problematic libfontconfig version.
| * configure: OSX: fix check for compiler-specific cflagsGravatar Stefano Pigozzi2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | The configure script adds some compiler-specific flags for GCC on OSX. This was done under a check for compiler binary name not being clang. Move the test to after $cc_vendor has been determined and check against that instead. The previous test worked for clang if you explicitly specified --cc=clang, but not if the default system "cc" command was used and mapped to clang. Recent versions of Xcode changed the default compiler (cc) to clang. This caused a lot of spam from clang, which complained about the unknown flags when compiling with no explicit --cc option.
| * configure: don't enable GL/X11 without X11Gravatar Stefano Pigozzi2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | The OpenGL autodetection checked for all backends regardless of which features had been enabled previously. Stop checking for X11 backend if X11 support is disabled, and stop checking for w32 backend if we are not on Windows. This makes the changes in commit 3862d469ae ("configure: OSX: check for X11 header conflict with corevideo") work as intended. That commit disabled X11 when a header conflict was detected, but the GL X11 backend could still be autodetected despite that and trigger a compilation failure.
* | screenshot: fix minor memory leakGravatar wm42012-05-15
| | | | | | | | Introduced in commit 5fe14d5bf "screenshot: improve error messages".
* | cocoa: return the real CGLPixelFormatObjGravatar Stefano Pigozzi2012-05-15
| | | | | | | | | | vo_cocoa_cgl_pixel_format is returning a cached CGLPixelFormatObj. Return the current one by querying the OpenGL context.
* | cocoa: don't request a depth buffer sizeGravatar Stefano Pigozzi2012-05-15
| |
* | cocoa: gl3: make window creation fail on <10.7Gravatar Stefano Pigozzi2012-05-15
| | | | | | | | | | Versions of OSX prior to 10.7 do not support OpenGL 3. Fail the window creation when that is the case.
* | cocoa: gl3: support querying of colors bit depthGravatar Stefano Pigozzi2012-05-15
| | | | | | | | | | Add support for querying the bit depth of the colors from the OpenGL context. This allows to perform dithering correctly.
* | cocoa: handle failure on pixel format creationGravatar Stefano Pigozzi2012-05-14
| | | | | | | | | | | | | | | | This didn't make any difference on with OpenGL 2.1, but with the introduction of OpenGL3.2 it's possible for the pixel format creation to fail (if OpenGL3.2 is not supported). This code handles the failure case accordingly.
| * core: fix EOF handling with untimed audio outputsGravatar Uoti Urpala2012-05-14
| | | | | | | | | | | | | | | | | | | | | | When using an audio output without a native playback rate (such as ao_pcm), the code plays audio further when the current write position is behind video. After support for continuing audio after the end of video was added, this could cause a deadlock: audio was not played further, but neither was EOF triggered. Fix the code to properly handle playback of remaining audio after video ends in the untimed audio case (audio-only case was not affected, only the case where a video stream exists but ends before the audio stream).
| * options: simplify option parsing/setting machineryGravatar Uoti Urpala2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | Each option type had three separate operations to copy option values between memory locations: copy between general memory locations ("copy"), copy from general memory to active configuration of the program ("set"), and in the other direction ("save"). No normal option depends on this distinction any more. Change everything to define and use a single "copy" operation only. Change the special options "include" and "profile", which depended on hacky option types, to be special-cased directly in option parsing instead. Remove the now unused option types m_option_type_func and m_option_type_func_param.
| * options: change -v parsingGravatar Uoti Urpala2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | Handle -v flags as a special case in command line preparsing stage, and change the option entry into a dummy one. Specifying "v" in config file no longer works (and the dummy entry shows an error in this case); "msglevel" can still be used for that purpose. Because the flag is now interpreted at an earlier parsing stage, it now affects the printing of some early messages that were only affected by the MPLAYER_VERBOSE environment variable before. The main motivation for this change is to get rid of the last CONF_TYPE_FUNC option.
| * options: change --input=keylist, cmdlist implementationGravatar Uoti Urpala2012-05-07
| | | | | | | | | | | | | | | | Change the --input=keylist and --input=cmdlist suboptions to use the "print function" option type. This changes their semantics somewhat, and now some other output can appear after the printed lists (before, they called "exit(0)" directly). I'm not aware of any program parsing the output which could be affected.
| * ad_mpg123: update libmpg123 API useGravatar Thomas Orgis2012-05-07
| | | | | | | | | | | | Improve ad_mpg123, including use of the more efficient framewise decoding with mpg123 version 1.14 or later (older versions are still supported).
| * configure: use pkg-config for vdpau, libmpg123, libblurayGravatar Uoti Urpala2012-05-06
| |
| * ao_arts, ao_esd: remove these AOsGravatar Uoti Urpala2012-05-06
| | | | | | | | Delete ao_arts and ao_esd. Both have been deprecated upstream.
| * build: remove IRIX supportGravatar Uoti Urpala2012-05-06
| |
| * ao_portaudio: add new PortAudio audio output driverGravatar wm42012-05-06
| | | | | | | | | | | | | | | | | | | | This AO has potential to be useful on platforms other than Linux. On Windows in particular, PortAudio can make use of newer/better audio APIs like WASAPI, instead of DirectSound. As an implementation choice, the PortAudio callback API was used. The blocking API might be a better match for mplayer's requirements, but caused severe problems on Linux/ALSA (possibly PortAudio bugs).
| * ao_pulse: fix specifying host/sink after 4fed8ad197Gravatar Uoti Urpala2012-05-03
| | | | | | | | | | | | | | Commit 4fed8ad197 ("ao_pulse: convert to new AO API") failed to change the variable name used on one line in suboption handling. This caused a crash due to NULL dereference if you tried to specify any suboptions for the AO (as in "--ao=pulse:foo"). Fix.
* | screenshot: improve error messagesGravatar wm42012-04-29
| | | | | | | | | | | | | | Include filename in the error message, if the screenshot destination file already exists. Consistently quote filenames with 'quotes' in messages.
* | screenshot, vo_png: fix dependency on sizeof(AVFrame)Gravatar wm42012-04-29
| | | | | | | | | | | | | | | | | | In order to stay binary compatible with libavcodec, applications should not dependent on sizeof(AVFrame). This means allocating AVFrame on the stack is not allowed, and the function avcodec_alloc_frame() must be used to allocate an AVFrame instead. Partially based on a patch by uau.
* | Merge remote-tracking branch 'origin/master'Gravatar wm42012-04-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bstr.c bstr.h libvo/cocoa_common.m libvo/gl_common.c libvo/video_out.c mplayer.c screenshot.c sub/subassconvert.c Merge of cocoa_common.m done by pigoz. Picking my version of screenshot.c. The fix in commit aadf1002f8a will be redone in a follow-up commit, as the original commit causes too many conflicts with the work done locally in this branch, and other work in progress.
| * win32: get_path(): fix undefined behaviorGravatar Martin Herkt2012-04-28
| | | | | | | | | | | | | | MSWindows-specific code in get_path() declared a stack array (exedir[]) in an inner scope, then kept a reference to the array beyond the end of the that scope. Fix. This caused visible breakage with GCC 4.7.
| * stream_cdda: print CDTEXT if availableGravatar wm42012-04-28
| | | | | | | | | | | | | | | | | | | | The per-CD info will be printed on playback start, per-track info when a track is played. (This is not a technical restriction, and just goes along with the existing code.) The following fields are not included in output, because these are supposedly binary: CDTEXT_DISCID, CDTEXT_GENRE, CDTEXT_SIZE_INFO, CDTEXT_TOC_INFO, CDTEXT_TOC_INFO2.
| * configure, stream_cdda: remove libcdparanoia supportGravatar wm42012-04-28
| | | | | | | | | | libcdparanoia is barely developed anymore, while libcdio is still quite active.
| * cosmetics: stream_cdda.c: reformatGravatar wm42012-04-28
| |
| * stream_cdda: various fixesGravatar reimar2012-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cdda speed default value, range and use more robust condition. Based on patch by Ingo Brückl [ib wupperonline de]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34458 b3059339-0415-0410-9bf9-f77b7e298cf2 Do not call paranoia_overlapset with 0, it actually causes cdparanoia to just hang. Instead use it to set/unset PARANOIA_MODE_OVERLAP. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34459 b3059339-0415-0410-9bf9-f77b7e298cf2 Fail if trying to seek beyond the last chapter, not just if it is beyond the end of the disc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34460 b3059339-0415-0410-9bf9-f77b7e298cf2 cdda: set position to an actual EOF position when we set EOF. This avoids some inconsistency like the stream indicating EOF but a read still returning more data. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34462 b3059339-0415-0410-9bf9-f77b7e298cf2 Allow PARANOIA_MODE_FULL with skipping. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34467 b3059339-0415-0410-9bf9-f77b7e298cf2 Don't call paranoia_modeset() for PARANOIA_MODE_DISABLE. cdparanoia destroys start sector information after such a call. Since it is pointless without setting a mode anyway, don't do it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34468 b3059339-0415-0410-9bf9-f77b7e298cf2 Add comment to a condition that is just a hack around a cdparanoia bug. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34472 b3059339-0415-0410-9bf9-f77b7e298cf2 Add checks for errors in stream_cdda's get_track_by_sector(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34495 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix seeking beyond EOF in stream_cdda to work with cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34577 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge remote-tracking branch 'origin/master'Gravatar wm42012-04-28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_alsa.c libao2/ao_dsound.c libao2/ao_pulse.c libao2/audio_out.h mixer.c mixer.h mplayer.c Replace my mixer changes with uau's implementation, which is based on my code.
| | * cocoa_common: fix problems with alt-tab window changesGravatar Stefano Pigozzi2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alt tabbing to another window in the same workspace. The player window stayed on top because of a missing call to orderBack:. Fix alt tabbing to the player window from a different workspace. The window didn't get activated. Turns out that you must call makeKeyAndOrderFront: before setLevel: or setPresentationOptions: or the window will not properly ask for focus.
| | * configure: OSX: check for X11 header conflict with corevideoGravatar Stefano Pigozzi2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Check that headers from ApplicationServices and X11 do not conflict before enabling X11 support on OSX. Both headers would be included in vo_corevideo.m (through QuartzCore/QuartzCore.h and gl_common.h). The conflict exists on versions of Mac OSX prior to 10.7, where ApplicationServices includes the deprecated QuickDraw framework, resulting in a clash on the Cursor type definition.
| | * Makefile: fix OSX compilation with --disable-corevideoGravatar Stefano Pigozzi2012-04-26
| | | | | | | | | | | | | | | cocoa_common.m (enabled under COCOA) depends on osx_common.c, but the latter was erroneously only enabled under COREVIDEO.
| | * cocoa_common, gl_common: add OSX specific getProcAddressGravatar Stefano Pigozzi2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | Run dlopen on the OpenGL dynamic library instead of on the binary. This should prevent crashes due to function conflicts when X11/lGL is linked. Remove mutual exclusion of the X11 and Cocoa backends.
| | * OSX, input: implement wakeup in response to Cocoa eventsGravatar Stefano Pigozzi2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add code to wake up the select() call in input.c when an OSX event is available and a Cocoa OpenGL backend is initialized. Fixes the slow response to input or other events in Cocoa-based VOs during long select() sleeps (e.g., when mplayer2 is paused) introduced by commit 7040968.
| | * vo_sharedbuffer: add this video outputGravatar Stefano Pigozzi2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This OSX video output is replaces the previous shared_buffer mode of vo_corevideo. It manages a shared buffer and a Cocoa distributed object to communicate with GUIs. Splitting this code into a separate VO allows to get rid of harmful code coupling, performance inefficiencies (useless image memory copies) and ugly code (big if-else conditionals).
| | * vo_corevideo: restructure this video outputGravatar Stefano Pigozzi2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restructure this video output to be similar to vo_gl, even if simpler and less feature complete (for example it's still missing EOSD support). Ideally, it should act as a decent fallback in the case where something breaks in the OSX support of vo_gl. Here's a summary of what changed: * Remove the shared buffer code since it wasn't using any function from the CoreVideo API. Moreover, its presence in vo_corevideo was forcing the non-GUI related code to perform more image copies than necessary. Equivalent shared-buffer functionality will be added in a separate new VO in the next commit (this means OSX GUIs will need to specify a different VO). * Clean up the code to conform a bit more to the mplayer2 conventions. Enforce 80 column wrapping, use a private struct for file variables, use the new libvo api. * Add OSD rendering using OpenGL instead of writing directly on the video image data. * Simplify the logic for the rendering function when dealing with panscan. * Add VOCTRL_REDRAW_FRAME support. * Add colormatrix support by using the built-in API provided by CoreVideo.
| | * vo_corevideo: use cocoa_common to display the windowGravatar Stefano Pigozzi2012-04-26
| | | | | | | | | | | | | | | | | | | | | Change vo_corevideo to use cocoa_common to create and manage the window. This doesn't affect external OSX GUIs, since they don't use vo_corevideo window management, but only read the image data from the shared buffer.
| | * vo_corevideo: use soft tabs (4 spaces)Gravatar Stefano Pigozzi2012-04-26
| | |
| | * win32: core: wake up more often to poll for inputGravatar Uoti Urpala2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | MSWindows does not have properly working support for detecting events on file descriptors. As a result the current mplayer2 code does not support waking up when new input events occur. Make the central playloop wake up more often to poll for events; otherwise response would be a lot laggier than on better operating systems during pause or other cases where the process would not otherwise wake up.
* | | ao_openal: fix crash when no device parameter is passedGravatar wm42012-04-25
| | |
* | | vo_directx: clear panscan borders in windowed modeGravatar wm42012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | The window size is normally clipped against desktop size due to the usage of WM_SIZING in w32_common.c. This is a useful (if accidental) feature, but vo_directx didn't handle it well: the areas not covered by video were filled with the colorkey, which looked ugly. Explicitly clear these borders with black.
* | | vo_gl: reject MS Windows native OpenGL as software rasterizerGravatar wm42012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | If the graphics driver doesn't provide its own OpenGL implementation, applications get Microsoft's OpenGL emulation. Even if it should be the case that it's not strictly a software renderer, it provides OpenGL 1.1 only, no shaders in any form, and has other limitations that make it almost completely useless for mplayer.
* | | vo_gl: refuse to use software renderer, unless explicitly requestedGravatar wm42012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vo_gl will now fail at initialization if a software renderer is detected. This is the same behavior as vo_gl_nosw. Making this the default behavior is preferable, because it will simplify positioning vo_gl in the VO autoprobe list (video_out_drivers[]). Also, vo_gl_nosw exists only if X11 support is configured. Move gl in place of gl_nosw. Add the "sw" suboption to vo_gl to allow using vo_gl even if a software renderer is detected. vo_gl_nosw is now completely equivalent to vo_gl. It is kept in order not to break too many user configurations, but should be considered deprecated.
* | | win32: don't crash if vo_w32_uninit() is called without vo_w32_init()Gravatar wm42012-04-24
| | | | | | | | | | | | | | | This is a recent regression. At least vo_direct3d uses vo_w32_uninit() in this way, and crashed if initialization failed at an early point.
| | * core: change initial sync with --delay, video stream switchGravatar Uoti Urpala2012-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make A/V sync at the start of playback with nonzero --delay behave the same way as it does when seeking to the beginning later, meaning video plays from the start and audio is truncated or padded with silence to match timing. This was already the default behavior in case the streams in the file started at different times, but not if the mismatch was due to --delay. Trigger similar audio synchronization when switching to a new video stream. Previously, switching a video stream on after playing for some time in audio-only mode was buggy and caused initial desync equal to the duration of prior audio-only playback.
| | * core: uninitialize VO and AO when no track playsGravatar Uoti Urpala2012-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uninitialize video and audio outputs when switching to a file without a corresponding track (audio-only file / file with no sound), or when entering --idle mode. Switching track choice to "off" during playback already did this. It could be useful to have a mode where the video window stays open even when no video plays, but implementing that properly would require more than just leaving the window on screen like the code did before this commit.
| | * configure: --enable-debug: don't change other compiler flagsGravatar Uoti Urpala2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | The --enable-debug and --enable-profile options set their own compiler flags, completely different from normal flag selection. These flags sucked; especially '-W' (an obsolete alias for '-Wextra') generated a huge number of irrelevant warnings. Change configure to only add "-g" or similar to the flags that would be used otherwise.
| | * ad_ffmpeg: switch to avcodec_decode_audio4()Gravatar Uoti Urpala2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch libavcodec audio decoding from avcodec_decode_audio3() to avcodec_decode_audio4(). Instead of decoding directly to the output buffer, the data is now copied from the libavcodec output packet, adding an extra memory copy (optimizing this would require some interface changes). After libavcodec added avcodec_decode_audio4() earlier, it dropped support for splitting large audio packets into output chunks of size AVCODEC_MAX_AUDIO_FRAME_SIZE or less. This caused a regression with the previous API: audio files with huge packets could fail to decode, as libavcodec refused to write into the AVCODEC_MAX_AUDIO_FRAME_SIZE buffer provided by mplayer2. This occurrend mainly with some lossless audio formats. This commit restores support for those files; there are now no fixed limits on packet size.
| | * stream_ffmpeg: fix broken line from 30afc64532ff61Gravatar Uoti Urpala2012-04-18
| | | | | | | | | | | | | | | | | | | | | Commit 30afc64532ff61 ("stream_ffmpeg: switch to libavformat avio API") somehow contained a nonsense line which broke the control() function. Fix. Also add avformat_network_init() to central libav initialization code to avoid warnings.
| | * subassconvert: make subrip attribute parsing more robustGravatar Uoti Urpala2012-04-17
| | | | | | | | | | | | | | | | | | | | | Add general code to separate the HTML-like attribute=value syntax used in srt font tags into attribute and value parts. This simplifies some of the parsing code, makes detection of malformed input more robust, and allows warning about unrecognized attributes.
| | * subassconvert: handle unquoted attributes in subrip font tagsGravatar wm42012-04-17
| | | | | | | | | | | | | | | Previously, mplayer didn't convert tags like <font color=#00FF00>. But such subtitles exist in the wild, and should be handled.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 01:17:51 +0000