Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi: remove dsize libmpcodecs wrapper

Browse Source 
Filter does nothing, and supposed funcionality
is already available with native filter(s).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/8/head
Paul B Mahol 12 years ago
parent 8bbb487e44
commit 968f8acec8
4 changed files with 0 additions and 127 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      doc/filters.texi
  2. 1
      libavfilter/Makefile
  3. 123
      libavfilter/libmpcodecs/vf_dsize.c
  4. 2
      libavfilter/vf_mp.c

1
doc/filters.texi
Unescape View File

@ -3621,7 +3621,6 @@ The list of the currently supported filters follows:
@item dint
@item divtc
@item down3dright
@item dsize
@item eq2
@item eq
@item fil

1
libavfilter/Makefile
Unescape View File

@ -182,7 +182,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_detc.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_dint.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_divtc.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_down3dright.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_dsize.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq2.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fil.o

123
libavfilter/libmpcodecs/vf_dsize.c
Unescape View File

@ -1,123 +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 "mp_msg.h"
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
struct vf_priv_s {
int w, h;
int method; // aspect method, 0 -> downscale, 1-> upscale. +2 -> original aspect.
int round;
float aspect;
};
static int config(struct vf_instance *vf,
int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt)
{
if (vf->priv->aspect < 0.001) { // did the user input aspect or w,h params
if (vf->priv->w == 0) vf->priv->w = d_width;
if (vf->priv->h == 0) vf->priv->h = d_height;
if (vf->priv->w == -1) vf->priv->w = width;
if (vf->priv->h == -1) vf->priv->h = height;
if (vf->priv->w == -2) vf->priv->w = vf->priv->h * (double)d_width / d_height;
if (vf->priv->w == -3) vf->priv->w = vf->priv->h * (double)width / height;
if (vf->priv->h == -2) vf->priv->h = vf->priv->w * (double)d_height / d_width;
if (vf->priv->h == -3) vf->priv->h = vf->priv->w * (double)height / width;
if (vf->priv->method > -1) {
double aspect = (vf->priv->method & 2) ? ((double)height / width) : ((double)d_height / d_width);
if ((vf->priv->h > vf->priv->w * aspect) ^ (vf->priv->method & 1)) {
vf->priv->h = vf->priv->w * aspect;
} else {
vf->priv->w = vf->priv->h / aspect;
}
}
if (vf->priv->round > 1) { // round up
vf->priv->w += (vf->priv->round - 1 - (vf->priv->w - 1) % vf->priv->round);
vf->priv->h += (vf->priv->round - 1 - (vf->priv->h - 1) % vf->priv->round);
}
d_width = vf->priv->w;
d_height = vf->priv->h;
} else {
if (vf->priv->aspect * height > width) {
d_width = height * vf->priv->aspect + .5;
d_height = height;
} else {
d_height = width / vf->priv->aspect + .5;
d_width = width;
}
}
return ff_vf_next_config(vf, width, height, d_width, d_height, flags, outfmt);
}
static void uninit(vf_instance_t *vf) {
free(vf->priv);
vf->priv = NULL;
}
static int vf_open(vf_instance_t *vf, char *args)
{
vf->config = config;
vf->draw_slice = ff_vf_next_draw_slice;
vf->uninit = uninit;
//vf->default_caps = 0;
vf->priv = calloc(sizeof(struct vf_priv_s), 1);
vf->priv->aspect = 0.;
vf->priv->w = -1;
vf->priv->h = -1;
vf->priv->method = -1;
vf->priv->round = 1;
if (args) {
if (strchr(args, '/')) {
int w, h;
sscanf(args, "%d/%d", &w, &h);
vf->priv->aspect = (float)w/h;
} else if (strchr(args, '.')) {
sscanf(args, "%f", &vf->priv->aspect);
} else {
sscanf(args, "%d:%d:%d:%d", &vf->priv->w, &vf->priv->h, &vf->priv->method, &vf->priv->round);
}
}
if ((vf->priv->aspect < 0.) || (vf->priv->w < -3) || (vf->priv->h < -3) ||
((vf->priv->w < -1) && (vf->priv->h < -1)) ||
(vf->priv->method < -1) || (vf->priv->method > 3) ||
(vf->priv->round < 0)) {
ff_mp_msg(MSGT_VFILTER, MSGL_ERR, "[dsize] Illegal value(s): aspect: %f w: %d h: %d aspect_method: %d round: %d\n", vf->priv->aspect, vf->priv->w, vf->priv->h, vf->priv->method, vf->priv->round);
free(vf->priv); vf->priv = NULL;
return -1;
}
return 1;
}
const vf_info_t ff_vf_info_dsize = {
"reset displaysize/aspect",
"dsize",
"Rich Felker",
"",
vf_open,
NULL
};

2
libavfilter/vf_mp.c
Unescape View File

@ -126,7 +126,6 @@ extern const vf_info_t ff_vf_info_detc;
extern const vf_info_t ff_vf_info_dint;
extern const vf_info_t ff_vf_info_divtc;
extern const vf_info_t ff_vf_info_down3dright;
extern const vf_info_t ff_vf_info_dsize;
extern const vf_info_t ff_vf_info_eq2;
extern const vf_info_t ff_vf_info_eq;
extern const vf_info_t ff_vf_info_fil;
@ -160,7 +159,6 @@ static const vf_info_t* const filters[]={
&ff_vf_info_dint,
&ff_vf_info_divtc,
&ff_vf_info_down3dright,
&ff_vf_info_dsize,
&ff_vf_info_eq2,
&ff_vf_info_eq,
&ff_vf_info_fil,

Write Preview
Loading…
Cancel
Save