summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-05-25 19:01:32 +0200
committerwm4 <wm4@nowhere>2016-05-25 23:51:24 +0200
commit15a5d33b7930b53cbc4503053211aee91d6e9659 (patch)
tree3cf1d57566506af85c6220817ed72101efb2ebf6
parentb9cc33de58c3e58a93c5e5316e5734922f5a44b9 (diff)
downloadmpv-15a5d33b7930b53cbc4503053211aee91d6e9659.tar.bz2
mpv-15a5d33b7930b53cbc4503053211aee91d6e9659.tar.xz
vf_vavpp: move frame handling to separate file
Move the handling of the future/past frames and the associated dataflow rules to a separate source file. While this on its own seems rather questionable and just inflates the code, I intend to reuse it for other filters. The logic is annoying enough that it shouldn't be duplicated a bunch of times. (I considered other ways of sharing this logic, such as an uber- deinterlace filter, which would access the hardware deinterlacer via a different API. Although that sounds like kind of the right approach, this would have other problems, so let's not, at least for now.)
-rw-r--r--video/filter/refqueue.c153
-rw-r--r--video/filter/refqueue.h22
-rw-r--r--video/filter/vf_vavpp.c87
-rw-r--r--wscript_build.py1
4 files changed, 206 insertions, 57 deletions
diff --git a/video/filter/refqueue.c b/video/filter/refqueue.c
new file mode 100644
index 0000000000..1103be9afa
--- /dev/null
+++ b/video/filter/refqueue.c
@@ -0,0 +1,153 @@
+/*
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * mpv 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <assert.h>
+
+#include "common/common.h"
+#include "video/mp_image.h"
+
+#include "refqueue.h"
+
+struct mp_refqueue {
+ int needed_past_frames;
+ int needed_future_frames;
+
+ bool eof;
+ double past_pts;
+
+ // Queue of input frames, used to determine past/current/future frames.
+ // queue[0] is the newest frame, queue[num_queue - 1] the oldest.
+ struct mp_image **queue;
+ int num_queue;
+ // queue[pos] is the current frame, unless pos is an invalid index.
+ int pos;
+};
+
+struct mp_refqueue *mp_refqueue_alloc(void)
+{
+ struct mp_refqueue *q = talloc_zero(NULL, struct mp_refqueue);
+ mp_refqueue_flush(q);
+ return q;
+}
+
+void mp_refqueue_free(struct mp_refqueue *q)
+{
+ talloc_free(q);
+}
+
+// The minimum number of frames required before and after the current frame.
+void mp_refqueue_set_refs(struct mp_refqueue *q, int past, int future)
+{
+ assert(past >= 0 && future >= 0);
+ q->needed_past_frames = past;
+ q->needed_future_frames = future;
+}
+
+// Discard all state.
+void mp_refqueue_flush(struct mp_refqueue *q)
+{
+ for (int n = 0; n < q->num_queue; n++)
+ talloc_free(q->queue[n]);
+ q->num_queue = 0;
+ q->pos = -1;
+ q->eof = false;
+ q->past_pts = MP_NOPTS_VALUE;
+}
+
+// Add a new frame to the queue. (Call mp_refqueue_next() to advance the
+// current frame and to discard unneeded past frames.)
+// Ownership goes to the mp_refqueue.
+// Passing NULL means EOF, in which case mp_refqueue_need_input() will return
+// false even if not enough future frames are available.
+void mp_refqueue_add_input(struct mp_refqueue *q, struct mp_image *img)
+{
+ q->eof = !img;
+ if (!img)
+ return;
+
+ MP_TARRAY_INSERT_AT(q, q->queue, q->num_queue, 0, img);
+ q->pos++;
+
+ assert(q->pos >= 0 && q->pos < q->num_queue);
+}
+
+bool mp_refqueue_need_input(struct mp_refqueue *q)
+{
+ return q->pos < q->needed_future_frames && !q->eof;
+}
+
+bool mp_refqueue_has_output(struct mp_refqueue *q)
+{
+ return q->pos >= 0 && !mp_refqueue_need_input(q);
+}
+
+// Advance current frame by 1 (or 2 fields if interlaced).
+void mp_refqueue_next(struct mp_refqueue *q)
+{
+ if (!mp_refqueue_has_output(q))
+ return;
+
+ q->past_pts = q->queue[q->pos]->pts;
+
+ q->pos--;
+
+ assert(q->pos >= -1 && q->pos < q->num_queue);
+
+ // Discard unneeded past frames.
+ while (q->num_queue - (q->pos + 1) > q->needed_past_frames) {
+ assert(q->num_queue > 0);
+ talloc_free(q->queue[q->num_queue - 1]);
+ q->num_queue--;
+ }
+
+ assert(q->pos >= -1 && q->pos < q->num_queue);
+}
+
+// Return a frame by relative position:
+// -1: first past frame
+// 0: current frame
+// 1: first future frame
+// Caller doesn't get ownership. Return NULL if unavailable.
+struct mp_image *mp_refqueue_get(struct mp_refqueue *q, int pos)
+{
+ int i = q->pos - pos;
+ return i >= 0 && i < q->num_queue ? q->queue[i] : NULL;
+}
+
+// Get the pts of field 0/1 (0 being the first to output).
+double mp_refqueue_get_field_pts(struct mp_refqueue *q, int field)
+{
+ assert(field == 0 || field == 1);
+
+ if (q->pos < 0)
+ return MP_NOPTS_VALUE;
+
+ double pts = q->queue[q->pos]->pts;
+
+ if (field == 0 || pts == MP_NOPTS_VALUE)
+ return pts;
+
+ if (q->past_pts == MP_NOPTS_VALUE)
+ return MP_NOPTS_VALUE;
+
+ double frametime = pts - q->past_pts;
+ if (frametime <= 0.0 || frametime >= 1.0)
+ return MP_NOPTS_VALUE;
+
+ return pts + frametime / 2;
+}
+
diff --git a/video/filter/refqueue.h b/video/filter/refqueue.h
new file mode 100644
index 0000000000..69b3987a8f
--- /dev/null
+++ b/video/filter/refqueue.h
@@ -0,0 +1,22 @@
+#ifndef MP_REFQUEUE_H_
+#define MP_REFQUEUE_H_
+
+#include <stdbool.h>
+
+// A helper for deinterlacers which require past/future reference frames.
+
+struct mp_refqueue;
+
+struct mp_refqueue *mp_refqueue_alloc(void);
+void mp_refqueue_free(struct mp_refqueue *q);
+
+void mp_refqueue_set_refs(struct mp_refqueue *q, int past, int future);
+void mp_refqueue_flush(struct mp_refqueue *q);
+void mp_refqueue_add_input(struct mp_refqueue *q, struct mp_image *img);
+bool mp_refqueue_need_input(struct mp_refqueue *q);
+bool mp_refqueue_has_output(struct mp_refqueue *q);
+void mp_refqueue_next(struct mp_refqueue *q);
+struct mp_image *mp_refqueue_get(struct mp_refqueue *q, int pos);
+double mp_refqueue_get_field_pts(struct mp_refqueue *q, int field);
+
+#endif
diff --git a/video/filter/vf_vavpp.c b/video/filter/vf_vavpp.c
index 554ddc1a05..b62724f357 100644
--- a/video/filter/vf_vavpp.c
+++ b/video/filter/vf_vavpp.c
@@ -23,6 +23,7 @@
#include "config.h"
#include "options/options.h"
#include "vf.h"
+#include "refqueue.h"
#include "video/vaapi.h"
#include "video/hwdec.h"
#include "video/mp_image_pool.h"
@@ -40,13 +41,6 @@ struct surface_refs {
int num_surfaces;
};
-static void add_surface(void *ta_ctx, struct surface_refs *refs, struct mp_image *s)
-{
- VASurfaceID id = va_surface_id(s);
- if (id != VA_INVALID_ID)
- MP_TARRAY_APPEND(ta_ctx, refs->surfaces, refs->num_surfaces, id);
-}
-
struct pipeline {
VABufferID *filters;
int num_filters;
@@ -71,16 +65,7 @@ struct vf_priv_s {
struct mp_image_pool *pool;
int current_rt_format;
- int needed_future_frames;
- int needed_past_frames;
-
- // Queue of input frames, used to determine past/current/future frames.
- // queue[0] is the newest frame, queue[num_queue - 1] the oldest.
- struct mp_image **queue;
- int num_queue;
- // queue[current_pos] is the current frame, unless current_pos is not a
- // valid index.
- int current_pos;
+ struct mp_refqueue *queue;
};
static const struct vf_priv_s vf_priv_default = {
@@ -90,6 +75,18 @@ static const struct vf_priv_s vf_priv_default = {
.interlaced_only = 1,
};
+static void add_surfaces(struct vf_priv_s *p, struct surface_refs *refs, int dir)
+{
+ for (int n = 0; ; n++) {
+ struct mp_image *s = mp_refqueue_get(p->queue, (1 + n) * dir);
+ if (!s)
+ break;
+ VASurfaceID id = va_surface_id(s);
+ if (id != VA_INVALID_ID)
+ MP_TARRAY_APPEND(p, refs->surfaces, refs->num_surfaces, id);
+ }
+}
+
// The array items must match with the "deint" suboption values.
static const int deint_algorithm[] = {
[0] = VAProcDeinterlacingNone,
@@ -103,10 +100,7 @@ static const int deint_algorithm[] = {
static void flush_frames(struct vf_instance *vf)
{
struct vf_priv_s *p = vf->priv;
- for (int n = 0; n < p->num_queue; n++)
- talloc_free(p->queue[n]);
- p->num_queue = 0;
- p->current_pos = -1;
+ mp_refqueue_flush(p->queue);
}
static bool update_pipeline(struct vf_instance *vf, bool deint)
@@ -139,8 +133,8 @@ static bool update_pipeline(struct vf_instance *vf, bool deint)
p->pipe.num_filters = num_filters;
p->pipe.num_input_colors = caps.num_input_color_standards;
p->pipe.num_output_colors = caps.num_output_color_standards;
- p->needed_future_frames = caps.num_forward_references;
- p->needed_past_frames = caps.num_backward_references;
+ mp_refqueue_set_refs(p->queue, caps.num_backward_references,
+ caps.num_forward_references);
return true;
}
@@ -211,19 +205,11 @@ static struct mp_image *render(struct vf_instance *vf, struct mp_image *in,
param->filters = p->pipe.filters;
param->num_filters = p->pipe.num_filters;
- for (int n = 0; n < p->needed_future_frames; n++) {
- int idx = p->current_pos - 1 - n;
- if (idx >= 0 && idx < p->num_queue)
- add_surface(p, &p->pipe.forward, p->queue[idx]);
- }
+ add_surfaces(p, &p->pipe.forward, 1);
param->forward_references = p->pipe.forward.surfaces;
param->num_forward_references = p->pipe.forward.num_surfaces;
- for (int n = 0; n < p->needed_past_frames; n++) {
- int idx = p->current_pos + 1 + n;
- if (idx >= 0 && idx < p->num_queue)
- add_surface(p, &p->pipe.backward, p->queue[idx]);
- }
+ add_surfaces(p, &p->pipe.backward, -1);
param->backward_references = p->pipe.backward.surfaces;
param->num_backward_references = p->pipe.backward.num_surfaces;
@@ -248,9 +234,7 @@ static void output_frames(struct vf_instance *vf)
{
struct vf_priv_s *p = vf->priv;
- struct mp_image *in = p->queue[p->current_pos];
- double prev_pts = p->current_pos + 1 < p->num_queue
- ? p->queue[p->current_pos + 1]->pts : MP_NOPTS_VALUE;
+ struct mp_image *in = mp_refqueue_get(p->queue, 0);
bool deint = p->do_deint && p->deint_type > 0;
if (!update_pipeline(vf, deint) || !p->pipe.filters) { // no filtering
@@ -273,14 +257,14 @@ static void output_frames(struct vf_instance *vf)
// first-field only
if (field == VA_FRAME_PICTURE || (p->do_deint && p->deint_type < 2))
return;
- double add = (in->pts - prev_pts) * 0.5;
- if (prev_pts == MP_NOPTS_VALUE || add <= 0.0 || add > 0.5) // no pts, skip it
+ double next_pts = mp_refqueue_get_field_pts(p->queue, 1);
+ if (next_pts == MP_NOPTS_VALUE) // no pts, skip it
return;
struct mp_image *out2 = render(vf, in, get_deint_field(p, 1, in) | csp);
if (!out2) // cannot render
return;
mp_image_copy_attributes(out2, in);
- out2->pts = in->pts + add;
+ out2->pts = next_pts;
vf_add_output_frame(vf, out2);
return;
}
@@ -311,27 +295,13 @@ static int filter_ext(struct vf_instance *vf, struct mp_image *in)
return -1;
}
- if (in) {
- MP_TARRAY_INSERT_AT(p, p->queue, p->num_queue, 0, in);
- p->current_pos++;
- assert(p->num_queue != 1 || p->current_pos == 0);
- }
-
- // Discard unneeded past frames.
- // Note that we keep at least 1 past frame (for PTS calculations).
- while (p->num_queue - (p->current_pos + 1) > MPMAX(p->needed_past_frames, 1)) {
- assert(p->num_queue > 0);
- talloc_free(p->queue[p->num_queue - 1]);
- p->num_queue--;
- }
-
- if (p->current_pos < p->needed_future_frames && in)
- return 0; // wait until future frames have been filled
+ mp_refqueue_add_input(p->queue, in);
- if (p->current_pos >= 0 && p->current_pos < p->num_queue) {
+ if (mp_refqueue_has_output(p->queue)) {
output_frames(vf);
- p->current_pos--;
+ mp_refqueue_next(p->queue);
}
+
return 0;
}
@@ -373,6 +343,7 @@ static void uninit(struct vf_instance *vf)
vaDestroyConfig(p->display, p->config);
talloc_free(p->pool);
flush_frames(vf);
+ mp_refqueue_free(p->queue);
}
static int query_format(struct vf_instance *vf, unsigned int imgfmt)
@@ -489,6 +460,8 @@ static int vf_open(vf_instance_t *vf)
vf->uninit = uninit;
vf->control = control;
+ p->queue = mp_refqueue_alloc();
+
p->va = hwdec_devices_load(vf->hwdec_devs, HWDEC_VAAPI);
if (!p->va)
return 0;
diff --git a/wscript_build.py b/wscript_build.py
index 61830b5dff..179d810422 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -297,6 +297,7 @@ def build(ctx):
( "video/decode/vd_lavc.c" ),
( "video/decode/videotoolbox.c", "videotoolbox-hwaccel" ),
( "video/decode/vdpau.c", "vdpau-hwaccel" ),
+ ( "video/filter/refqueue.c" ),
( "video/filter/vf.c" ),
( "video/filter/vf_buffer.c" ),
( "video/filter/vf_crop.c" ),