summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Release 0.18.0v0.18.0Martin Herkt2016-06-252-1/+157
|
* Merge branch 'master' into release/currentMartin Herkt2016-06-25207-4531/+8511
|\
| * image_writer: port to new encode APIwm42016-06-241-0/+12
| |
| * ass_mp.h: remove conditional inclusion guardswm42016-06-241-6/+2
| | | | | | | | | | This file is only used when libass is enabled. (It used to be different, when code was more entangled.)
| * af_lavcac3enc: use av_err2str() call (fixes Libav build)wm42016-06-231-2/+1
| | | | | | | | | | I added this call because I thought it'd be nice, but Libav doesn't have this function (macro, actually).
| * af_lavcac3enc: make encoder configurablewm42016-06-232-3/+10
| |
| * af_lavcac3enc: implement flushing on seekwm42016-06-231-0/+7
| | | | | | | | | | There's a lot of data that could have been buffered, and which has to be discarded.
| * af_lavcac3enc: port to new encode APIwm42016-06-231-9/+57
| |
| * af_lavcac3enc: automatically configure most encoder parameterswm42016-06-231-29/+57
| | | | | | | | | | | | | | | | | | | | | | Instead of hardcoding what the libavcodec ac3 encoder expects, configure it based on the AVCodec fields. Unfortunately, it doesn't export the list of sample rates, so that is done manually. This commit actually fixes the rate always to 48Khz. I don't even know whether the other rates worked. (Possibly did, but they'd still change the spdif parameters, and would work differently from ad_spdif.c.)
| * af_lavcac3enc: drop log message prefixeswm42016-06-231-9/+7
| | | | | | | | MPlayer leftover. They're already added by the logging code.
| * af_lavcac3enc: fix custom bitrateswm42016-06-231-2/+3
| | | | | | | | | | | | Probably has been broken for ages. (Not sure why anyone would use this feature, though.)
| * vo_opengl: improve missing function warningwm42016-06-221-6/+8
| | | | | | | | | | Mostly a cosmetic change. Handling bultin and extension functions separaterly makes more sense here too.
| * ad_lavc: resume from mid-stream EOF conditions with new decode APIwm42016-06-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround for an awful corner-case. The new decode API "locks" the decoder into the EOF state once a drain packet has been sent. The problem starts with a file containing a 0-sized packet, which is interpreted as drain packet. This should probably be changed in libavcodec (not treating 0-sized packets as drain packets with the new API) or in libavformat (discard 0-sized packets as invalid), but efforts to do so have been fruitless. Note that vd_lavc.c already does something similar, but originally for other reasons. Fixes #3106.
| * vo_opengl: add scaler name to the 'Disabling scaler' messagedirb2016-06-221-1/+2
| | | | | | | | | | Print to the user the name of the scaler that gets disabled rather than just printing its number.
| * vf_vdpaurb: use new common nv12 download codewm42016-06-211-15/+5
| | | | | | | | | | | | | | | | | | | | See previous commit. (The mixing case was never supported, so this has equivalent functionality.) This also implicitly fixes a bug: the old code allocated image data for the cropped surface size only, which means the video_surface_get_bits_y_cb_cr call could write beyond the allocated image memory.
| * vdpau: get surface data as nv12 if possiblewm42016-06-212-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, this affects taking screenshots only. If the video mixer is actually needed, we want to go through the video mixer for screenshots too - which is why this function simply always used the video mixer, and then copied the surface to RAM as RGBA. Add reading the surface as nv12 if possible. If the format is correct, and no special video processing (like deinterlacing) is used, then it's read directly without going through the video mixer. There's no particular reason for doing this, other than avoiding the video mixer (like vo_opengl can do it now). Also, the next commit will make use of this in vf_vdpaurb.c.
| * command: improve playlist* properties change notificationswm42016-06-202-6/+10
| | | | | | | | | | | | | | Until now, only the "playlist" property itself had proper change notification. Extend it to all other properties as well. Fixes #3267 (hopefully).
| * github: move "reproduction steps" before behavior sectionswm42016-06-201-2/+2
| |
| * vo_opengl: manually add the GL_BACK_LEFT constant for GLESFloens2016-06-201-0/+4
| | | | | | | | | | GLES doesn't have this constant. It's not used on GLES. I'm starting to think we need some better way to do this.
| * vo_opengl: GL_ARB_timer_query compile fix for GLESFloens2016-06-201-0/+6
| | | | | | | | | | | | | | | | The GL_ARB_timer_query extension and thus the GL_TIME_ELAPSED constant don't exist for GLES. For ES the EXT_disjoint_timer_query is used so take the constant from that else provide the constant manually. See pr #3216 which introduced this error.
| * vf_vdpaurb: fix operationwm42016-06-201-0/+1
| | | | | | | | | | The hw_subfmt field remained set, while it has to be unset for non-hwdec formats.
| * vo_opengl: unmap hwdec images once rendering is donewm42016-06-201-2/+10
| | | | | | | | | | Instead of keeping them for a while. While keeping the mapping was perfectly ok, nothing speaks against reducing the time they're mapped.
| * vo_opengl: vdpau interop without RGB conversionwm42016-06-198-40/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, we've always converted vdpau video surfaces to RGB, and then mapped the resulting RGB texture. Change this so that the surface is mapped as NV12 plane textures. The reason this wasn't done until now is because vdpau surfaces are mapped in an "interlaced" way as separate fields, even for progressive video. This requires messy reinterleraving. It turns out that even though it's an extra processing step, the result can be faster than going through the video mixer for RGB conversion. Other than some potential speed-gain, doing this has multiple other advantages. We can apply our own color conversion, which is important in more complex cases. We can correctly apply debanding and potentially other processing that requires chroma-specific or in-YUV handling. If deinterlacing is enabled, this switches back to the old RGB conversion method. Until we have at least a primitive deinterlacer in vo_opengl, this will stay this way. The d3d11 and vaapi code paths are similar. (Of course these don't require any crazy field reinterleaving.)
| * refqueue: free referenced images on freewm42016-06-191-0/+1
| | | | | | | | | | | | | | | | Otherwise stale references will survive forever. Could leak hardware video surfaces. In particular, the mpv vdpau code crashed with an assertion when exiting after toggling deinterlacing, because not all references were released.
| * bitmap_packet: let max=0 mean unlimitedwm42016-06-183-7/+7
| | | | | | | | | | And remove the strange PACKER_MAX_WH define. This is more convenient for users which don't care about limits, such as sd_lavc.c.
| * sd_lavc: fix sub-bitmap alignmentwm42016-06-181-1/+1
| | | | | | | | Ooops.
| * vo_opengl: remove prescaling framework with superxbr prescalerBin Jin2016-06-187-384/+3
| | | | | | | | Signed-off-by: wm4 <wm4@nowhere>
| * vo_opengl: remove uniform buffer object routinesBin Jin2016-06-184-44/+2
| |
| * vo_opengl: remove nnedi3 prescalerBin Jin2016-06-1811-413/+1
| |
| * cocoa: fix display refresh rate retrieval on multi monitor setupsAkemi2016-06-182-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. this basically reverts commit de4c74e5a4a996e8ff431c8f33a32c4b580be203. even with CVDisplayLinkCreateWithActiveCGDisplays and CVDisplayLinkSetCurrentCGDisplayFromOpenGLContext we still have to explicitly set the current display ID, otherwise it will just always choose the display with the lowest refresh rate. another weird thing is, we still have to set the display ID another time with CVDisplayLinkSetCurrentCGDisplay after the link was started. otherwise the display period is 0 and the fallback will be used. if we ever use the callback method for something useful it's probably better to use CVDisplayLinkCreateWithActiveCGDisplays since we will need to keep the display link around instead of releasing it at the end. in that case we have to call CVDisplayLinkSetCurrentCGDisplay two times, once before and once after LinkStart. 2. add windowDidChangeScreen delegate to update the display refresh rate when mpv is moved to a different screen.
| * cocoa: fix actual display refresh rate retrievalAkemi2016-06-181-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | We have two problems here. 1. CVDisplayLinkGetActualOutputVideoRefreshPeriod, like the name suggests, returns a frame period and not a refresh rate. using this as screen_fps just leads to a slideshow. why didn't this break video playback on OS X completely? the answer to this leads us to the second problem. 2. it seems that CVDisplayLinkGetActualOutputVideoRefreshPeriod always returns 0 if used without CVDisplayLinkSetOutputCallback and hence always fell back to CVDisplayLinkGetNominalOutputVideoRefreshPeriod. adding a callback to CVDisplayLink solves this problem. the callback function at this moment doesn't do anything but could possibly used in the future.
| * vo_opengl: dxinterop: render to gl->main_fbJames Ross-Gowan2016-06-181-54/+5
| | | | | | | | | | | | | | This can also remove all the stuff for lazily attaching the texture. It doesn't matter if the dxinterop backend changes the bound framebuffer during a VOCTRL, since the renderer does not rely on the GL state being preserved.
| * vo_opengl: add ability to render to an arbitrary backing framebufferwm42016-06-183-1/+9
| | | | | | | | | | | | | | Most of the functionality already exists for the sake of vo_opengl_cb. We only have to use it. This will be used by dxinterop in the following commit.
| * sd_lavc: align sub-bitmaps for the sake of libswscalewm42016-06-182-7/+11
| | | | | | | | | | | | | | Since there are not many sub-rectangles, this doesn't cost too much. On the other hand, it avoids frequent warnings with vo_xv. Also, the second copy in mp_blur_rgba_sub_bitmap() can be dropped.
| * sd_lavc: fix typowm42016-06-181-1/+1
| |
| * sub, vo_opengl: use packed sub-bitmaps directly if availablewm42016-06-174-29/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous few commits changed sd_lavc.c's output to packed RGB sub- images. In particular, this means all sub-bitmaps are part of a larger, single bitmap. Change the vo_opengl OSD code such that it can make use of this, and upload the pre-packed image, instead of packing and copying them again. This complicates the upload code a bit (4 code paths due to messy PBO handling). The plan is to make sub-bitmaps always packed, but some more work is required to reach this point. The plan is to pack libass images as well. Since this implies a copy, this will make it easy to refcount the result. (This is all targeted towards vo_opengl. Other VOs, vo_xv, vo_x11, and vo_wayland in particular, will become less efficient. Although at least vo_vdpau and vo_direct3d could be switched to the new method as well.)
| * sd_lavc: change hack against vobsubs with wrong resolutionwm42016-06-171-8/+9
| | | | | | | | | | | | | | The sub-bitmaps get extended by --sub-gauss, so we have to compute the bounding box on the original subs. Not sure if this is really eqauivalent to what the code did before, and I don't have the sample anymore. (But this approach sure is a _shitty_ hack.)
| * sub: fix --sub-gausswm42016-06-174-51/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement it directly in sd_lavc.c as well. Blurring requires extending the size of the sub-images by the blur radius. Since we now want sub_bitmaps to be packed into a single image, and we don't want to repack for blurring, we add some extra padding to each sub-bitmap in the initial packing, and then extend their size later. This relies on the previous bitmap_packer commit, which always adds the padding in all cases. Since blurring is now done on parts of a large bitmap, the data pointers can become unaligned, depending on their position. To avoid shitty libswscale printing a dumb warning, allocate an extra image, so that the blurring pass is done on two newly allocated images. (I don't find this feature important enough to waste more time on it.) The previous refactor accidentally broke this feature due to a logic bug in osd.c. It didn't matter before it happened to break, and doesn't matter now since the code paths are different.
| * sub: move paletted image handling completely to sd_lavc.cwm42016-06-176-119/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, subtitle renderers could export SUBBITMAP_INDEXED, which is a 8 bit per pixel with palette format. sd_lavc.c was the only renderer doing this, and the result was converted to RGBA in every use-case (except maybe when the subtitles were hidden.) Change it so that sd_lavc.c converts to RGBA on its own. This simplifies everything a bit, and the palette handling can be removed from the common code. This is also preparation for making subtitle images refcounted. The "caching" in img_convert.c is a PITA in this respect, and needs to be redone. So getting rid of some img_convert.c code is a positive side- effect. Also related to refcounted subtitles is packing them into a single mp_image. Fewer objects to refcount is easier, and for the libass format the same will be done. The plan is to remove manual packing from the VOs which need single images entirely.
| * bitmap_packer: make manual use slightly more convenientwm42016-06-171-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the padding internally to each input bitmap, instead of requiring this for the semi-public API. Right now, everything still uses packer_pack_from_subbitmaps() to fill the input bitmap sizes, but that's going to change with the following commit. Since bitmap_packer.in is mutated during packing anyway, it's more convenient to add the padding automatically. Also, guarantee that every sub-bitmap has a padding border around it. Don't let the padding overlap. Add padding even on the containing borders. This is simpler, doesn't cost much in memory usage, and is convenient for one of the following commits.
| * sd_lavc: move AVSubtitle bitmap setup code into its own functionwm42016-06-171-34/+44
| | | | | | | | No functional changes.
| * Add github issue and pull request templateswm42016-06-173-32/+21
| | | | | | | | | | | | | | I do not understand why github requires adding this crap to source code repositories themselves, instead of making them part of the repository configuration. Remove CONTRIBUTING.md to compensate for github crap accumulating.
| * d3d11va: remove unused d3d11va_surface.subindex fieldwm42016-06-161-3/+1
| | | | | | | | This is now stored within the AVFrame/mp_image.
| * vf_d3d11vpp: flush device context only when using shared textureswm42016-06-161-1/+2
| | | | | | | | Reduces interference with pass-through case, where this is not needed.
| * vf_d3d11vpp: make missing deinterlacing caps non-fatalwm42016-06-161-3/+2
| | | | | | | | Instead, warn.
| * vf_d3d11vpp: log some video processor creation parameterswm42016-06-161-2/+7
| |
| * vo_opengl: use EXT_disjoint_timer_query for timersJames Ross-Gowan2016-06-151-0/+16
| | | | | | | | | | | | This is the ES equivalent to ARB_timer_query. It enables the performance timers on ANGLE. All the added functions should be identical in semantics to their desktop GL equivalents.
| * vo_opengl: fix framebuffer object namewm42016-06-151-3/+4
| | | | | | | | | | | | | | | | | | The OpenGL 3.0+ and ES specs are quite clear on what values are accepted for the attachment object name parameter. And there's no overlap for the default framebuffer. Sigh. Probably fixes Mesa raising an error in this case and might fix #3251. Regression by the previous vo_opengl change.
| * demux_mkv: support Matroska webvttwm42016-06-141-0/+1
| | | | | | | | | | | | | | They're different from the Google/WebM subtitle types, and use a new codec ID. Fixes #3247.
| * vo_opengl: use standard functions to retrieve display depthwm42016-06-1410-59/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | Until now, we've used system-specific API (GLX, EGL, etc.) to retrieve the depth of the default framebuffer. (We equal this to display depth and use the determined depth for dithering.) We can actually retrieve this value through standard GL API, and it works everywhere (except GLES 2 of course). This simplifies everything a great deal. egl_helpers.c is empty now. But I expect that some EGL boilerplate will be moved to it, so don't remove it yet.
| * vo_opengl: hwdec_d3d11egl: remove ES2 swizzle special-casewm42016-06-131-2/+2