May 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r34190 - in trunk: Changelog DOCS/man/en/mplayer.1 Makefile configure libmpcodecs/vf.c libmpcodecs/vf_lavfi.c
by cigaes 09 Oct '12

09 Oct '12

Author: cigaes Date: Wed Oct 12 13:38:10 2011 New Revision: 34190 Log: libmpcodec: add vf_lavfi. This filter wraps a complete libavfilter filter graph. As the API of libavfilter is not completely stable yet, the filter is not enabled by default, so as not to let mplayer unbuildable. Some strange behaviours may appear due to the very different model of buffer allocation between mplayer and lavfi. Added: trunk/libmpcodecs/vf_lavfi.c Modified: trunk/Changelog trunk/Makefile trunk/configure trunk/libmpcodecs/vf.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed Oct 12 13:38:08 2011 (r34189) +++ trunk/Changelog Wed Oct 12 13:38:10 2011 (r34190) @@ -11,6 +11,7 @@ MPlayer (1.0) Filters: * delogo: allow to change the rectangle based on the time. + * lavfi: libavfilter filter graphs (experimental). Other: * support adding noise at output resolution with -vo gl:noise-strength=8 Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Oct 12 13:38:08 2011 (r34189) +++ trunk/Makefile Wed Oct 12 13:38:10 2011 (r34190) @@ -83,6 +83,8 @@ SRCS_COMMON-$(FFMPEG) += stream/stream_ffmpeg.c \ sub/av_sub.c \ +SRCS_COMMON-$(CONFIG_VF_LAVFI) += libmpcodecs/vf_lavfi.c + # These filters use private headers and do not work with shared FFmpeg. SRCS_COMMON-$(FFMPEG_A) += libaf/af_lavcac3enc.c \ libmpcodecs/vf_fspp.c \ Modified: trunk/configure ============================================================================== --- trunk/configure Wed Oct 12 13:38:08 2011 (r34189) +++ trunk/configure Wed Oct 12 13:38:10 2011 (r34190) @@ -414,6 +414,7 @@ Codecs: --disable-libnut disable libnut [autodetect] --disable-ffmpeg_a disable static FFmpeg [autodetect] --disable-ffmpeg_so disable shared FFmpeg [autodetect] + --enable-vf-lavfi enable libavfilter wrapper [disabled] --disable-libavcodec_mpegaudio_hp disable high precision audio decoding in libavcodec [enabled] --disable-tremor-internal disable internal Tremor [enabled] @@ -647,6 +648,7 @@ _cross_compile=auto _prefix="/usr/local" ffmpeg_a=auto ffmpeg_so=auto +_vf_lavfi=no _libavcodec_mpegaudio_hp=yes _libopencore_amrnb=auto _libopencore_amrwb=auto @@ -1278,6 +1280,8 @@ for ac_option do --disable-ffmpeg_a) ffmpeg_a=no ;; --enable-ffmpeg_so) ffmpeg_so=yes ;; --disable-ffmpeg_so) ffmpeg_so=no ;; + --enable-vf-lavfi) _vf_lavfi=yes ;; + --disable-vf-lavfi) _vf_lavfi=no ;; --enable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=yes ;; --disable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=no ;; @@ -6773,6 +6777,7 @@ else def_ffmpeg_so='#undef CONFIG_FFMPEG_SO' nocodecmodules="ffmpeg $nocodecmodules" fi +test "$_vf_lavfi" = yes && def_vf_lavfi='#define CONFIG_VF_LAVFI 1' test "$_libavcodec_mpegaudio_hp" = yes && def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' && mak_libavcodec_mpegaudio_hp='CONFIG_MPEGAUDIO_HP = yes' @@ -8070,6 +8075,7 @@ CONFIG_GPL = yes CONFIG_MLIB = $_mlib CONFIG_MUXERS = $_mencoder CONFIG_RTPDEC = $networking +CONFIG_VF_LAVFI = $_vf_lavfi CONFIG_VDPAU = $_vdpau CONFIG_XVMC = $_xvmc CONFIG_ZLIB = $_zlib @@ -8522,6 +8528,7 @@ $def_roundf $def_threads $def_trunc $def_truncf +$def_vf_lavfi $def_xform_asm $def_xmm_clobbers $def_yasm Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c Wed Oct 12 13:38:08 2011 (r34189) +++ trunk/libmpcodecs/vf.c Wed Oct 12 13:38:10 2011 (r34190) @@ -82,6 +82,7 @@ extern const vf_info_t vf_info_ivtc; extern const vf_info_t vf_info_kerndeint; extern const vf_info_t vf_info_lavc; extern const vf_info_t vf_info_lavcdeint; +extern const vf_info_t vf_info_lavfi; extern const vf_info_t vf_info_mcdeint; extern const vf_info_t vf_info_mirror; extern const vf_info_t vf_info_noformat; @@ -142,6 +143,9 @@ static const vf_info_t* const filter_lis &vf_info_pp, &vf_info_lavc, &vf_info_lavcdeint, +#ifdef CONFIG_VF_LAVFI + &vf_info_lavfi, +#endif &vf_info_screenshot, &vf_info_geq, #endif Added: trunk/libmpcodecs/vf_lavfi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libmpcodecs/vf_lavfi.c Wed Oct 12 13:38:10 2011 (r34190) @@ -0,0 +1,418 @@ +/* + * Copyright (C) 2011 Nicolas George <nicolas.george(a)normalesup.org> + * + * 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 "vf.h" +#include "m_struct.h" +#include "fmt-conversion.h" +#include "libavfilter/avfilter.h" +#include "libavfilter/avfiltergraph.h" +#include "libavutil/pixdesc.h" + +struct vf_priv_s { + AVFilterGraph *graph; + AVFilterContext *in; + AVFilterContext *out; + int in_w; + int in_h; + enum PixelFormat in_pixfmt; + int in_imgfmt; + AVRational in_sar; + int out_w; + int out_h; + enum PixelFormat out_pixfmt; + int out_imgfmt; + AVRational out_sar; + struct AVFilterBufferRef *in_buf; + mp_image_t *in_mpi; +}; + +static void buf_mpi_free(AVFilterBuffer *buf) +{ + ((mp_image_t *)buf->priv)->usage_count--; + av_free(buf); +} + +static AVFilterBufferRef *mpi_to_bufref(mp_image_t *mpi, enum PixelFormat fmt, + AVRational sar) +{ + AVFilterBufferRef *buf; + int perms = AV_PERM_READ; + + if ((mpi->flags & MP_IMGFLAG_ALLOCATED)) + perms |= AV_PERM_REUSE2; + if (!(mpi->flags & MP_IMGFLAG_PRESERVE)) + perms |= AV_PERM_WRITE; + buf = avfilter_get_video_buffer_ref_from_arrays(mpi->planes, mpi->stride, + perms, + mpi->w, mpi->h, + fmt); + buf->video->sample_aspect_ratio = sar; + buf->buf->priv = mpi; + buf->buf->free = buf_mpi_free; + return buf; +} + +static void bufref_to_mpi(AVFilterBufferRef *ref, mp_image_t *mpi) +{ + memcpy(mpi->planes, ref->data, sizeof(ref->data)); + memcpy(mpi->stride, ref->linesize, sizeof(ref->linesize)); +} + +struct mpsink_priv { + struct vf_instance *vf; +}; + +static int mpsink_init(AVFilterContext *ctx, + av_unused const char *args, void *opaque) +{ + struct mpsink_priv *c = ctx->priv; + c->vf = opaque; + return 0; +} + +static int mpsink_query_formats(AVFilterContext *ctx) +{ + struct mpsink_priv *c = ctx->priv; + struct vf_instance *vf = c->vf; + AVFilterFormats *all; + enum PixelFormat *sup; + unsigned i, nsup = 0; + int ifmt; + + all = avfilter_all_formats(AVMEDIA_TYPE_VIDEO); + sup = av_mallocz(sizeof(*sup) * (all->format_count + 1)); + if (!sup) + return AVERROR(errno); + for(i = 0; i < all->format_count; i++) { + ifmt = pixfmt2imgfmt(all->formats[i]); + if (vf->next->query_format(vf->next, ifmt) > 0) + sup[nsup++] = all->formats[i]; + } + sup[nsup++] = PIX_FMT_NONE; + avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(sup)); + av_free(sup); + return 0; +} + +static AVFilterBufferRef *mpsink_get_video_buffer(AVFilterLink *link, + int perms, int w, int h) +{ + struct mpsink_priv *c = link->dst->priv; + struct vf_instance *vf = c->vf; + mp_image_t *dmpi; + int type; + int flags = 0; + + type = MP_IMGTYPE_NUMBERED | (-1 << 16); + if ((perms & AV_PERM_PRESERVE)) + flags |= MP_IMGFLAG_PRESERVE; + if ((perms & AV_PERM_READ)) + flags |= MP_IMGFLAG_READABLE; + if ((perms & AV_PERM_NEG_LINESIZES)) + flags |= MP_IMGFLAG_ACCEPT_STRIDE; + if (vf->priv->in_mpi) { + type = vf->priv->in_mpi->type; + vf->priv->in_mpi = NULL; + } + dmpi = vf_get_image(vf->next, vf->priv->out_imgfmt, type, flags, w, h); + return mpi_to_bufref(dmpi, vf->priv->out_pixfmt, vf->priv->out_sar); +} + +static void mpsink_end_frame(AVFilterLink *link) +{ + struct mpsink_priv *c = link->dst->priv; + struct vf_instance *vf = c->vf; + AVFilterBufferRef *buf = link->cur_buf; + mp_image_t *mpi = buf->buf->priv; + double pts; + + pts = buf->pts == (int64_t)AV_NOPTS_VALUE ? MP_NOPTS_VALUE : + buf->pts * av_q2d(link->time_base); + mpi->pict_type = buf->video->pict_type; + mpi->fields = (buf->video->interlaced ? MP_IMGFIELD_INTERLACED : 0) | + (buf->video->top_field_first ? MP_IMGFIELD_TOP_FIRST : 0); + vf_next_put_image(vf, mpi, pts); + avfilter_unref_buffer(link->cur_buf); +} + +static AVFilter mpsink = { + .name = "mpsink", + .description = "Video sink for mplayer interaction", + .priv_size = sizeof(struct mpsink_priv), + + .init = mpsink_init, + .query_formats = mpsink_query_formats, + + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .end_frame = mpsink_end_frame, + .get_video_buffer = mpsink_get_video_buffer, + .min_perms = AV_PERM_READ, }, + { .name = NULL }}, + .outputs = (AVFilterPad[]) {{ .name = NULL }}, +}; + +struct mpsrc_priv { + struct vf_instance *vf; +}; + +static int mpsrc_init(AVFilterContext *ctx, + av_unused const char *args, void *opaque) +{ + struct mpsrc_priv *c = ctx->priv; + c->vf = opaque; + return 0; +} + +static int mpsrc_query_formats(AVFilterContext *ctx) +{ + struct mpsrc_priv *c = ctx->priv; + enum PixelFormat pix_fmts[] = { c->vf->priv->in_pixfmt, PIX_FMT_NONE }; + avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + +static int mpsrc_config_props(AVFilterLink *link) +{ + struct mpsrc_priv *c = link->src->priv; + struct vf_instance *vf = c->vf; + link->w = vf->priv->in_w; + link->h = vf->priv->in_h; + link->sample_aspect_ratio = vf->priv->in_sar; + link->time_base = AV_TIME_BASE_Q; + return 0; +} + +static int mpsrc_request_frame(AVFilterLink *link) +{ + struct mpsrc_priv *c = link->src->priv; + struct vf_instance *vf = c->vf; + + if (!vf->priv->in_buf) + return AVERROR(EINVAL); + avfilter_start_frame(link, avfilter_ref_buffer(vf->priv->in_buf, ~0)); + avfilter_draw_slice(link, 0, link->h, 1); + avfilter_end_frame(link); + vf->priv->in_buf = NULL; + return 0; +} + +static int mpsrc_poll_frame(AVFilterLink *link) +{ + struct mpsrc_priv *c = link->src->priv; + struct vf_instance *vf = c->vf; + return vf->priv->in_buf != NULL; +} + +AVFilter mpsrc = { + .name = "mpsrc", + .description = "Video source for mplayer interaction", + .priv_size = sizeof(struct mpsrc_priv), + .query_formats = mpsrc_query_formats, + + .init = mpsrc_init, + + .inputs = (AVFilterPad[]) {{ .name = NULL }}, + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .request_frame = mpsrc_request_frame, + .poll_frame = mpsrc_poll_frame, + .config_props = mpsrc_config_props, }, + { .name = NULL }}, +}; + +static int config(struct vf_instance *vf, int w, int h, int dw, int dh, + unsigned flags, unsigned fmt) +{ + int ret; + AVFilterLink *out; + AVRational iar, dar; + + av_reduce(&iar.num, &iar.den, w, h, INT_MAX); + av_reduce(&dar.num, &dar.den, dw, dh, INT_MAX); + vf->priv->in_pixfmt = imgfmt2pixfmt(fmt); + vf->priv->in_imgfmt = fmt; + vf->priv->in_w = w; + vf->priv->in_h = h; + vf->priv->in_sar = av_div_q(dar, iar); + ret = avfilter_graph_config(vf->priv->graph, NULL); + if (ret < 0) + return 0; + out = vf->priv->out->inputs[0]; + vf->priv->out_w = out->w; + vf->priv->out_h = out->h; + vf->priv->out_pixfmt = out->format; + vf->priv->out_imgfmt = pixfmt2imgfmt(out->format); + vf->priv->out_sar = out->sample_aspect_ratio; + if (vf->priv->out_sar.num != vf->priv->in_sar.num || + vf->priv->out_sar.den != vf->priv->in_sar.den || + out->w != w || out->h != h) { + av_reduce(&iar.num, &iar.den, out->w, out->h, INT_MAX); + dar = av_mul_q(iar, out->sample_aspect_ratio); + if (av_cmp_q(dar, iar) >= 0) { + dh = out->h; + dw = av_rescale(dh, dar.num, dar.den); + } else { + dw = out->w; + dh = av_rescale(dw, dar.den, dar.num); + } + } + return vf_next_config(vf, out->w, out->h, dw, dh, flags, fmt); +} + +static void get_image(struct vf_instance *vf, mp_image_t *mpi) +{ + AVFilterBufferRef *buf; + unsigned perms = AV_PERM_WRITE | AV_PERM_REUSE2; + + avfilter_unref_buffer(mpi->priv); + mpi->priv = NULL; /* for safety */ + if (mpi->flags & MP_IMGFLAG_READABLE) + perms |= AV_PERM_READ; + if (mpi->flags & MP_IMGFLAG_PRESERVE) + perms |= AV_PERM_PRESERVE; + vf->priv->in_mpi = mpi; + buf = avfilter_get_video_buffer(vf->priv->in->outputs[0], perms, + mpi->w, mpi->h); + vf->priv->in_mpi = NULL; + bufref_to_mpi(buf, mpi); + mpi->flags |= MP_IMGFLAG_DIRECT; + mpi->flags &= ~MP_IMGFLAG_ALLOCATED; + mpi->priv = buf; +} + +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) +{ + AVFilterBufferRef *buf; + mp_image_t *cmpi = NULL; + + if (!(mpi->flags & MP_IMGFLAG_DIRECT)) { + cmpi = vf_get_image(vf, mpi->imgfmt, MP_IMGTYPE_TEMP, + MP_IMGFLAG_PREFER_ALIGNED_STRIDE, + mpi->w, mpi->h); + copy_mpi(cmpi, mpi); + buf = cmpi->priv; + } else { + buf = mpi->priv; + } + buf->video->key_frame = mpi->pict_type == 1; + buf->video->pict_type = mpi->pict_type; /* seems to be the same code */ + buf->video->interlaced = !!(mpi->fields & MP_IMGFIELD_INTERLACED); + buf->video->top_field_first = !!(mpi->fields & MP_IMGFIELD_TOP_FIRST); + vf->priv->in_buf = buf; + if (pts != MP_NOPTS_VALUE) + buf->pts = pts * AV_TIME_BASE; + while (avfilter_poll_frame(vf->priv->out->inputs[0])) { + if (avfilter_request_frame(vf->priv->out->inputs[0])) + break; + } + return 1; +} + +static void uninit(struct vf_instance *vf) +{ + unsigned i; + +#define FREE_MPI_ARRAY(field) \ + for (i = 0; i < FF_ARRAY_ELEMS(vf->imgctx.field); i++) \ + if (vf->imgctx.field[i]) \ + avfilter_unref_buffer(vf->imgctx.field[i]->priv); + FREE_MPI_ARRAY(static_images); + FREE_MPI_ARRAY(temp_images); + FREE_MPI_ARRAY(export_images); + FREE_MPI_ARRAY(numbered_images); + avfilter_graph_free(&vf->priv->graph); + av_free(vf->priv); +} + +static int lavfi_open(struct vf_instance *vf, char *args) +{ + AVFilterInOut *outputs; + AVFilterInOut *inputs; + int ret; + + avfilter_register_all(); + if (!args) { + mp_msg(MSGT_VFILTER, MSGL_ERR, "lavfi: filtergraph needed\n"); + goto fail; + } + if (args[0] == '$') { + char *e = getenv(args + 1); + if (!e) { + mp_msg(MSGT_VFILTER, MSGL_ERR, "lavfi: %s not defined\n", args); + goto fail; + } + args = e; + } + vf->priv = av_mallocz(sizeof(struct vf_priv_s)); + if (!vf->priv) + return 0; + + vf->priv->graph = avfilter_graph_alloc(); + if (!vf->priv->graph) + goto fail; + ret = avfilter_graph_create_filter(&vf->priv->in, &mpsrc, "in", + NULL, vf, vf->priv->graph); + if (ret < 0) + goto fail; + ret = avfilter_graph_create_filter(&vf->priv->out, &mpsink, "out", + NULL, vf, vf->priv->graph); + if (ret < 0) + return 0; + outputs = avfilter_inout_alloc(); + inputs = avfilter_inout_alloc(); + if (!outputs || !inputs) + goto fail; + outputs->name = av_strdup("in"); + outputs->filter_ctx = vf->priv->in; + outputs->pad_idx = 0; + outputs->next = NULL; + inputs->name = av_strdup("out"); + inputs->filter_ctx = vf->priv->out; + inputs->pad_idx = 0; + inputs->next = NULL; + ret = avfilter_graph_parse(vf->priv->graph, args, &inputs, &outputs, NULL); + if (ret < 0) + goto fail; + + vf->config = config; + vf->uninit = uninit; + vf->put_image = put_image; + vf->get_image = get_image; + return 1; + +fail: + avfilter_inout_free(&inputs); + avfilter_inout_free(&outputs); + avfilter_graph_free(&vf->priv->graph); + av_free(vf->priv); + return 0; +} + +static const m_option_t vf_opts_fields[] = { { .name = NULL } }; + +const vf_info_t vf_info_lavfi = { + "libavfilter wrapper", + "lavfi", + "Nicolas George", + "", + lavfi_open, + NULL, +};

