summaryrefslogtreecommitdiffstats
path: root/video/filter/vf_dlopen.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-03 22:59:12 +0100
committerwm4 <wm4@nowhere>2014-12-03 23:01:20 +0100
commit185e95ee3d4436e03255759495d783a944e6dfbb (patch)
tree0372a4e7905eba258d0f7d257d963deea7904757 /video/filter/vf_dlopen.c
parent809936fdb93a5375699a7ba4be1e08acdf5e5645 (diff)
downloadmpv-185e95ee3d4436e03255759495d783a944e6dfbb.tar.bz2
mpv-185e95ee3d4436e03255759495d783a944e6dfbb.tar.xz
video: remove internal QP passing
This was required by vf_pp, which was just removed. vf_dlopen has this stuff in its API. This API is considered stable, so the related fields are not removed from it. But the fields are always 0 now, so there's no point in keeping the example program around. vf_pullup.c did some extremely awkward passthrough of this information, but didn't actually use it.
Diffstat (limited to 'video/filter/vf_dlopen.c')
-rw-r--r--video/filter/vf_dlopen.c48
1 files changed, 3 insertions, 45 deletions
diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c
index 118a4911f2..7e546df32f 100644
--- a/video/filter/vf_dlopen.c
+++ b/video/filter/vf_dlopen.c
@@ -62,10 +62,6 @@ struct vf_priv_s {
unsigned int outbufferlen;
mp_image_t *outbuffermpi;
- // qscale buffer
- unsigned char *qbuffer;
- size_t qbuffersize;
-
unsigned int outfmt;
int argc;
@@ -182,55 +178,17 @@ static void uninit(struct vf_instance *vf)
DLLClose(vf->priv->dll);
vf->priv->dll = NULL;
}
- if (vf->priv->qbuffer) {
- free(vf->priv->qbuffer);
- vf->priv->qbuffer = NULL;
- }
-}
-
-static int norm_qscale(int qscale, int type)
-{
- switch (type) {
- case 0: // MPEG-1
- return qscale;
- case 1: // MPEG-2
- return qscale >> 1;
- case 2: // H264
- return qscale >> 2;
- case 3: // VP56
- return (63 - qscale + 2) >> 2;
- }
- return qscale;
}
static int filter(struct vf_instance *vf, struct mp_image *mpi)
{
- int i, k;
-
if (!mpi)
return 0;
set_imgprop(&vf->priv->filter.inpic, mpi);
- if (mpi->qscale) {
- if (mpi->qscale_type != 0) {
- k = mpi->qstride * ((mpi->h + 15) >> 4);
- if (vf->priv->qbuffersize != k) {
- vf->priv->qbuffer = realloc(vf->priv->qbuffer, k);
- vf->priv->qbuffersize = k;
- }
- for (i = 0; i < k; ++i)
- vf->priv->qbuffer[i] = norm_qscale(mpi->qscale[i],
- mpi->qscale_type);
- vf->priv->filter.inpic_qscale = vf->priv->qbuffer;
- } else
- vf->priv->filter.inpic_qscale = mpi->qscale;
- vf->priv->filter.inpic_qscalestride = mpi->qstride;
- vf->priv->filter.inpic_qscaleshift = 4;
- } else {
- vf->priv->filter.inpic_qscale = NULL;
- vf->priv->filter.inpic_qscalestride = 0;
- vf->priv->filter.inpic_qscaleshift = 0;
- }
+ vf->priv->filter.inpic_qscale = NULL;
+ vf->priv->filter.inpic_qscalestride = 0;
+ vf->priv->filter.inpic_qscaleshift = 0;
vf->priv->filter.inpic.pts = mpi->pts;
struct mp_image *out[FILTER_MAX_OUTCNT] = {0};