August 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

r35109 - in trunk: DOCS/man/en/mplayer.1 libvo/video_out.c libvo/vo_gl2.c
by reimar 07 Sep '12

07 Sep '12

Author: reimar Date: Mon Aug 20 21:04:45 2012 New Revision: 35109 Log: Rename -vo gl2 to gl_tiled which hopefully is less misleading, since gl2 is not (anymore) a replacement for gl. Modified: trunk/libvo/video_out.c trunk/libvo/vo_gl2.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/libvo/video_out.c ============================================================================== --- trunk/libvo/video_out.c Mon Aug 20 20:54:59 2012 (r35108) +++ trunk/libvo/video_out.c Mon Aug 20 21:04:45 2012 (r35109) @@ -98,7 +98,7 @@ extern const vo_functions_t video_out_vd extern const vo_functions_t video_out_xv; extern const vo_functions_t video_out_gl_nosw; extern const vo_functions_t video_out_gl; -extern const vo_functions_t video_out_gl2; +extern const vo_functions_t video_out_gl_tiled; extern const vo_functions_t video_out_matrixview; extern const vo_functions_t video_out_dga; extern const vo_functions_t video_out_sdl; @@ -208,7 +208,7 @@ const vo_functions_t* const video_out_dr &video_out_gl, #endif #if defined(CONFIG_GL_WIN32) || defined(CONFIG_GL_X11) - &video_out_gl2, + &video_out_gl_tiled, #endif #ifdef CONFIG_DGA &video_out_dga, @@ -316,7 +316,8 @@ const vo_functions_t* init_best_video_ou // first try the preferred drivers, with their optional subdevice param: if(vo_list && vo_list[0]) while(vo_list[0][0]){ - char* vo=strdup(vo_list[0]); + char* buffer=strdup(vo_list[0]); + char *vo = buffer; vo_subdevice=strchr(vo,':'); if(vo_subdevice){ vo_subdevice[0]=0; @@ -326,6 +327,10 @@ const vo_functions_t* init_best_video_ou mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_VO_PGM_HasBeenReplaced); if (!strcmp(vo, "md5")) mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_VO_MD5_HasBeenReplaced); + if (!strcmp(vo, "gl2")) { + mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_VO_GL2_HasBeenRenamed); + vo = "gl_tiled"; + } for(i=0;video_out_drivers[i];i++){ const vo_functions_t* video_driver=video_out_drivers[i]; const vo_info_t *info = video_driver->info; @@ -333,13 +338,13 @@ const vo_functions_t* init_best_video_ou // name matches, try it if(!video_driver->preinit(vo_subdevice)) { - free(vo); + free(buffer); return video_driver; // success! } } } // continue... - free(vo); + free(buffer); ++vo_list; if(!(vo_list[0])) return NULL; // do NOT fallback to others } Modified: trunk/libvo/vo_gl2.c ============================================================================== --- trunk/libvo/vo_gl2.c Mon Aug 20 20:54:59 2012 (r35108) +++ trunk/libvo/vo_gl2.c Mon Aug 20 21:04:45 2012 (r35109) @@ -50,12 +50,12 @@ static const vo_info_t info = { "X11 (OpenGL) - multiple textures version", - "gl2", + "gl_tiled", "Arpad Gereoffy & Sven Goethel", "" }; -const LIBVO_EXTERN(gl2) +const LIBVO_EXTERN(gl_tiled) /* local data */ static unsigned char *ImageData=NULL; @@ -199,7 +199,7 @@ static int initTextures(void) if (w >= texture_width) break; - mp_msg (MSGT_VO, MSGL_V, "[gl2] Needed texture [%dx%d] too big, trying ", + mp_msg (MSGT_VO, MSGL_V, "[gl_tiled] Needed texture [%dx%d] too big, trying ", texture_width, texture_height); if (texture_width > texture_height) @@ -210,7 +210,7 @@ static int initTextures(void) mp_msg (MSGT_VO, MSGL_V, "[%dx%d] !\n", texture_width, texture_height); if(texture_width < 64 || texture_height < 64) { - mp_msg (MSGT_VO, MSGL_FATAL, "[gl2] Give up .. usable texture size not available, or texture config error !\n"); + mp_msg (MSGT_VO, MSGL_FATAL, "[gl_tiled] Give up .. usable texture size not available, or texture config error !\n"); return -1; } } while (texture_width > 1 && texture_height > 1); @@ -229,7 +229,7 @@ static int initTextures(void) if ((image_height % texture_height) > 0) texnumy++; - mp_msg(MSGT_VO, MSGL_V, "[gl2] Creating %dx%d textures of size %dx%d ...\n", + mp_msg(MSGT_VO, MSGL_V, "[gl_tiled] Creating %dx%d textures of size %dx%d ...\n", texnumx, texnumy, texture_width,texture_height); /* Allocate the texture memory */ @@ -242,7 +242,7 @@ static int initTextures(void) raw_line_len = image_width * image_bytes; - mp_msg (MSGT_VO, MSGL_DBG2, "[gl2] texture-usage %d*width=%d, %d*height=%d\n", + mp_msg (MSGT_VO, MSGL_DBG2, "[gl_tiled] texture-usage %d*width=%d, %d*height=%d\n", (int) texnumx, (int) texture_width, (int) texnumy, (int) texture_height); @@ -335,22 +335,22 @@ static void gl_set_bilinear (int val) case 0: glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear off\n"); + mp_msg(MSGT_VO, MSGL_INFO, "[gl_tiled] bilinear off\n"); break; case 1: glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear linear\n"); + mp_msg(MSGT_VO, MSGL_INFO, "[gl_tiled] bilinear linear\n"); break; case 2: glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_NEAREST); - mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear mipmap nearest\n"); + mp_msg(MSGT_VO, MSGL_INFO, "[gl_tiled] bilinear mipmap nearest\n"); break; case 3: glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR); - mp_msg(MSGT_VO, MSGL_INFO, "[gl2] bilinear mipmap linear\n"); + mp_msg(MSGT_VO, MSGL_INFO, "[gl_tiled] bilinear mipmap linear\n"); break; } } @@ -366,13 +366,13 @@ static void gl_set_antialias (int val) glEnable (GL_POLYGON_SMOOTH); glEnable (GL_LINE_SMOOTH); glEnable (GL_POINT_SMOOTH); - mp_msg(MSGT_VO, MSGL_INFO, "[gl2] antialiasing on\n"); + mp_msg(MSGT_VO, MSGL_INFO, "[gl_tiled] antialiasing on\n"); } else { glShadeModel (GL_FLAT); glDisable (GL_POLYGON_SMOOTH); glDisable (GL_LINE_SMOOTH); glDisable (GL_POINT_SMOOTH); - mp_msg(MSGT_VO, MSGL_INFO, "[gl2] antialiasing off\n"); + mp_msg(MSGT_VO, MSGL_INFO, "[gl_tiled] antialiasing off\n"); } } @@ -430,7 +430,7 @@ static void resize(int x,int y){ 0, 0, 0, 0, -1, 1, 0, 1, }; - mp_msg(MSGT_VO,MSGL_V,"[gl2] Resize: %dx%d\n",x,y); + mp_msg(MSGT_VO,MSGL_V,"[gl_tiled] Resize: %dx%d\n",x,y); if(aspect_scaling()) { glClear(GL_COLOR_BUFFER_BIT); aspect(&x, &y, A_WINZOOM); @@ -547,12 +547,12 @@ static int config_glx(uint32_t width, ui XVisualInfo *vinfo, vinfo_buf; vinfo = choose_glx_visual(mDisplay,mScreen,&vinfo_buf) < 0 ? NULL : &vinfo_buf; if (vinfo == NULL) { - mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] no GLX support present\n"); + mp_msg(MSGT_VO, MSGL_FATAL, "[gl_tiled] no GLX support present\n"); return -1; } vo_x11_create_vo_window(vinfo, vo_dx, vo_dy, d_width, d_height, - flags, vo_x11_create_colormap(vinfo), "gl2", title); + flags, vo_x11_create_colormap(vinfo), "gl_tiled", title); return 0; } @@ -601,7 +601,7 @@ static int initGl(uint32_t d_width, uint gl_set_antialias(0); gl_set_bilinear(1); - mp_msg(MSGT_VO, MSGL_V, "[gl2] Using image_bpp=%d, image_bytes=%d, \n\tgl_bitmap_format=%s, gl_bitmap_type=%s, \n\trgb_size=%d (%d,%d,%d), a_sz=%d, \n\tgl_internal_format=%s\n", + mp_msg(MSGT_VO, MSGL_V, "[gl_tiled] Using image_bpp=%d, image_bytes=%d, \n\tgl_bitmap_format=%s, gl_bitmap_type=%s, \n\trgb_size=%d (%d,%d,%d), a_sz=%d, \n\tgl_internal_format=%s\n", image_bpp, image_bytes, glValName(gl_bitmap_format), glValName(gl_bitmap_type), rgb_sz, r_sz, g_sz, b_sz, a_sz, glValName(gl_internal_format)); @@ -646,7 +646,7 @@ config(uint32_t width, uint32_t height, glVersion = glGetString(GL_VERSION); - mp_msg(MSGT_VO, MSGL_V, "[gl2] OpenGL Driver Information:\n"); + mp_msg(MSGT_VO, MSGL_V, "[gl_tiled] OpenGL Driver Information:\n"); mp_msg(MSGT_VO, MSGL_V, "\tvendor: %s,\n\trenderer %s,\n\tversion %s\n", glGetString(GL_VENDOR), glGetString(GL_RENDERER), glVersion); @@ -656,9 +656,9 @@ config(uint32_t width, uint32_t height, isGL12 = GL_FALSE; if(isGL12) { - mp_msg(MSGT_VO, MSGL_INFO, "[gl2] You have OpenGL >= 1.2 capable drivers, GOOD (16bpp and BGR is ok!)\n"); + mp_msg(MSGT_VO, MSGL_INFO, "[gl_tiled] You have OpenGL >= 1.2 capable drivers, GOOD (16bpp and BGR is ok!)\n"); } else { - mp_msg(MSGT_VO, MSGL_INFO, "[gl2] You have OpenGL < 1.2 drivers, BAD (16bpp and BGR may be damaged!)\n"); + mp_msg(MSGT_VO, MSGL_INFO, "[gl_tiled] You have OpenGL < 1.2 drivers, BAD (16bpp and BGR may be damaged!)\n"); } glFindFormat(format, &image_bpp, &gl_internal_format, &gl_bitmap_format, &gl_bitmap_type); @@ -804,7 +804,7 @@ static int draw_frame(uint8_t *src[]) { if (is_yuv) { - mp_msg(MSGT_VO, MSGL_ERR, "[gl2] error: draw_frame called for YV12!\n"); + mp_msg(MSGT_VO, MSGL_ERR, "[gl_tiled] error: draw_frame called for YV12!\n"); return 0; } ImageData=(unsigned char *)src[0]; @@ -863,8 +863,8 @@ static int preinit(const char *arg) use_glFinish = 1; if (subopt_parse(arg, subopts) != 0) { mp_msg(MSGT_VO, MSGL_FATAL, - "\n-vo gl2 command line help:\n" - "Example: mplayer -vo gl2:noglfinish\n" + "\n-vo gl_tiled command line help:\n" + "Example: mplayer -vo gl_tiled:noglfinish\n" "\nOptions:\n" " noglfinish\n" " Do not call glFinish() before swapping buffers\n"