4 3

r34703 - trunk/libvo/vo_sdl.c
by reimar 23 Jul '12

23 Jul '12

Author: reimar Date: Sun Feb 12 20:27:35 2012 New Revision: 34703 Log: Deduplicate some code that exists both in the if and else branch. Modified: trunk/libvo/vo_sdl.c Modified: trunk/libvo/vo_sdl.c ============================================================================== --- trunk/libvo/vo_sdl.c Sun Feb 12 20:03:19 2012 (r34702) +++ trunk/libvo/vo_sdl.c Sun Feb 12 20:27:35 2012 (r34703) @@ -552,13 +552,9 @@ static void set_fullmode (int mode) { } mp_msg(MSGT_VO,MSGL_V, "SET SDL Mode: %d: %d x %d\n", mode, priv->fullmodes[mode]->w, priv->fullmodes[mode]->h); priv->fullmode = mode; - screen_surface_h = priv->fullmodes[mode]->h; - screen_surface_w = priv->fullmodes[mode]->w; } - else { screen_surface_h = priv->fullmodes[mode]->h; screen_surface_w = priv->fullmodes[mode]->w; - } aspect_save_screenres(screen_surface_w, screen_surface_h);

2 1

r34980 - trunk/gui/ui/gtk/fileselect.c
by ib 31 May '12

