February 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 10 Oct '12

10 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

r34780 - in trunk/libmpcodecs: ve_lavc.c vf_lavc.c
by reimar 28 Feb '12

28 Feb '12

Author: reimar Date: Tue Feb 28 20:31:56 2012 New Revision: 34780 Log: Remove pointless check that used internals would fail always after the switch to encode2. Modified: trunk/libmpcodecs/ve_lavc.c trunk/libmpcodecs/vf_lavc.c Modified: trunk/libmpcodecs/ve_lavc.c ============================================================================== --- trunk/libmpcodecs/ve_lavc.c Tue Feb 28 20:30:48 2012 (r34779) +++ trunk/libmpcodecs/ve_lavc.c Tue Feb 28 20:31:56 2012 (r34780) @@ -679,11 +679,6 @@ static int config(struct vf_instance *vf } av_dict_free(&opts); - if (lavc_venc_context->codec->encode == NULL) { - mp_msg(MSGT_MENCODER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n"); - return 0; - } - /* free second pass buffer, its not needed anymore */ av_freep(&lavc_venc_context->stats_in); if(lavc_venc_context->bits_per_coded_sample) Modified: trunk/libmpcodecs/vf_lavc.c ============================================================================== --- trunk/libmpcodecs/vf_lavc.c Tue Feb 28 20:30:48 2012 (r34779) +++ trunk/libmpcodecs/vf_lavc.c Tue Feb 28 20:31:56 2012 (r34780) @@ -79,11 +79,6 @@ static int config(struct vf_instance *vf return 0; } - if (lavc_venc_context.codec->encode == NULL) { - mp_msg(MSGT_MENCODER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n"); - return 0; - } - return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES); }

1 0

r34779 - in trunk/libmpcodecs: ve_lavc.c vf_lavc.c
by reimar 28 Feb '12

28 Feb '12

