mirror of
https://github.com/mpv-player/mpv
synced 2024-08-08 13:25:45 +02:00
video/filter: remove vf_down3dright
Apparently you can get this with: stereo3d=ab[2]{l,r}:sbs[2]{l,r}
So it seems the filter is redundant and can be removed.
Also see FFmpeg commit 2f11aa141a01.
This commit is contained in:
wm4
parent
66f74d031d
commit
5b7351ee3a
@ -701,14 +701,6 @@ Available filters are:
|
||||
when inserting yadif with ``--vf``, so using the above methods is
|
||||
recommended.
|
||||
|
||||
``down3dright[=lines]``
|
||||
Reposition and resize stereoscopic images. Extracts both stereo fields and
|
||||
places them side by side, resizing them to maintain the original movie
|
||||
aspect.
|
||||
|
||||
``<lines>``
|
||||
number of lines to select from the middle of the image (default: 12)
|
||||
|
||||
``delogo[=x:y:w:h:t:show]``
|
||||
Suppresses a TV station logo by a simple interpolation of the surrounding
|
||||
pixels. Just set a rectangle covering the logo and watch it disappear (and
|
||||
|
||||
@ -271,7 +271,6 @@ SOURCES = audio/audio.c \
|
||||
video/filter/vf_crop.c \
|
||||
video/filter/vf_delogo.c \
|
||||
video/filter/vf_divtc.c \
|
||||
video/filter/vf_down3dright.c \
|
||||
video/filter/vf_dsize.c \
|
||||
video/filter/vf_eq.c \
|
||||
video/filter/vf_expand.c \
|
||||
|
||||
@ -54,7 +54,6 @@ extern const vf_info_t vf_info_eq;
|
||||
extern const vf_info_t vf_info_gradfun;
|
||||
extern const vf_info_t vf_info_unsharp;
|
||||
extern const vf_info_t vf_info_swapuv;
|
||||
extern const vf_info_t vf_info_down3dright;
|
||||
extern const vf_info_t vf_info_hqdn3d;
|
||||
extern const vf_info_t vf_info_ilpack;
|
||||
extern const vf_info_t vf_info_dsize;
|
||||
@ -98,7 +97,6 @@ static const vf_info_t *const filter_list[] = {
|
||||
&vf_info_gradfun,
|
||||
&vf_info_unsharp,
|
||||
&vf_info_swapuv,
|
||||
&vf_info_down3dright,
|
||||
&vf_info_hqdn3d,
|
||||
&vf_info_ilpack,
|
||||
&vf_info_dsize,
|
||||
|
||||
@ -1,156 +0,0 @@
|
||||
/*
|
||||
* 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 <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "mpvcore/mp_msg.h"
|
||||
#include "mpvcore/cpudetect.h"
|
||||
|
||||
#include "video/img_format.h"
|
||||
#include "video/mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include "video/memcpy_pic.h"
|
||||
|
||||
struct vf_priv_s {
|
||||
int skipline;
|
||||
int scalew;
|
||||
int scaleh;
|
||||
};
|
||||
|
||||
static void toright(unsigned char *adst[3], unsigned char *asrc[3],
|
||||
int dststride[3], int srcstride[3],
|
||||
int w, int h, struct vf_priv_s* p)
|
||||
{
|
||||
int k;
|
||||
|
||||
for (k = 0; k < 3; k++) {
|
||||
unsigned char* fromL = asrc[k];
|
||||
unsigned char* fromR = asrc[k];
|
||||
unsigned char* to = adst[k];
|
||||
int src = srcstride[k];
|
||||
int dst = dststride[k];
|
||||
int ss;
|
||||
unsigned int dd;
|
||||
int i;
|
||||
|
||||
if (k > 0) {
|
||||
i = h / 4 - p->skipline / 2;
|
||||
ss = src * (h / 4 + p->skipline / 2);
|
||||
dd = w / 4;
|
||||
} else {
|
||||
i = h / 2 - p->skipline;
|
||||
ss = src * (h / 2 + p->skipline);
|
||||
dd = w / 2;
|
||||
}
|
||||
fromR += ss;
|
||||
for ( ; i > 0; i--) {
|
||||
int j;
|
||||
unsigned char* t = to;
|
||||
unsigned char* sL = fromL;
|
||||
unsigned char* sR = fromR;
|
||||
|
||||
if (p->scalew == 1) {
|
||||
for (j = dd; j > 0; j--) {
|
||||
*t++ = (sL[0] + sL[1]) / 2;
|
||||
sL+=2;
|
||||
}
|
||||
for (j = dd ; j > 0; j--) {
|
||||
*t++ = (sR[0] + sR[1]) / 2;
|
||||
sR+=2;
|
||||
}
|
||||
} else {
|
||||
for (j = dd * 2 ; j > 0; j--)
|
||||
*t++ = *sL++;
|
||||
for (j = dd * 2 ; j > 0; j--)
|
||||
*t++ = *sR++;
|
||||
}
|
||||
if (p->scaleh == 1) {
|
||||
memcpy(to + dst, to, dst);
|
||||
to += dst;
|
||||
}
|
||||
to += dst;
|
||||
fromL += src;
|
||||
fromR += src;
|
||||
}
|
||||
//printf("K %d %d %d %d %d \n", k, w, h, src, dst);
|
||||
}
|
||||
}
|
||||
|
||||
static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
|
||||
{
|
||||
mp_image_t *dmpi = vf_alloc_out_image(vf);
|
||||
mp_image_copy_attributes(dmpi, mpi);
|
||||
|
||||
toright(dmpi->planes, mpi->planes, dmpi->stride,
|
||||
mpi->stride, mpi->w, mpi->h, vf->priv);
|
||||
|
||||
talloc_free(mpi);
|
||||
return dmpi;
|
||||
}
|
||||
|
||||
static int config(struct vf_instance *vf,
|
||||
int width, int height, int d_width, int d_height,
|
||||
unsigned int flags, unsigned int outfmt)
|
||||
{
|
||||
/* FIXME - also support UYVY output? */
|
||||
return vf_next_config(vf, width * vf->priv->scalew,
|
||||
height / vf->priv->scaleh - vf->priv->skipline, d_width, d_height, flags, IMGFMT_420P);
|
||||
}
|
||||
|
||||
|
||||
static int query_format(struct vf_instance *vf, unsigned int fmt)
|
||||
{
|
||||
/* FIXME - really any YUV 4:2:0 input format should work */
|
||||
switch (fmt) {
|
||||
case IMGFMT_420P:
|
||||
return vf_next_query_format(vf, IMGFMT_420P);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void uninit(struct vf_instance *vf)
|
||||
{
|
||||
free(vf->priv);
|
||||
}
|
||||
|
||||
static int vf_open(vf_instance_t *vf, char *args)
|
||||
{
|
||||
vf->config=config;
|
||||
vf->query_format=query_format;
|
||||
vf->filter=filter;
|
||||
vf->uninit=uninit;
|
||||
|
||||
vf->priv = calloc(1, sizeof (struct vf_priv_s));
|
||||
vf->priv->skipline = 0;
|
||||
vf->priv->scalew = 1;
|
||||
vf->priv->scaleh = 2;
|
||||
if (args) sscanf(args, "%d:%d:%d", &vf->priv->skipline, &vf->priv->scalew, &vf->priv->scaleh);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
const vf_info_t vf_info_down3dright = {
|
||||
.description = "convert stereo movie from top-bottom to left-right field",
|
||||
.name = "down3dright",
|
||||
.open = vf_open,
|
||||
};
|
||||
@ -297,7 +297,6 @@ def build(ctx):
|
||||
( "video/filter/vf_delogo.c" ),
|
||||
( "video/filter/vf_divtc.c" ),
|
||||
( "video/filter/vf_dlopen.c", "dlopen" ),
|
||||
( "video/filter/vf_down3dright.c" ),
|
||||
( "video/filter/vf_dsize.c" ),
|
||||
( "video/filter/vf_eq.c" ),
|
||||
( "video/filter/vf_expand.c" ),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user