31 May '12

Author: ib Date: Thu May 31 18:34:45 2012 New Revision: 34980 Log: Add some file extensions to the video file filter of the file selector. Files of type cpk, mjpg, roq and y4m are supported by MPlayer demuxers. Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Thu May 31 00:04:51 2012 (r34979) +++ trunk/gui/ui/gtk/fileselect.c Thu May 31 18:34:45 2012 (r34980) @@ -79,7 +79,7 @@ char * fsVideoFilterNames[][2] = { MSGTR_Filter_WindowsMedia, "*.asf,*.wma,*.wmv" }, { MSGTR_Filter_Playlists, "*.asx,*.m3u,*.m3u8,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" }, { MSGTR_Filter_AllAudioFiles, "*.aac,*.ac3,*.aif,*.aifc,*.aiff,*.amr,*.ape,*.au,*.awb,*.cdg,*.f4a,*.f4b,*.flac,*.m4a,*.m4b,*.mka,*.mp+,*.mp2,*.mp3,*.mpc,*.mpga,*.mpp,*.nsa,*.oga,*.ogg,*.pcm,*.qcp,*.ra,*.snd,*.spx,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" }, - { MSGTR_Filter_AllVideoFiles, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.asf,*.avi,*.bdm,*.bdmv,*.bin,*.clpi,*.cpi,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv" }, + { MSGTR_Filter_AllVideoFiles, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.asf,*.avi,*.bdm,*.bdmv,*.bin,*.clpi,*.cpi,*.cpk,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mjpg,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.roq,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv,*.y4m" }, { MSGTR_Filter_AllFiles, "*" }, { NULL,NULL } };