3 2

r35113 - trunk/libvo/vo_corevideo.m
by reimar 07 Sep '12

07 Sep '12

Author: reimar Date: Wed Aug 22 20:29:37 2012 New Revision: 35113 Log: corevideo: Support also support UYVY. Patch by Xidorn Quan [quanxunzhen gmail com] Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Wed Aug 22 20:24:56 2012 (r35112) +++ trunk/libvo/vo_corevideo.m Wed Aug 22 20:29:37 2012 (r35113) @@ -113,6 +113,9 @@ static void draw_alpha(int x0, int y0, i case IMGFMT_YUY2: vo_draw_alpha_yuy2(w,h,src,srca,stride,dst,image_stride); break; + case IMGFMT_UYVY: + vo_draw_alpha_uyvy(w,h,src,srca,stride,dst,image_stride); + break; } } @@ -179,6 +182,7 @@ static int config(uint32_t width, uint32 image_bytes = 4; break; case IMGFMT_YUY2: + case IMGFMT_UYVY: image_bytes = 2; break; } @@ -314,6 +318,10 @@ static int query_format(uint32_t format) pixelFormat = kYUVSPixelFormat; return supportflags; + case IMGFMT_UYVY: + pixelFormat = k2vuyPixelFormat; + return supportflags; + case IMGFMT_RGB24: pixelFormat = k24RGBPixelFormat; return supportflags;