Author: reimar Date: Tue Feb 28 20:30:48 2012 New Revision: 34779 Log: Remove pointless casts. Modified: trunk/libmpcodecs/ve_lavc.c trunk/libmpcodecs/vf_lavc.c Modified: trunk/libmpcodecs/ve_lavc.c ============================================================================== --- trunk/libmpcodecs/ve_lavc.c Mon Feb 27 23:09:34 2012 (r34778) +++ trunk/libmpcodecs/ve_lavc.c Tue Feb 28 20:30:48 2012 (r34779) @@ -1018,7 +1018,7 @@ static int vf_open(vf_instance_t *vf, ch init_avcodec(); - vf->priv->codec = (AVCodec *)avcodec_find_encoder_by_name(lavc_param_vcodec); + vf->priv->codec = avcodec_find_encoder_by_name(lavc_param_vcodec); if (!vf->priv->codec) { mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_MissingLAVCcodec, lavc_param_vcodec); return 0; Modified: trunk/libmpcodecs/vf_lavc.c ============================================================================== --- trunk/libmpcodecs/vf_lavc.c Mon Feb 27 23:09:34 2012 (r34778) +++ trunk/libmpcodecs/vf_lavc.c Tue Feb 28 20:30:48 2012 (r34779) @@ -142,7 +142,7 @@ static int vf_open(vf_instance_t *vf, ch init_avcodec(); - vf->priv->codec = (AVCodec *)avcodec_find_encoder_by_name("mpeg1video"); + vf->priv->codec = avcodec_find_encoder_by_name("mpeg1video"); if (!vf->priv->codec) { mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_MissingLAVCcodec, "mpeg1video"); return 0;

1 0

r34778 - trunk/gui/ui/actions.c
by ib 27 Feb '12

27 Feb '12

Author: ib Date: Mon Feb 27 23:09:34 2012 New Revision: 34778 Log: Fix bug with playlist playback. When <stop> is pressed and you shift to another track and press <play>, the track is played twice (before advancing to the next element in the list). Reported by drake ch, drake.ch hotmail com. When shifting to another track, set information that at the end of playback of the current track the next track to be played shall not be determined (!uiGotoTheNext) only if currently playing. That is because the track shifting function itself (which already has determined the next track to be played) will end the playback of the current track (and start the next one) only if currently playing. If not playing, the next track to be played after the end of playback of the current track (determined by the track shifting function) must be determined again (uiGotoTheNext). Modified: trunk/gui/ui/actions.c Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Sat Feb 25 19:26:31 2012 (r34777) +++ trunk/gui/ui/actions.c Mon Feb 27 23:09:34 2012 (r34778) @@ -258,7 +258,7 @@ void uiCurr(void) if (curr) { uiSetFileName(curr->path, curr->name, STREAMTYPE_FILE); - uiGotoTheNext = 0; + uiGotoTheNext = (guiInfo.Playing ? 0 : 1); break; } @@ -314,7 +314,7 @@ void uiPrev(void) if (prev) { uiSetFileName(prev->path, prev->name, STREAMTYPE_FILE); - uiGotoTheNext = 0; + uiGotoTheNext = (guiInfo.Playing ? 0 : 1); guiInfo.Track--; break; } @@ -375,7 +375,7 @@ void uiNext(void) if (next) { uiSetFileName(next->path, next->name, STREAMTYPE_FILE); - uiGotoTheNext = 0; + uiGotoTheNext = (guiInfo.Playing ? 0 : 1); guiInfo.Track++; break; }

1 0

[propchange]: r34774 - svn:log
by cigaes 27 Feb '12

27 Feb '12

Author: cigaes Revision: 34774 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,3 +1,3 @@ -Allow to set the OST progress position. +Allow to set the OSD progress position. -Patch by Changyu Li, ironyman13 at gmail. \ No newline at end of file +Patch by Changyu Li, ironyman13 at gmail.

1 0

r34774 - in trunk: DOCS/man/en/mplayer.1 cfg-mplayer.h etc/example.conf mplayer.h sub/sub.c
by cigaes 26 Feb '12

26 Feb '12

Author: cigaes Date: Fri Feb 24 21:19:46 2012 New Revision: 34774 Log: Allow to set the OST progress position. Patch by Changyu Li, ironyman13 at gmail. Modified: trunk/cfg-mplayer.h trunk/etc/example.conf trunk/mplayer.h trunk/sub/sub.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h Fri Feb 24 18:26:35 2012 (r34773) +++ trunk/cfg-mplayer.h Fri Feb 24 21:19:46 2012 (r34774) @@ -351,6 +351,7 @@ const m_option_t mplayer_opts[]={ {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, {"vd", vd_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"progbar-align", &progbar_align, CONF_TYPE_INT, CONF_GLOBAL, 0, 100, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; Modified: trunk/etc/example.conf ============================================================================== --- trunk/etc/example.conf Fri Feb 24 18:26:35 2012 (r34773) +++ trunk/etc/example.conf Fri Feb 24 21:19:46 2012 (r34774) @@ -160,6 +160,8 @@ #vf-clr=yes +# OSD progress bar vertical alignment +#progbar-align=50 # You can also include other configuration files. #include = /path/to/the/file/you/want/to/include Modified: trunk/mplayer.h ============================================================================== --- trunk/mplayer.h Fri Feb 24 18:26:35 2012 (r34773) +++ trunk/mplayer.h Fri Feb 24 21:19:46 2012 (r34774) @@ -36,6 +36,7 @@ extern int use_menu; extern float audio_delay; extern double start_pts; +extern int progbar_align; /* for the GUI */ extern int auto_quality; Modified: trunk/sub/sub.c ============================================================================== --- trunk/sub/sub.c Fri Feb 24 18:26:35 2012 (r34773) +++ trunk/sub/sub.c Fri Feb 24 21:19:46 2012 (r34774) @@ -528,6 +528,7 @@ TODO: support for separated graphics sym int vo_osd_progbar_type=-1; int vo_osd_progbar_value=100; // 0..256 +int progbar_align=50; // if we have n=256 bars then OSD progbar looks like below // @@ -555,7 +556,7 @@ static inline void vo_update_text_progba // calculate bbox corners: { int h=0; - int y=(dys-vo_font->height)/2; + int y=((dys-vo_font->height)*progbar_align)/100; int delimw=vo_font->width[OSD_PB_START] +vo_font->width[OSD_PB_END] +vo_font->charspace;

2 1

r34777 - trunk/libmpdemux/demuxer.c
by reimar 25 Feb '12

25 Feb '12

Author: reimar Date: Sat Feb 25 19:26:31 2012 New Revision: 34777 Log: Fix DVDs showing the subtitle language as "unknown" for a long time. Modified: trunk/libmpdemux/demuxer.c Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Sat Feb 25 00:34:55 2012 (r34776) +++ trunk/libmpdemux/demuxer.c Sat Feb 25 19:26:31 2012 (r34777) @@ -1815,14 +1815,14 @@ int demuxer_sub_lang(demuxer_t *d, int i if (id < 0 || id >= MAX_S_STREAMS) return -1; sh = d->s_streams[id]; - if (!sh) - return -1; - if (sh->lang) { + if (sh && sh->lang) { av_strlcpy(buf, sh->lang, buf_len); return 0; } req.type = stream_ctrl_sub; - req.id = sh->sid; + // assume 1:1 mapping so we can show the language of + // DVD subs even when we have not yet created the stream. + req.id = sh ? sh->sid : id; if (stream_control(d->stream, STREAM_CTRL_GET_LANG, &req) == STREAM_OK) { av_strlcpy(buf, req.buf, buf_len); return 0;

1 0

r34773 - in trunk/gui: ui/gtk/preferences.c util/string.c util/string.h
by ib 24 Feb '12

24 Feb '12

Author: ib Date: Fri Feb 24 18:26:35 2012 New Revision: 34773 Log: Remove gstrcasecmp(). This function isn't necessary. strcasecmp() can be used just as well, because both arguments to the gstrcasecmp() calls have been checked to be not NULL prior to the call. Modified: trunk/gui/ui/gtk/preferences.c trunk/gui/util/string.c trunk/gui/util/string.h Modified: trunk/gui/ui/gtk/preferences.c ============================================================================== --- trunk/gui/ui/gtk/preferences.c Fri Feb 24 18:16:54 2012 (r34772) +++ trunk/gui/ui/gtk/preferences.c Fri Feb 24 18:26:35 2012 (r34773) @@ -319,7 +319,7 @@ void ShowPreferences( void ) { int i; for ( i=0;lEncoding[i].name;i++ ) - if ( !gstrcasecmp( sub_cp,lEncoding[i].name ) ) break; + if ( !strcasecmp( sub_cp,lEncoding[i].name ) ) break; if ( lEncoding[i].name ) gtk_entry_set_text( GTK_ENTRY( ESubEncoding ),lEncoding[i].comment ); } #endif @@ -338,7 +338,7 @@ void ShowPreferences( void ) { int i; for ( i=0;lEncoding[i].name;i++ ) - if ( !gstrcasecmp( subtitle_font_encoding,lEncoding[i].name ) ) break; + if ( !strcasecmp( subtitle_font_encoding,lEncoding[i].name ) ) break; if ( lEncoding[i].name ) gtk_entry_set_text( GTK_ENTRY( EFontEncoding ),lEncoding[i].comment ); } switch ( subtitle_autoscale ) Modified: trunk/gui/util/string.c ============================================================================== --- trunk/gui/util/string.c Fri Feb 24 18:16:54 2012 (r34772) +++ trunk/gui/util/string.c Fri Feb 24 18:26:35 2012 (r34773) @@ -163,16 +163,6 @@ int gstrcmp(const char *a, const char *b return strcmp(a, b); } -int gstrcasecmp(const char *a, const char *b) -{ - if (!a && !b) - return 0; - if (!a || !b) - return -1; - - return strcasecmp(a, b); -} - /** * @brief A strncmp() that can handle NULL pointers. * Modified: trunk/gui/util/string.h ============================================================================== --- trunk/gui/util/string.h Fri Feb 24 18:16:54 2012 (r34772) +++ trunk/gui/util/string.h Fri Feb 24 18:26:35 2012 (r34773) @@ -23,7 +23,6 @@ char *decomment(char *in); char *fgetstr(char *str, int size, FILE *file); -int gstrcasecmp(const char *a, const char *b); char *gstrchr(const char *str, int c); int gstrcmp(const char *a, const char *b); char *gstrdup(const char *str);

1 0

r34772 - in trunk/gui: app.h cfg.c interface.c ui/actions.c ui/gtk/equalizer.c ui/gtk/fileselect.c ui/gtk/preferences.c ui/main.c ui/menu.c ui/playbar.c ui/sub.c ui/widgets.c util/bitmap.c util/bit...
by ib 24 Feb '12

24 Feb '12

Author: ib Date: Fri Feb 24 18:16:54 2012 New Revision: 34772 Log: Cosmetic: Prefer C style for single line comments. Additionally, slightly revise some of these comments. Modified: trunk/gui/app.h trunk/gui/cfg.c trunk/gui/interface.c trunk/gui/ui/actions.c trunk/gui/ui/gtk/equalizer.c trunk/gui/ui/gtk/fileselect.c trunk/gui/ui/gtk/preferences.c trunk/gui/ui/main.c trunk/gui/ui/menu.c trunk/gui/ui/playbar.c trunk/gui/ui/sub.c trunk/gui/ui/widgets.c trunk/gui/util/bitmap.c trunk/gui/util/bitmap.h trunk/gui/util/list.c trunk/gui/win32/gui.c trunk/gui/win32/skinload.h trunk/gui/wm/ws.c trunk/gui/wm/ws.h Modified: trunk/gui/app.h ============================================================================== --- trunk/gui/app.h Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/app.h Fri Feb 24 18:16:54 2012 (r34772) @@ -22,7 +22,7 @@ #include "util/bitmap.h" #include "wm/ws.h" -// User events +/* User events */ #define evNone 0 @@ -73,7 +73,7 @@ #define evIconify 11 #define evExit 1000 -// Internal events +/* Internal events */ #define ivSetAudio 45 #define ivSetVideo 46 @@ -96,7 +96,7 @@ typedef struct { const char *name; } evName; -// Skin items +/* Skin items */ #define itNone 0 #define itButton 101 @@ -111,13 +111,13 @@ typedef struct { #define itPLMButton (itNone - 1) #define itPRMButton (itNone - 2) -// Button states +/* Button states */ #define btnDisabled 0 #define btnReleased 1 #define btnPressed 2 -// Item definition +/* Item definition */ #define MAX_ITEMS 64 Modified: trunk/gui/cfg.c ============================================================================== --- trunk/gui/cfg.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/cfg.c Fri Feb 24 18:16:54 2012 (r34772) @@ -246,7 +246,7 @@ void cfg_read(void) player_idle_mode = 1; // GUI is in idle mode by default - // configuration + /* configuration */ fname = get_path(gui_configuration); @@ -268,7 +268,7 @@ void cfg_read(void) free(fname); - // playlist + /* playlist */ fname = get_path(gui_playlist); file = fopen(fname, "rt"); @@ -303,7 +303,7 @@ void cfg_read(void) free(fname); - // URL list + /* URL list */ fname = get_path(gui_urllist); file = fopen(fname, "rt"); @@ -331,7 +331,7 @@ void cfg_read(void) free(fname); - // directory history + /* directory history */ fname = get_path(gui_history); file = fopen(fname, "rt"); @@ -354,7 +354,7 @@ void cfg_write(void) char *fname; FILE *file; - // configuration + /* configuration */ fname = get_path(gui_configuration); file = fopen(fname, "wt+"); @@ -388,7 +388,7 @@ void cfg_write(void) free(fname); - // playlist + /* playlist */ fname = get_path(gui_playlist); file = fopen(fname, "wt+"); @@ -410,7 +410,7 @@ void cfg_write(void) free(fname); - // URL list + /* URL list */ fname = get_path(gui_urllist); file = fopen(fname, "wt+"); @@ -430,7 +430,7 @@ void cfg_write(void) free(fname); - // directory history + /* directory history */ fname = get_path(gui_history); file = fopen(fname, "wt+"); Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/interface.c Fri Feb 24 18:16:54 2012 (r34772) @@ -97,10 +97,10 @@ void guiInit(void) gtkInit(); - // initialize X + /* initialize X */ wsXInit(mDisplay); - // load skin + /* load skin */ skinDirInHome = get_path("skins"); skinMPlayerDir = MPLAYER_DATADIR "/skins"; @@ -130,7 +130,7 @@ void guiInit(void) mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); } - // initialize windows + /* initialize windows */ mainDrawBuffer = malloc(guiApp.main.Bitmap.ImageSize); @@ -445,7 +445,7 @@ int gui(int what, void *data) break; } - // video opts + /* video opts */ if (!video_driver_list) { int i = 0; @@ -486,7 +486,7 @@ int gui(int what, void *data) if (gtkVfPP) add_vf("pp"); - // audio opts + /* audio opts */ // if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; } if (gtkAONorm) @@ -555,7 +555,7 @@ int gui(int what, void *data) } } - // subtitle + /* subtitle */ // subdata->filename=gstrdup( guiInfo.SubtitleFilename ); stream_dump_type = 0; @@ -569,7 +569,7 @@ int gui(int what, void *data) gtkSubDumpMPSub = gtkSubDumpSrt = 0; mplayerLoadFont(); - // misc + /* misc */ if (gtkCacheOn) stream_cache_size = gtkCacheSize; @@ -641,7 +641,7 @@ int gui(int what, void *data) case GUI_SET_VIDEO: - // video + /* video */ guiInfo.sh_video = data; @@ -875,7 +875,7 @@ int guiPlaylistInitialize(play_tree_t *m if ((my_pt_iter = pt_iter_create(&my_playtree, config))) { while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL) - // add it to end of list + /* add it to end of list */ if (import_file_into_gui(filename, 0)) result = 1; } @@ -904,7 +904,7 @@ int guiPlaylistAdd(play_tree_t *my_playt if ((my_pt_iter = pt_iter_create(&my_playtree, config))) { while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL) - // insert it into the list and set plCurrent=new item + /* insert it into the list and set plCurrent=new item */ if (import_file_into_gui(filename, 1)) result = 1; @@ -931,7 +931,7 @@ void mplayer(int what, float value, void equalizer_t *eq = (equalizer_t *)data; switch (what) { - // subtitle + /* subtitle */ case MPLAYER_SET_FONT_FACTOR: font_factor = value; @@ -997,7 +997,7 @@ void mplayer(int what, float value, void auto_quality = (int)value; break; - // set equalizers + /* set equalizers */ case MPLAYER_SET_CONTRAST: if (guiInfo.sh_video) Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/ui/actions.c Fri Feb 24 18:16:54 2012 (r34772) @@ -135,7 +135,7 @@ void uiChangeSkin(char *name) } } - // reload menu window + /* reload menu window */ if (prev && guiApp.menuIsPresent) { free(menuDrawBuffer); @@ -153,7 +153,7 @@ void uiChangeSkin(char *name) } else uiMenuInit(); - // reload sub window + /* reload sub window */ if (guiApp.sub.Bitmap.Image) wsResizeImage(&guiApp.subWindow, guiApp.sub.Bitmap.Width, guiApp.sub.Bitmap.Height); @@ -173,14 +173,14 @@ void uiChangeSkin(char *name) wsPostRedisplay(&guiApp.subWindow); } - // reload playbar + /* reload playbar */ if (bprev) wsDestroyWindow(&guiApp.playbarWindow); uiPlaybarInit(); - // reload main window + /* reload main window */ free(mainDrawBuffer); mainDrawBuffer = calloc(1, guiApp.main.Bitmap.ImageSize); Modified: trunk/gui/ui/gtk/equalizer.c ============================================================================== --- trunk/gui/ui/gtk/equalizer.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/ui/gtk/equalizer.c Fri Feb 24 18:16:54 2012 (r34772) @@ -501,7 +501,7 @@ GtkWidget * create_Equalizer( void ) return Equalizer; } -// --- equalizer config dialog box +/* equalizer config dialog box */ static GtkWidget * CBChannel1; static GtkWidget * CEChannel1; Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/ui/gtk/fileselect.c Fri Feb 24 18:16:54 2012 (r34772) @@ -396,7 +396,7 @@ static void fs_PersistantHistory( char * for ( i=FF_ARRAY_ELEMS(fsHistory) - 1;i;i-- ) fsHistory[i]=fsHistory[i - 1]; fsHistory[0]=gstrdup( subject ); } -//----------------------------------------------- +/* ----------------------------------------------- */ static void fs_fsFilterCombo_activate( GtkEntry * entry, gpointer user_data ) Modified: trunk/gui/ui/gtk/preferences.c ============================================================================== --- trunk/gui/ui/gtk/preferences.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/ui/gtk/preferences.c Fri Feb 24 18:16:54 2012 (r34772) @@ -51,7 +51,7 @@ #include "fileselect.h" #include "tools.h" -// for mpcodecs_[av]d_drivers: +/* for mpcodecs_[av]d_drivers: */ #include "libmpcodecs/vd.h" #include "libmpcodecs/ad.h" @@ -201,7 +201,7 @@ void ShowPreferences( void ) if ( Preferences ) gtkActive( Preferences ); else Preferences=create_Preferences(); -// -- 1. page +/* 1st page */ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ),gtkEnableAudioEqualizer ); #if 0 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSurround ),gtkAOSurround ); @@ -242,7 +242,7 @@ void ShowPreferences( void ) } } -// -- 2. page +/* 2nd page */ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ),vo_doublebuffering ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDR ),vo_directrendering ); @@ -280,7 +280,7 @@ void ShowPreferences( void ) gtk_adjustment_set_value( HSFPSadj,force_fps ); -// -- 3. page +/* 3rd page */ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubOverlap ),suboverlap_enabled ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ),!sub_auto ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ),gtkSubDumpMPSub ); @@ -324,8 +324,8 @@ void ShowPreferences( void ) } #endif -// --- 4. page - // font ... +/* 4th page */ + /* font ... */ if ( font_name ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name ); #ifndef CONFIG_FREETYPE gtk_adjustment_set_value( HSFontFactoradj,font_factor ); @@ -350,7 +350,7 @@ void ShowPreferences( void ) } #endif -// -- 5. page +/* 5th page */ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNonInterlaved ),force_ni ); if ( index_mode == 1 ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBIndex ),1 ); { @@ -385,7 +385,7 @@ void ShowPreferences( void ) if ( name ) gtk_entry_set_text( GTK_ENTRY( EAFM ),name ); } -// --- 6. page +/* 6th page */ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVfPP ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ),gui_save_pos ); @@ -416,7 +416,7 @@ void ShowPreferences( void ) if ( cdrom_device ) gtk_entry_set_text( GTK_ENTRY( prECDRomDevice ),cdrom_device ); else gtk_entry_set_text( GTK_ENTRY( prECDRomDevice ),DEFAULT_CDROM_DEVICE ); -// -- disables +/* disables */ #ifndef CONFIG_ASS gtk_widget_set_sensitive( CBUseASS,FALSE ); gtk_widget_set_sensitive( CBASSUseMargins,FALSE ); @@ -424,7 +424,7 @@ void ShowPreferences( void ) gtk_widget_set_sensitive( SBASSBottomMargin,FALSE ); #endif -// -- signals +/* signals */ gtk_signal_connect( GTK_OBJECT( CBExtraStereo ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)0 ); gtk_signal_connect( GTK_OBJECT( CBNormalize ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 ); gtk_signal_connect( GTK_OBJECT( CBSoftwareMixer ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 ); @@ -529,7 +529,7 @@ static void prButton( GtkButton * button switch ( (int)user_data ) { case bOk: - // -- 1. page + /* 1st page */ gtkEnableAudioEqualizer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ) ); gtkAOExtraStereo=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBExtraStereo ) ); gtkAONorm=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNormalize ) ); @@ -540,7 +540,7 @@ static void prButton( GtkButton * button listSet( &audio_driver_list,ao_driver[0] ); listSet( &video_driver_list,vo_driver[0] ); - // -- 2. page + /* 2nd page */ vo_doublebuffering=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ) ); vo_directrendering=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDR ) ); @@ -553,7 +553,7 @@ static void prButton( GtkButton * button force_fps=HSFPSadj->value; - // -- 3. page + /* 3rd page */ suboverlap_enabled=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubOverlap ) ); sub_auto=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) ); gtkSubDumpMPSub=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ) ); @@ -574,7 +574,7 @@ static void prButton( GtkButton * button if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDTPTT ) ) ) osd_level=3; - // --- 4. page + /* 4th page */ setdup( &font_name,gtk_entry_get_text( GTK_ENTRY( prEFontName ) ) ); #ifndef CONFIG_FREETYPE mplayer( MPLAYER_SET_FONT_FACTOR,HSFontFactoradj->value,0 ); @@ -589,7 +589,7 @@ static void prButton( GtkButton * button if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleDiagonal ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,3,0 ); #endif - // -- 5. page + /* -- 5th page */ force_ni=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNonInterlaved ) ); index_mode=-1; if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBIndex ) ) ) index_mode=1; @@ -610,7 +610,7 @@ static void prButton( GtkButton * button { listSet( &audio_fm_list,(char *)mpcodecs_ad_drivers[i]->info->short_name ); break; } } - // --- 6. page + /* 6th page */ gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) ); gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) ); gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) ); @@ -857,7 +857,7 @@ GtkWidget * create_Preferences( void ) frame=AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,1 ); frame=AddFrame( NULL,GTK_SHADOW_NONE,frame,1 ); -// --- 1. page +/* 1st page */ vbox2=AddVBox( frame,0 ); @@ -910,7 +910,7 @@ GtkWidget * create_Preferences( void ) label=AddLabel( MSGTR_PREFERENCES_Audio,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),0 ),label ); -// --- 2. page +/* 2nd page */ hbox2=AddVBox( notebook1,0 ); @@ -975,7 +975,7 @@ GtkWidget * create_Preferences( void ) label=AddLabel( MSGTR_PREFERENCES_Video,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),1 ),label ); -// --- 3. page +/* 3rd page */ vbox6=AddVBox( notebook1,0 ); @@ -1094,7 +1094,7 @@ GtkWidget * create_Preferences( void ) gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),2 ),label ); vbox601=AddVBox( notebook1,0 ); -// --- 4. page +/* 4th page */ vbox603=AddVBox( AddFrame( NULL,GTK_SHADOW_NONE, @@ -1178,7 +1178,7 @@ GtkWidget * create_Preferences( void ) label=AddLabel( MSGTR_PREFERENCES_FRAME_Font,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),3 ),label ); -// --- 5. page +/* 5th page */ vbox601=AddVBox( notebook1,0 ); @@ -1222,7 +1222,7 @@ GtkWidget * create_Preferences( void ) vbox601=AddVBox( notebook1,0 ); -// --- 6. page +/* 6th page */ vbox602=AddVBox( AddFrame( NULL,GTK_SHADOW_NONE, @@ -1300,7 +1300,7 @@ GtkWidget * create_Preferences( void ) label=AddLabel( MSGTR_PREFERENCES_Misc,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),5 ),label ); -// --- +/* --- */ AddHSeparator( vbox1 ); @@ -1370,7 +1370,7 @@ GtkWidget * create_Preferences( void ) #ifdef CONFIG_OSS_AUDIO static GList *appendOSSDevices(GList *l) { - // careful! the current implementation allows only string constants! + /* careful! the current implementation allows only string constants! */ l = g_list_append(l, (gpointer)"/dev/dsp"); if (gtkAOOSSDevice && strncmp(gtkAOOSSDevice, "/dev/sound", 10) == 0) { l = g_list_append(l, (gpointer)"/dev/sound/dsp0"); @@ -1395,7 +1395,7 @@ static GList *appendOSSDevices(GList *l) static GList *appendOSSMixers(GList *l) { - // careful! the current implementation allows only string constants! + /* careful! the current implementation allows only string constants! */ l = g_list_append(l, (gpointer)"/dev/mixer"); if (gtkAOOSSMixer && strncmp(gtkAOOSSMixer, "/dev/sound", 10) == 0) { l = g_list_append(l, (gpointer)"/dev/sound/mixer0"); @@ -1706,7 +1706,7 @@ GtkWidget *create_AudioConfig( void ) { return AudioConfig; } -// --- dxr3 config box +/* dxr3 config box */ static GtkWidget * DXR3Config; static GtkWidget * CBDevice; Modified: trunk/gui/ui/main.c ============================================================================== --- trunk/gui/ui/main.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/ui/main.c Fri Feb 24 18:16:54 2012 (r34772) @@ -135,7 +135,7 @@ void uiEventHandling( int msg,float para switch( msg ) { -// --- user events +/* user events */ case evExit: mplayer( MPLAYER_EXIT_GUI, EXIT_QUIT, 0 ); break; @@ -406,7 +406,7 @@ set_volume: guiInfo.NewPlay=GUI_FILE_NEW; break; -// --- timer events +/* timer events */ case ivRedraw: { unsigned now = GetTimerMS(); @@ -420,7 +420,7 @@ set_volume: wsPostRedisplay( &guiApp.mainWindow ); wsPostRedisplay( &guiApp.playbarWindow ); break; -// --- system events +/* system events */ case evNone: mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] uiEventHandling: evNone\n" ); break; @@ -507,7 +507,7 @@ void uiMainMouseHandle( int Button,int X gtkShow( ivShowPopUpMenu,NULL ); break; -// --- rolled mouse ... de szar :))) +/* rolled mouse ... de szar :))) */ case wsP5MouseButton: value=-2.5f; goto rollerhandled; case wsP4MouseButton: value= 2.5f; rollerhandled: @@ -520,7 +520,7 @@ rollerhandled: } break; -// --- moving +/* moving */ case wsMoveMouse: item=&guiApp.mainItems[SelectedItem]; switch ( itemtype ) Modified: trunk/gui/ui/menu.c ============================================================================== --- trunk/gui/ui/menu.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/ui/menu.c Fri Feb 24 18:16:54 2012 (r34772) @@ -48,7 +48,7 @@ static void uiMenuDraw( void ) if ( menuRender || menuItem != oldMenuItem ) { memcpy( menuDrawBuffer,guiApp.menu.Bitmap.Image,guiApp.menu.Bitmap.ImageSize ); -// --- +/* --- */ if ( menuItem != -1 ) { buf=(uint32_t *)menuDrawBuffer; @@ -61,7 +61,7 @@ static void uiMenuDraw( void ) } } oldMenuItem=menuItem; -// --- +/* --- */ wsConvert( &guiApp.menuWindow,menuDrawBuffer ); menuRender=0; } Modified: trunk/gui/ui/playbar.c ============================================================================== --- trunk/gui/ui/playbar.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/ui/playbar.c Fri Feb 24 18:16:54 2012 (r34772) @@ -99,7 +99,7 @@ static void uiPlaybarDraw( void ) break; } -// --- render +/* render */ if ( guiApp.playbarWindow.State == wsWindowExpose ) { btnModify( evSetMoviePosition,guiInfo.Position ); @@ -141,7 +141,7 @@ static void uiPlaybarMouseHandle( int Bu case wsRRMouseButton: gtkShow( ivShowPopUpMenu,NULL ); break; -// --- +/* --- */ case wsPLMouseButton: gtkShow( ivHidePopUpMenu,NULL ); SelectedItem=currentselected; @@ -189,7 +189,7 @@ static void uiPlaybarMouseHandle( int Bu itemtype=0; break; -// --- +/* --- */ case wsP5MouseButton: value=-2.5f; goto rollerhandled; case wsP4MouseButton: value= 2.5f; rollerhandled: @@ -201,7 +201,7 @@ rollerhandled: uiEventHandling( item->message,item->value ); } break; -// --- +/* --- */ case wsMoveMouse: item=&guiApp.playbarItems[SelectedItem]; switch ( itemtype ) Modified: trunk/gui/ui/sub.c ============================================================================== --- trunk/gui/ui/sub.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/ui/sub.c Fri Feb 24 18:16:54 2012 (r34772) @@ -73,7 +73,7 @@ void uiSubMouseHandle( int Button,int X, uiHideMenu( RX,RY,1 ); msButton=0; break; -// --- +/* --- */ case wsPLMouseButton: gtkShow( ivHidePopUpMenu,NULL ); sx=X; sy=Y; Modified: trunk/gui/ui/widgets.c ============================================================================== --- trunk/gui/ui/widgets.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/ui/widgets.c Fri Feb 24 18:16:54 2012 (r34772) @@ -69,7 +69,7 @@ static const char gui_icon_name[] = "mpl #define THRESHOLD 128 // transparency values equal to or above this will become // opaque, all values below this will become transparent -// --- init & close gtk +/* init & close gtk */ guiIcon_t guiIcon; @@ -107,7 +107,7 @@ static void gtkLoadIcon(GtkIconTheme *th } else mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_ICONERROR, gui_icon_name, size); - // start up GTK which realizes the pixmaps + /* start up GTK which realizes the pixmaps */ gtk_main_iteration_do(FALSE); } @@ -190,7 +190,7 @@ void gtkEventHandling(void) gtk_main_iteration_do(0); } -// --- funcs +/* funcs */ void gtkMessageBox(int type, const gchar *str) { Modified: trunk/gui/util/bitmap.c ============================================================================== --- trunk/gui/util/bitmap.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/util/bitmap.c Fri Feb 24 18:16:54 2012 (r34772) @@ -94,7 +94,7 @@ static int pngRead(const char *fname, gu av_init_packet(&pkt); pkt.data = data; pkt.size = len; - // HACK: make PNGs decode normally instead of as CorePNG delta frames + /* HACK: Make PNGs decode normally instead of as CorePNG delta frames. */ pkt.flags = AV_PKT_FLAG_KEY; avcodec_decode_video2(avctx, frame, &decode_ok, &pkt); Modified: trunk/gui/util/bitmap.h ============================================================================== --- trunk/gui/util/bitmap.h Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/util/bitmap.h Fri Feb 24 18:16:54 2012 (r34772) @@ -26,7 +26,7 @@ #define GUI_TRANSPARENT 0xffff00ff #define ALPHA_OPAQUE 0xff000000 -// for legacy reasons, we must treat all kind of fuchsia/magenta as transparent +/* for legacy reasons, we must treat all kind of fuchsia/magenta as transparent */ #define IS_TRANSPARENT(c) ((ALPHA_OPAQUE | (c)) == GUI_TRANSPARENT) typedef struct { Modified: trunk/gui/util/list.c ============================================================================== --- trunk/gui/util/list.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/util/list.c Fri Feb 24 18:16:54 2012 (r34772) @@ -49,7 +49,7 @@ void *listMgr(int cmd, void *data) urlItem *udat = (urlItem *)data; switch (cmd) { - // playlist + /* playlist */ case PLAYLIST_GET: @@ -154,7 +154,7 @@ void *listMgr(int cmd, void *data) plCurrent = NULL; return NULL; - // url list + /* URL list */ case URLLIST_GET: Modified: trunk/gui/win32/gui.c ============================================================================== --- trunk/gui/win32/gui.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/win32/gui.c Fri Feb 24 18:16:54 2012 (r34772) @@ -48,7 +48,7 @@ #include "dialogs.h" #include "version.h" -// HACK around bug in old mingw +/* HACK around bug in old mingw */ #undef INVALID_FILE_ATTRIBUTES #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) Modified: trunk/gui/win32/skinload.h ============================================================================== --- trunk/gui/win32/skinload.h Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/win32/skinload.h Fri Feb 24 18:16:54 2012 (r34772) @@ -112,7 +112,7 @@ struct skin_t skin_t *loadskin(char *skindir, int desktopbpp); -// --- Widget types --- +/* --- Widget types --- */ #define tyBase 1 #define tyButton 2 @@ -123,14 +123,14 @@ skin_t *loadskin(char *skindir, int desk #define tySlabel 7 #define tyDlabel 8 -// --- Window types --- +/* --- Window types --- */ #define wiMain 1 #define wiSub 2 #define wiMenu 3 #define wiPlaybar 4 -// --- User events ------ +/* --- User events --- */ #define evNone 0 #define evPlay 1 @@ -180,7 +180,7 @@ skin_t *loadskin(char *skindir, int desk #define evIconify 11 #define evExit 1000 -// --- Internal events --- +/* --- Internal events --- */ #define ivSetAudio 45 #define ivSetVideo 46 Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/wm/ws.c Fri Feb 24 18:16:54 2012 (r34772) @@ -121,7 +121,7 @@ static int wsSearch(Window win) return -1; } -// --- +/* --- */ #define PACK_RGB16(r, g, b, pixel) pixel = (b >> 3); \ pixel <<= 6; \ @@ -138,7 +138,7 @@ static int wsSearch(Window win) struct SwsContext *sws_ctx = NULL; enum PixelFormat out_pix_fmt = PIX_FMT_NONE; -// --- +/* --- */ #define MWM_HINTS_FUNCTIONS (1L << 0) #define MWM_HINTS_DECORATIONS (1L << 1) @@ -452,9 +452,9 @@ void wsCreateWindow(wsTWindow *win, int win->OldWidth = win->Width; win->OldHeight = win->Height; -// Border size for window. +/* Border size for window. */ win->BorderWidth = bW; -// Hide Mouse Cursor +/* Hide Mouse Cursor */ win->wsCursor = None; win->wsMouseEventType = cV; win->wsCursorData[0] = 0; @@ -472,7 +472,7 @@ void wsCreateWindow(wsTWindow *win, int XMatchVisualInfo(wsDisplay, wsScreen, depth, TrueColor, &win->VisualInfo); -// --- +/* --- */ win->AtomLeaderClient = XInternAtom(wsDisplay, "WM_CLIENT_LEADER", False); win->AtomDeleteWindow = XInternAtom(wsDisplay, "WM_DELETE_WINDOW", False); win->AtomTakeFocus = XInternAtom(wsDisplay, "WM_TAKE_FOCUS", False); @@ -483,7 +483,7 @@ void wsCreateWindow(wsTWindow *win, int win->AtomsProtocols[0] = win->AtomDeleteWindow; win->AtomsProtocols[1] = win->AtomTakeFocus; win->AtomsProtocols[2] = win->AtomRolle; -// --- +/* --- */ win->WindowAttrib.background_pixel = BlackPixel(wsDisplay, wsScreen); win->WindowAttrib.border_pixel = WhitePixel(wsDisplay, wsScreen); @@ -582,7 +582,7 @@ void wsCreateWindow(wsTWindow *win, int XMapWindow(wsDisplay, win->WindowID); wsCreateImage(win, win->Width, win->Height); -// --- End of creating -------------------------------------------------------------------------- +/* End of creating -------------------------------------------------------------------------- */ { int i; @@ -904,7 +904,7 @@ buttonreleased: void wsHandleEvents(void) { - // handle pending events + /* handle pending events */ while (XPending(wsDisplay)) { XNextEvent(wsDisplay, &wsEvent); // printf("### X event: %d [%d]\n",wsEvent.type,delay); @@ -922,7 +922,7 @@ void wsMainLoop(void) // XIfEvent( wsDisplay,&wsEvent,wsEvents ); while (wsTrue) { - // handle pending events + /* handle pending events */ while (XPending(wsDisplay)) { XNextEvent(wsDisplay, &wsEvent); wsEvents(wsDisplay, &wsEvent); Modified: trunk/gui/wm/ws.h ============================================================================== --- trunk/gui/wm/ws.h Thu Feb 23 14:48:58 2012 (r34771) +++ trunk/gui/wm/ws.h Fri Feb 24 18:16:54 2012 (r34772) @@ -148,7 +148,7 @@ typedef struct { int Control; int NumLock; int CapsLock; -// --- Misc ------------------------------------------------------------------------------------- +/* Misc ------------------------------------------------------------------------------------- */ Atom AtomDeleteWindow; Atom AtomTakeFocus;

1 0