1 0

r34979 - trunk/libmpcodecs/vf_unsharp.c
by ib 30 May '12

30 May '12

Author: ib Date: Thu May 31 00:04:51 2012 New Revision: 34979 Log: Request a sufficiently large image for direct rendering. Fixes broken video near the borders. Modified: trunk/libmpcodecs/vf_unsharp.c Modified: trunk/libmpcodecs/vf_unsharp.c ============================================================================== --- trunk/libmpcodecs/vf_unsharp.c Wed May 30 23:21:46 2012 (r34978) +++ trunk/libmpcodecs/vf_unsharp.c Thu May 31 00:04:51 2012 (r34979) @@ -166,7 +166,7 @@ static void get_image( struct vf_instanc return; // colorspace differ mpi->priv = - vf->dmpi = vf_get_image( vf->next, mpi->imgfmt, mpi->type, mpi->flags, mpi->w, mpi->h ); + vf->dmpi = vf_get_image( vf->next, mpi->imgfmt, mpi->type, mpi->flags, mpi->width, mpi->height ); mpi->planes[0] = vf->dmpi->planes[0]; mpi->stride[0] = vf->dmpi->stride[0]; mpi->width = vf->dmpi->width; @@ -184,7 +184,7 @@ static int put_image( struct vf_instance if( !(mpi->flags & MP_IMGFLAG_DIRECT) ) // no DR, so get a new image! hope we'll get DR buffer: - dmpi = vf->dmpi = vf_get_image( vf->next,vf->priv->outfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h); + dmpi = vf->dmpi = vf_get_image( vf->next,vf->priv->outfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->width, mpi->height); unsharp( dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, &vf->priv->lumaParam ); unsharp( dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w/2, mpi->h/2, &vf->priv->chromaParam );

1 0

r34975 - trunk/libmpcodecs/vf_unsharp.c
by reimar 30 May '12

30 May '12

Author: reimar Date: Wed May 30 22:34:02 2012 New Revision: 34975 Log: unsharp: actually process the frame we got. Previously it would always process the last frame allocated, but that might be a different one than the one first returned. Modified: trunk/libmpcodecs/vf_unsharp.c Modified: trunk/libmpcodecs/vf_unsharp.c ============================================================================== --- trunk/libmpcodecs/vf_unsharp.c Wed May 30 21:33:09 2012 (r34974) +++ trunk/libmpcodecs/vf_unsharp.c Wed May 30 22:34:02 2012 (r34975) @@ -165,6 +165,7 @@ static void get_image( struct vf_instanc if( mpi->imgfmt!=vf->priv->outfmt ) return; // colorspace differ + mpi->priv = vf->dmpi = vf_get_image( vf->next, mpi->imgfmt, mpi->type, mpi->flags, mpi->w, mpi->h ); mpi->planes[0] = vf->dmpi->planes[0]; mpi->stride[0] = vf->dmpi->stride[0]; @@ -179,12 +180,11 @@ static void get_image( struct vf_instanc } static int put_image( struct vf_instance *vf, mp_image_t *mpi, double pts) { - mp_image_t *dmpi; + mp_image_t *dmpi = mpi->priv; if( !(mpi->flags & MP_IMGFLAG_DIRECT) ) // no DR, so get a new image! hope we'll get DR buffer: - vf->dmpi = vf_get_image( vf->next,vf->priv->outfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h); - dmpi= vf->dmpi; + dmpi = vf->dmpi = vf_get_image( vf->next,vf->priv->outfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h); unsharp( dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, &vf->priv->lumaParam ); unsharp( dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w/2, mpi->h/2, &vf->priv->chromaParam );

3 3

r34978 - in trunk: Makefile help/help_check.sh
by ib 30 May '12

30 May '12

Author: ib Date: Wed May 30 23:21:46 2012 New Revision: 34978 Log: Add a Makefile target for testing the help message text headers. This allows a syntax check without having to compile for each language, but doesn't check the correctness of the used format specifiers though. Added: trunk/help/help_check.sh (contents, props changed) Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed May 30 23:08:05 2012 (r34977) +++ trunk/Makefile Wed May 30 23:21:46 2012 (r34978) @@ -811,6 +811,9 @@ config.mak: configure @echo "####### Please run ./configure again - it's changed! #######" @echo "############################################################" +checkhelp: help/help_mp*.h + help/help_check.sh $(CC) $^ + help_mp.h: help/help_mp-en.h $(HELP_FILE) help/help_create.sh $(HELP_FILE) $(CHARSET) @@ -1171,7 +1174,7 @@ dhahelperclean: -include $(DEP_FILES) $(DRIVER_DEP_FILES) $(TESTS_DEP_FILES) $(TOOLS_DEP_FILES) $(DHAHELPER_DEP_FILES) .PHONY: all doxygen *install* *tools drivers dhahelper* -.PHONY: checkheaders *clean tests check_checksums fatetest +.PHONY: checkheaders *clean tests check_checksums fatetest checkhelp .PHONY: doc html-chunked* html-single* xmllint* # Disable suffix rules. Most of the builtin rules are suffix rules, Added: trunk/help/help_check.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/help/help_check.sh Wed May 30 23:21:46 2012 (r34978) @@ -0,0 +1,22 @@ +#!/bin/sh +# Check help message header files. + +CHECK=checkhelp + +trap "rm -f ${CHECK}.c ${CHECK}.o" EXIT + +CC=$1 +shift + +for h in "$@"; do + cat <<EOF > ${CHECK}.c +#include <inttypes.h> +#include <string.h> +#include "config.h" +#include "$h" +void $CHECK () { +EOF + sed -n "s:^[ \t]*#define[ \t]\+$[0-9A-Za-z_]\+$[ \t].*:strdup(\1);:p" "$h" >> ${CHECK}.c + echo "}" >> ${CHECK}.c + $CC -Werror -c -o ${CHECK}.o ${CHECK}.c || exit +done

1 0

r34977 - trunk/libmpcodecs/vf.c
by reimar 30 May '12

30 May '12

Author: reimar Date: Wed May 30 23:08:05 2012 New Revision: 34977 Log: Add/improve some code to help debugging DR in filters. Modified: trunk/libmpcodecs/vf.c Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c Wed May 30 23:05:21 2012 (r34976) +++ trunk/libmpcodecs/vf.c Wed May 30 23:08:05 2012 (r34977) @@ -361,7 +361,8 @@ mp_image_t* vf_get_image(vf_instance_t* if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) av_freep(&mpi->planes[1]); mpi->flags&=~MP_IMGFLAG_ALLOCATED; - mp_msg(MSGT_VFILTER,MSGL_V,"vf.c: have to REALLOCATE buffer memory :(\n"); + mp_msg(MSGT_VFILTER,MSGL_V,"vf.c: have to REALLOCATE buffer memory in vf_%s :(\n", + vf->info->name); } // } else { } { @@ -428,6 +429,10 @@ mp_image_t* vf_get_image(vf_instance_t* mpi->qscale = NULL; } mpi->usage_count++; + // TODO: figure out what is going on with EXPORT types + if (mpi->usage_count > 1 && mpi->type != MP_IMGTYPE_EXPORT) + mp_msg(MSGT_VFILTER, MSGL_V, "Suspicious mp_image usage count %i in vf_%s (type %i)\n", + mpi->usage_count, vf->info->name, mpi->type); // printf("\rVF_MPI: %p %p %p %d %d %d \n", // mpi->planes[0],mpi->planes[1],mpi->planes[2], // mpi->stride[0],mpi->stride[1],mpi->stride[2]); @@ -693,6 +698,11 @@ int vf_next_query_format(struct vf_insta int vf_next_put_image(struct vf_instance *vf,mp_image_t *mpi, double pts){ mpi->usage_count--; + if (mpi->usage_count < 0) { + mp_msg(MSGT_VFILTER, MSGL_V, "Bad mp_image usage count %i in vf_%s (type %i)\n", + mpi->usage_count, vf->info->name, mpi->type); + mpi->usage_count = 0; + } return vf->next->put_image(vf->next,mpi, pts); }

1 0

r34976 - trunk/mplayer.c
by ib 30 May '12

30 May '12

Author: ib Date: Wed May 30 23:05:21 2012 New Revision: 34976 Log: Allow plain text playlists for the GUI. This additional plain text playlist parsing will only happen if the user selects from the "Playlists" filter of the file selector. The "Playlists" filter is the GUI's equivalent to the -playlist option, so there won't happen more bad things than with the option. (Actually, it's safer than the option, because the "Playlists" filter only offers a limited selection.) Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Wed May 30 22:34:02 2012 (r34975) +++ trunk/mplayer.c Wed May 30 23:05:21 2012 (r34976) @@ -3234,7 +3234,7 @@ play_next_file: current_module = "handle_playlist"; mp_msg(MSGT_CPLAYER, MSGL_V, "Parsing playlist %s...\n", filename_recode(filename)); - entry = parse_playtree(mpctx->stream, 0); + entry = parse_playtree(mpctx->stream, use_gui); mpctx->eof = playtree_add_playlist(entry); goto goto_next_file; }

1 0

r34974 - trunk/mplayer.c
by reimar 30 May '12

30 May '12

Author: reimar Date: Wed May 30 21:33:09 2012 New Revision: 34974 Log: Another attempt at clearing DVDNAV highlights, this time without making subtitles appear immediately in the film itself. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Tue May 29 20:32:35 2012 (r34973) +++ trunk/mplayer.c Wed May 30 21:33:09 2012 (r34974) @@ -3867,6 +3867,8 @@ goto_enable_cache: #ifdef CONFIG_DVDNAV if (mpctx->stream->type == STREAMTYPE_DVDNAV) { + // do not clobber subtitles + if (!mp_dvdnav_number_of_subs(mpctx->stream)) { nav_highlight_t hl; mp_dvdnav_get_highlight(mpctx->stream, &hl); if (!vo_spudec || !spudec_apply_palette_crop(vo_spudec, hl.palette, hl.sx, hl.sy, hl.ex, hl.ey)) { @@ -3877,9 +3879,13 @@ goto_enable_cache: vo_osd_changed(OSDTYPE_DVDNAV); vo_osd_changed(OSDTYPE_SPU); } + } if (mp_dvdnav_stream_has_changed(mpctx->stream)) { double ar = -1.0; + // clear highlight + if (vo_spudec) + spudec_apply_palette_crop(vo_spudec, 0, 0, 0, 0, 0); if (mpctx->sh_video && stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar)

1 0

r34973 - trunk/libmpcodecs/vf_ass.c
by reimar 29 May '12

29 May '12

Author: reimar Date: Tue May 29 20:32:35 2012 New Revision: 34973 Log: Use correct variable for height. Fixes possible assert failures if direct rendering was used and height was padded caused by a too small dirty_rows array. Modified: trunk/libmpcodecs/vf_ass.c Modified: trunk/libmpcodecs/vf_ass.c ============================================================================== --- trunk/libmpcodecs/vf_ass.c Sun May 27 20:12:42 2012 (r34972) +++ trunk/libmpcodecs/vf_ass.c Tue May 29 20:32:35 2012 (r34973) @@ -280,7 +280,7 @@ static void copy_to_image(struct vf_inst unsigned char *dst = vf->dmpi->planes[pl]; unsigned char *src = vf->priv->planes[pl]; unsigned char *src_next = vf->priv->planes[pl] + src_stride; - for (i = 0; i < vf->dmpi->chroma_height; ++i) { + for (i = 0; i < vf->priv->outh / 2; ++i) { if ((vf->priv->dirty_rows[i * 2] == 1)) { assert(vf->priv->dirty_rows[i * 2 + 1] == 1); for (j = 0, k = 0; j < vf->dmpi->chroma_width; ++j, k += 2) {

1 0