2 1

r35135 - trunk/libmpcodecs/vf.c
by reimar 31 Aug '12

31 Aug '12

Author: reimar Date: Fri Aug 31 22:09:30 2012 New Revision: 35135 Log: Fix usage count for passthrough-only filters. Modified: trunk/libmpcodecs/vf.c Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c Fri Aug 31 22:08:44 2012 (r35134) +++ trunk/libmpcodecs/vf.c Fri Aug 31 22:09:30 2012 (r35135) @@ -296,7 +296,9 @@ mp_image_t* vf_get_image(vf_instance_t* if(vf->put_image==vf_next_put_image){ // passthru mode, if the filter uses the fallback/default put_image() code - return vf_get_image(vf->next,outfmt,mp_imgtype,mp_imgflag,w,h); + mpi = vf_get_image(vf->next,outfmt,mp_imgtype,mp_imgflag,w,h); + mpi->usage_count++; + return mpi; } // Note: we should call libvo first to check if it supports direct rendering

1 0

r35134 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 31 Aug '12

31 Aug '12

Author: reimar Date: Fri Aug 31 22:08:44 2012 New Revision: 35134 Log: Detect broken mpi usage count also in decoder. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Fri Aug 31 21:52:31 2012 (r35133) +++ trunk/libmpcodecs/vd_ffmpeg.c Fri Aug 31 22:08:44 2012 (r35134) @@ -707,6 +707,10 @@ static void release_buffer(struct AVCode if (mpi) { // release mpi (in case MPI_IMGTYPE_NUMBERED is used, e.g. for VDPAU) mpi->usage_count--; + if (mpi->usage_count < 0) { + mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Bad mp_image usage count, please report!\n"); + mpi->usage_count = 0; + } } for(i=0; i<4; i++){

1 0

r35133 - trunk/libmpcodecs/vf_ass.c
by reimar 31 Aug '12

31 Aug '12

Author: reimar Date: Fri Aug 31 21:52:31 2012 New Revision: 35133 Log: vf_ass: add support for rendering on YUY2 and UYVY images. Patch by Xidorn Quan [quanxunzhen gmail com]. Modified: trunk/libmpcodecs/vf_ass.c Modified: trunk/libmpcodecs/vf_ass.c ============================================================================== --- trunk/libmpcodecs/vf_ass.c Fri Aug 31 16:28:32 2012 (r35132) +++ trunk/libmpcodecs/vf_ass.c Fri Aug 31 21:52:31 2012 (r35133) @@ -36,6 +36,7 @@ #include "vf.h" #include "libvo/fastmemcpy.h" +#include "libavutil/intreadwrite.h" #include "sub/sub.h" #include "m_option.h" #include "m_struct.h" @@ -51,10 +52,14 @@ #define rgba2u(c) ( ((-152*_r(c) - 298*_g(c) + 450*_b(c)) >> 10) + 128 ) #define rgba2v(c) ( (( 450*_r(c) - 376*_g(c) - 73*_b(c)) >> 10) + 128 ) +typedef void (*copy_from_image_func)(struct vf_instance *vf, + int first_row, int last_row); +typedef void (*copy_to_image_func)(struct vf_instance *vf); static const struct vf_priv_s { int outh, outw; + int is_planar; unsigned int outfmt; // 1 = auto-added filter: insert only if chain does not support EOSD already @@ -63,8 +68,15 @@ static const struct vf_priv_s { unsigned char *planes[3]; unsigned char *dirty_rows; + + copy_from_image_func copy_from_image; + copy_to_image_func copy_to_image; } vf_priv_dflt; +static void copy_from_image_yuv420p(struct vf_instance *, int, int); +static void copy_to_image_yuv420p(struct vf_instance *); +static void copy_from_image_yuv422(struct vf_instance *, int, int); +static void copy_to_image_yuv422(struct vf_instance *); static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, @@ -72,8 +84,23 @@ static int config(struct vf_instance *vf { struct mp_eosd_settings res = {0}; - if (outfmt == IMGFMT_IF09) + switch (outfmt) { + case IMGFMT_YV12: + case IMGFMT_I420: + case IMGFMT_IYUV: + vf->priv->is_planar = 1; + vf->priv->copy_from_image = copy_from_image_yuv420p; + vf->priv->copy_to_image = copy_to_image_yuv420p; + break; + case IMGFMT_UYVY: + case IMGFMT_YUY2: + vf->priv->is_planar = 0; + vf->priv->copy_from_image = copy_from_image_yuv422; + vf->priv->copy_to_image = copy_to_image_yuv422; + break; + default: return 0; + } vf->priv->outfmt = outfmt; vf->priv->outh = height + ass_top_margin + ass_bottom_margin; @@ -84,6 +111,8 @@ static int config(struct vf_instance *vf d_height = d_height * vf->priv->outh / height; } + if (!vf->priv->is_planar) + vf->priv->planes[0] = malloc(vf->priv->outw * vf->priv->outh); vf->priv->planes[1] = malloc(vf->priv->outw * vf->priv->outh); vf->priv->planes[2] = malloc(vf->priv->outw * vf->priv->outh); vf->priv->dirty_rows = malloc(vf->priv->outh); @@ -144,6 +173,7 @@ static void blank(mp_image_t *mpi, int y unsigned char *dst; int chroma_rows = (y2 - y1) >> mpi->chroma_y_shift; + if (mpi->flags & MP_IMGFLAG_PLANAR) { dst = mpi->planes[0] + y1 * mpi->stride[0]; for (y = 0; y < y2 - y1; ++y) { memset(dst, color[0], mpi->w); @@ -159,6 +189,27 @@ static void blank(mp_image_t *mpi, int y memset(dst, color[2], mpi->chroma_width); dst += mpi->stride[2]; } + } else { + unsigned char packed_color[4]; + int x; + if (mpi->imgfmt == IMGFMT_UYVY) { + packed_color[0] = color[1]; + packed_color[1] = color[0]; + packed_color[2] = color[2]; + packed_color[3] = color[0]; + } else { + packed_color[0] = color[0]; + packed_color[1] = color[1]; + packed_color[2] = color[0]; + packed_color[3] = color[2]; + } + dst = mpi->planes[0] + y1 * mpi->stride[0]; + for (y = y1; y < y2; ++y) { + for (x = 0; x < mpi->w / 2; ++x) + AV_COPY32(dst + 4 * x, packed_color); + dst += mpi->stride[0]; + } + } } static int prepare_image(struct vf_instance *vf, mp_image_t *mpi) @@ -224,7 +275,7 @@ static int prepare_image(struct vf_insta /** * \brief Copy specified rows from render_context.dmpi to render_context.planes, upsampling to 4:4:4 */ -static void copy_from_image(struct vf_instance *vf, int first_row, +static void copy_from_image_yuv420p(struct vf_instance *vf, int first_row, int last_row) { int pl; @@ -270,7 +321,7 @@ static void copy_from_image(struct vf_in /** * \brief Copy all previously copied rows back to render_context.dmpi */ -static void copy_to_image(struct vf_instance *vf) +static void copy_to_image_yuv420p(struct vf_instance *vf) { int pl; int i, j, k; @@ -300,6 +351,86 @@ static void copy_to_image(struct vf_inst } } +static void copy_from_image_yuv422(struct vf_instance *vf, + int first_row, int last_row) +{ + unsigned char *dirty_rows = vf->priv->dirty_rows; + int src_stride = vf->dmpi->stride[0]; + int dst_stride = vf->priv->outw; + unsigned char *src = vf->dmpi->planes[0] + first_row * src_stride; + unsigned char **dst = vf->priv->planes; + int dst_off = first_row * dst_stride; + int is_uyvy = vf->priv->outfmt == IMGFMT_UYVY; + int i, j, k; + + for (i = first_row; i < last_row; ++i) { + int next_off = dst_off + dst_stride; + if (!dirty_rows[i]) { + if (is_uyvy) { + for (j = dst_off, k = 0; j < next_off; j += 2, k += 4) { + dst[0][j ] = src[k + 1]; + dst[0][j + 1] = src[k + 3]; + dst[1][j ] = src[k ]; + dst[1][j + 1] = src[k ]; + dst[2][j ] = src[k + 2]; + dst[2][j + 1] = src[k + 2]; + } + } else { + for (j = dst_off, k = 0; j < next_off; j += 2, k += 4) { + dst[0][j ] = src[k ]; + dst[0][j + 1] = src[k + 2]; + dst[1][j ] = src[k + 1]; + dst[1][j + 1] = src[k + 1]; + dst[2][j ] = src[k + 3]; + dst[2][j + 1] = src[k + 3]; + } + } + } + src += src_stride; + dst_off = next_off; + } + for (i = first_row; i < last_row; ++i) + dirty_rows[i] = 1; +} + +static void copy_to_image_yuv422(struct vf_instance *vf) +{ + unsigned char *dirty_rows = vf->priv->dirty_rows; + int src_stride = vf->priv->outw; + int dst_stride = vf->dmpi->stride[0]; + int height = vf->priv->outh; + unsigned char **src = vf->priv->planes; + unsigned char *dst = vf->dmpi->planes[0]; + int src_off = 0; + int is_uyvy = vf->priv->outfmt == IMGFMT_UYVY; + int i, j, k; + + for (i = 0; i < height; ++i) { + int next_off = src_off + src_stride; + if (*dirty_rows++) { +#define AVERAGE(a, b) (((unsigned)(a) + (unsigned)(b)) >> 1) + if (is_uyvy) { + for (j = src_off, k = 0; j < next_off; j += 2, k += 4) { + dst[k ] = AVERAGE(src[1][j], src[1][j + 1]); + dst[k + 1] = src[0][j]; + dst[k + 2] = AVERAGE(src[2][j], src[2][j + 1]); + dst[k + 3] = src[0][j + 1]; + } + } else { + for (j = src_off, k = 0; j < next_off; j += 2, k += 4) { + dst[k ] = src[0][j]; + dst[k + 1] = AVERAGE(src[1][j], src[1][j + 1]); + dst[k + 2] = src[0][j + 1]; + dst[k + 3] = AVERAGE(src[2][j], src[2][j + 1]); + } + } +#undef AVERAGE + } + src_off = next_off; + dst += dst_stride; + } +} + static void my_draw_bitmap(struct vf_instance *vf, unsigned char *bitmap, int bitmap_w, int bitmap_h, int stride, int dst_x, int dst_y, unsigned color) @@ -311,11 +442,13 @@ static void my_draw_bitmap(struct vf_ins unsigned char *src, *dsty, *dstu, *dstv; int i, j; mp_image_t *dmpi = vf->dmpi; + int stride_y = vf->priv->is_planar ? dmpi->stride[0] : vf->priv->outw; opacity = (0x10203 * opacity + 0x80) >> 8; /* 0x10203 = (1<<32)/(255*255) */ /* 0 <= opacity <= 0x10101 */ src = bitmap; - dsty = dmpi->planes[0] + dst_x + dst_y * dmpi->stride[0]; + dsty = vf->priv->is_planar ? dmpi->planes[0] : vf->priv->planes[0]; + dsty += dst_x + dst_y * stride_y; dstu = vf->priv->planes[1] + dst_x + dst_y * vf->priv->outw; dstv = vf->priv->planes[2] + dst_x + dst_y * vf->priv->outw; for (i = 0; i < bitmap_h; ++i) { @@ -329,7 +462,7 @@ static void my_draw_bitmap(struct vf_ins dstv[j] = (k * v + (0xFFFFFF - k) * dstv[j] + 0x800000) >> 24; } src += stride; - dsty += dmpi->stride[0]; + dsty += stride_y; dstu += vf->priv->outw; dstv += vf->priv->outw; } @@ -339,6 +472,9 @@ static void render_frame(struct vf_insta struct mp_eosd_image_list *images) { struct mp_eosd_image *img; + copy_from_image_func copy_from_image = vf->priv->copy_from_image; + copy_to_image_func copy_to_image = vf->priv->copy_to_image; + img = eosd_image_first(images); if (!img) return; @@ -367,6 +503,8 @@ static int query_format(struct vf_instan case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: + case IMGFMT_UYVY: + case IMGFMT_YUY2: return vf_next_query_format(vf, fmt) | VFCAP_EOSD; } return 0; @@ -385,6 +523,8 @@ static int control(vf_instance_t *vf, in static void uninit(struct vf_instance *vf) { + if (!vf->priv->is_planar) + free(vf->priv->planes[0]); free(vf->priv->planes[1]); free(vf->priv->planes[2]); free(vf->priv->dirty_rows); @@ -394,6 +534,8 @@ static const unsigned int fmt_list[] = { IMGFMT_YV12, IMGFMT_I420, IMGFMT_IYUV, + IMGFMT_UYVY, + IMGFMT_YUY2, 0 };

1 0

r35132 - trunk/etc/codecs.conf
by cehoyos 31 Aug '12

31 Aug '12

Author: cehoyos Date: Fri Aug 31 16:28:32 2012 New Revision: 35132 Log: Support Alberto's / Kostya's MSS2 decoder. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri Aug 31 15:47:36 2012 (r35131) +++ trunk/etc/codecs.conf Fri Aug 31 16:28:32 2012 (r35132) @@ -1240,6 +1240,14 @@ videocodec ffmss1 dll mss1 out BGR8 +videocodec ffmss2 + info "FFmpeg MS Screen 2" + status working + fourcc MSS2 + driver ffmpeg + dll mss2 + out BGR15,RGB24 + videocodec ffmsascreen info "FFmpeg MS ATC Screen 1" status working

1 0

r35131 - trunk/configure
by cehoyos 31 Aug '12

31 Aug '12

Author: cehoyos Date: Fri Aug 31 15:47:36 2012 New Revision: 35131 Log: Fix compilation with latest FFmpeg. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Aug 30 14:25:02 2012 (r35130) +++ trunk/configure Fri Aug 31 15:47:36 2012 (r35131) @@ -8401,12 +8401,13 @@ list=$(echo $1 | tr '[a-z]' '[A-Z]') item=$(echo $2 | tr '[a-z]' '[A-Z]') _nprefix=$4; _defineprefix=$3; +_postfix=$5; test -z "$_nprefix" && _nprefix='CONFIG' for part in $list; do if $(echo $item | grep -q -E "(^| )$part($| )"); then - echo "${_defineprefix}define ${_nprefix}_$part 1" + echo "${_defineprefix}define ${_nprefix}_${part}${_postfix} 1" else - echo "${_defineprefix}define ${_nprefix}_$part 0" + echo "${_defineprefix}define ${_nprefix}_${part}${_postfix} 0" fi done } @@ -8552,6 +8553,7 @@ $def_words_endian $(ff_config_enable "$arch_all" "$arch" "#" "ARCH") $(ff_config_enable "$subarch_all" "$subarch" "#" "ARCH") $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE") +$(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE" "_INLINE") /* Blu-ray/DVD/VCD/CD */ @@ -8955,7 +8957,7 @@ if x86; then echo "%define CONFIG_GPL 1" >> "$TMPS" echo "$(ff_config_enable "$arch_all" "$arch" "%" "ARCH")" >> "$TMPS" echo "$(ff_config_enable "$subarch_all" "$subarch" "%" "ARCH")" >> "$TMPS" -echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS" +echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE" "_EXTERNAL")" >> "$TMPS" echo "$(ff_config_enable "$yasm_features_all" "$yasm_features" "%" "HAVE")" >> "$TMPS" cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm

1 0

r35127 - trunk/libmpcodecs/vf_ass.c
by reimar 29 Aug '12

29 Aug '12

Author: reimar Date: Wed Aug 29 18:06:26 2012 New Revision: 35127 Log: vf_ass: Improve format query. The output format should always match the input format for this filter, and we should set the EOSD capability. This also simplifies adding support for more formats. Patch by Xidorn Quan [quanxunzhen gmail com]. Modified: trunk/libmpcodecs/vf_ass.c Modified: trunk/libmpcodecs/vf_ass.c ============================================================================== --- trunk/libmpcodecs/vf_ass.c Tue Aug 28 22:47:34 2012 (r35126) +++ trunk/libmpcodecs/vf_ass.c Wed Aug 29 18:06:26 2012 (r35127) @@ -75,6 +75,7 @@ static int config(struct vf_instance *vf if (outfmt == IMGFMT_IF09) return 0; + vf->priv->outfmt = outfmt; vf->priv->outh = height + ass_top_margin + ass_bottom_margin; vf->priv->outw = width; @@ -366,7 +367,7 @@ static int query_format(struct vf_instan case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: - return vf_next_query_format(vf, vf->priv->outfmt); + return vf_next_query_format(vf, fmt) | VFCAP_EOSD; } return 0; } @@ -399,10 +400,10 @@ static const unsigned int fmt_list[] = { static int vf_open(vf_instance_t *vf, char *args) { int flags; - vf->priv->outfmt = vf_match_csp(&vf->next, fmt_list, IMGFMT_YV12); - if (vf->priv->outfmt) - flags = vf_next_query_format(vf, vf->priv->outfmt); - if (!vf->priv->outfmt || (vf->priv->auto_insert && flags & VFCAP_EOSD)) { + unsigned outfmt = vf_match_csp(&vf->next, fmt_list, IMGFMT_YV12); + if (outfmt) + flags = vf_next_query_format(vf, outfmt); + if (!outfmt || (vf->priv->auto_insert && flags & VFCAP_EOSD)) { uninit(vf); return 0; }

1 0

r35126 - in trunk: configure etc/codecs.conf
by cehoyos 28 Aug '12

28 Aug '12

Author: cehoyos Date: Tue Aug 28 22:47:34 2012 New Revision: 35126 Log: Add Video Decode Acceleration support. Patch by Xidorn Quan, quanxunzhen gmail Modified: trunk/configure trunk/etc/codecs.conf Modified: trunk/configure ============================================================================== --- trunk/configure Mon Aug 27 22:46:06 2012 (r35125) +++ trunk/configure Tue Aug 28 22:47:34 2012 (r35126) @@ -503,6 +503,7 @@ Video output: --enable-xmga enable mga_vid X11 video output [autodetect] --enable-xv enable Xv video output [autodetect] --enable-xvmc enable XvMC acceleration [disable] + --enable-vda enable VDA acceleration [autodetect] --enable-vdpau enable VDPAU acceleration [autodetect] --enable-vm enable XF86VidMode support [autodetect] --enable-xinerama enable Xinerama support [autodetect] @@ -696,6 +697,7 @@ _dga1=auto _dga2=auto _xv=auto _xvmc=no #auto when complete +_vda=auto _vdpau=auto _sdl=auto _kva=auto @@ -1039,6 +1041,8 @@ for ac_option do --disable-xv) _xv=no ;; --enable-xvmc) _xvmc=yes ;; --disable-xvmc) _xvmc=no ;; + --enable-vda) _vda=yes ;; + --disable-vda) _vda=no ;; --enable-vdpau) _vdpau=yes ;; --disable-vdpau) _vdpau=no ;; --enable-sdl) _sdl=yes ;; @@ -4437,6 +4441,22 @@ fi echores "$_xvmc" +echocheck "Video Decode Acceleration (VDA)" +if test "$_vda" = auto ; then + _vda=no + header_check VideoDecodeAcceleration/VDADecoder.h && _vda=yes +fi +if test "$_vda" = yes ; then + def_vda='#define CONFIG_VDA 1' + extra_ldflags="$extra_ldflags -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore" + libavhwaccels="H264_VDA_HWACCEL" +else + def_vda='#define CONFIG_VDA 0' + libavdecoders=$(echo $libavdecoders | sed -e 's/[A-Z0-9]*_VDA_DECODER//g') +fi +echores "$_vda" + + echocheck "VDPAU" if test "$_vdpau" = auto && test "$_x11" = yes ; then _vdpau=no @@ -8234,6 +8254,7 @@ TWOLAME=$_twolame UNRAR_EXEC = $_unrar_exec V4L2 = $_v4l2 VCD = $_vcd +VDA = $_vda VDPAU = $_vdpau VESA = $_vesa VIDIX = $_vidix @@ -8350,6 +8371,7 @@ CONFIG_MUXERS = yes CONFIG_NETWORK = $networking CONFIG_RTPDEC = $networking CONFIG_VF_LAVFI = $_vf_lavfi +CONFIG_VDA = $_vda CONFIG_VDPAU = $_vdpau CONFIG_XVMC = $_xvmc CONFIG_ZLIB = $_zlib Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Mon Aug 27 22:46:06 2012 (r35125) +++ trunk/etc/codecs.conf Tue Aug 28 22:47:34 2012 (r35126) @@ -1306,6 +1306,25 @@ videocodec ffh264crystalhd dll h264_crystalhd out YUY2 +videocodec ffh264vda + info "FFmpeg H.264 (VDA)" + status working + fourcc H264,h264 + fourcc X264,x264 + fourcc avc1,AVC1 + fourcc davc,DAVC + fourcc vvvc ; only one sample using this fourcc + fourcc ai1p,ai1q,ai12,ai13 + fourcc ai15,ai16 + fourcc ai5p,ai5q,ai52,ai53 + fourcc ai55,ai56 + fourcc x3eV + fourcc Q264 + format 0x10000005 + driver ffmpeg + dll h264_vda + out YUY2,UYVY,YV12,NV12 + ;http://corecodec.org/ videocodec coreavcwindows info "CoreAVC H.264 for x86"

1 0