summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-10 18:03:38 +0200
committerwm4 <wm4@nowhere>2015-07-10 18:03:38 +0200
commit140273cdec83fe6d67e78a3a8d04003ba835376b (patch)
treed0ef8df74a9c23210137c797b9dd104541557d4a
parent01ce203ed7a4ab1014062fadec717f7c1fb2c0d1 (diff)
downloadmpv-140273cdec83fe6d67e78a3a8d04003ba835376b.tar.bz2
mpv-140273cdec83fe6d67e78a3a8d04003ba835376b.tar.xz
vf_stereo3d: drop internal implementation
Leave the libavfilter wrapper only.
-rw-r--r--video/filter/vf_stereo3d.c408
1 files changed, 15 insertions, 393 deletions
diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c
index acc662936d..c47898035f 100644
--- a/video/filter/vf_stereo3d.c
+++ b/video/filter/vf_stereo3d.c
@@ -66,339 +66,16 @@ typedef enum stereo_code {
STEREO_CODE_COUNT //no value set - TODO: needs autodetection
} stereo_code;
-typedef struct component {
- int fmt;
- unsigned int width;
- unsigned int height;
- unsigned int off_left;
- unsigned int off_right;
- unsigned int row_left;
- unsigned int row_right;
-} component;
-
-//==global variables==//
-static const int ana_coeff[][3][6] = {
- [ANAGLYPH_RC_GRAY] =
- {{19595, 38470, 7471, 0, 0, 0},
- { 0, 0, 0, 19595, 38470, 7471},
- { 0, 0, 0, 19595, 38470, 7471}},
- [ANAGLYPH_RC_HALF] =
- {{19595, 38470, 7471, 0, 0, 0},
- { 0, 0, 0, 0, 65536, 0},
- { 0, 0, 0, 0, 0, 65536}},
- [ANAGLYPH_RC_COLOR] =
- {{65536, 0, 0, 0, 0, 0},
- { 0, 0, 0, 0, 65536, 0},
- { 0, 0, 0, 0, 0, 65536}},
- [ANAGLYPH_RC_DUBOIS] =
- {{29891, 32800, 11559, -2849, -5763, -102},
- {-2627, -2479, -1033, 24804, 48080, -1209},
- { -997, -1350, -358, -4729, -7403, 80373}},
- [ANAGLYPH_GM_GRAY] =
- {{ 0, 0, 0, 19595, 38470, 7471},
- {19595, 38470, 7471, 0, 0, 0},
- { 0, 0, 0, 19595, 38470, 7471}},
- [ANAGLYPH_GM_HALF] =
- {{ 0, 0, 0, 65536, 0, 0},
- {19595, 38470, 7471, 0, 0, 0},
- { 0, 0, 0, 0, 0, 65536}},
- [ANAGLYPH_GM_COLOR] =
- {{ 0, 0, 0, 65536, 0, 0},
- { 0, 65536, 0, 0, 0, 0},
- { 0, 0, 0, 0, 0, 65536}},
- [ANAGLYPH_GM_DUBOIS] =
- {{-4063,-10354, -2556, 34669, 46203, 1573},
- {18612, 43778, 9372, -1049, -983, -4260},
- { -983, -1769, 1376, 590, 4915, 61407}},
- [ANAGLYPH_YB_GRAY] =
- {{ 0, 0, 0, 19595, 38470, 7471},
- { 0, 0, 0, 19595, 38470, 7471},
- {19595, 38470, 7471, 0, 0, 0}},
- [ANAGLYPH_YB_HALF] =
- {{ 0, 0, 0, 65536, 0, 0},
- { 0, 0, 0, 0, 65536, 0},
- {19595, 38470, 7471, 0, 0, 0}},
- [ANAGLYPH_YB_COLOR] =
- {{ 0, 0, 0, 65536, 0, 0},
- { 0, 0, 0, 0, 65536, 0},
- { 0, 0, 65536, 0, 0, 0}},
- [ANAGLYPH_YB_DUBOIS] =
- {{65535,-12650,18451, -987, -7590, -1049},
- {-1604, 56032, 4196, 370, 3826, -1049},
- {-2345,-10676, 1358, 5801, 11416, 56217}},
-};
-
struct vf_priv_s {
- component in;
- component out;
+ int in_fmt;
+ int out_fmt;
bool auto_in;
- int ana_matrix[3][6];
- unsigned int width;
- unsigned int height;
- unsigned int row_step;
struct vf_lw_opts *lw_opts;
} const vf_priv_default = {
- {SIDE_BY_SIDE_LR},
- {ANAGLYPH_RC_DUBOIS}
+ SIDE_BY_SIDE_LR,
+ ANAGLYPH_RC_DUBOIS,
};
-static bool handle_auto_in(struct vf_instance *vf);
-
-//==functions==//
-static inline uint8_t ana_convert(int coeff[6], uint8_t left[3], uint8_t right[3])
-{
- int sum;
-
- sum = coeff[0] * left[0] + coeff[3] * right[0]; //red in
- sum += coeff[1] * left[1] + coeff[4] * right[1]; //green in
- sum += coeff[2] * left[2] + coeff[5] * right[2]; //blue in
- return av_clip_uint8(sum >> 16);
-}
-
-static int config(struct vf_instance *vf, int width, int height, int d_width,
- int d_height, unsigned int flags, unsigned int outfmt)
-{
- if ((width & 1) || (height & 1)) {
- MP_WARN(vf, "[stereo3d] invalid height or width\n");
- return 0;
- }
- //default input values
- vf->priv->width = width;
- vf->priv->height = height;
- vf->priv->row_step = 1;
- vf->priv->in.width = width;
- vf->priv->in.height = height;
- vf->priv->in.off_left = 0;
- vf->priv->in.off_right = 0;
- vf->priv->in.row_left = 0;
- vf->priv->in.row_right = 0;
-
- if (vf->priv->auto_in && !handle_auto_in(vf))
- return 0;
-
- //check input format
- switch (vf->priv->in.fmt) {
- case SIDE_BY_SIDE_2_LR:
- d_width *= 2;
- case SIDE_BY_SIDE_LR:
- vf->priv->width = width / 2;
- vf->priv->in.off_right = vf->priv->width * 3;
- break;
- case SIDE_BY_SIDE_2_RL:
- d_width *= 2;
- case SIDE_BY_SIDE_RL:
- vf->priv->width = width / 2;
- vf->priv->in.off_left = vf->priv->width * 3;
- break;
- case ABOVE_BELOW_2_LR:
- d_height *= 2;
- case ABOVE_BELOW_LR:
- vf->priv->height = height / 2;
- vf->priv->in.row_right = vf->priv->height;
- break;
- case ABOVE_BELOW_2_RL:
- d_height *= 2;
- case ABOVE_BELOW_RL:
- vf->priv->height = height / 2;
- vf->priv->in.row_left = vf->priv->height;
- break;
- default:
- MP_WARN(vf, "[stereo3d] stereo format of input is not supported\n");
- return 0;
- break;
- }
- //default output values
- vf->priv->out.width = vf->priv->width;
- vf->priv->out.height = vf->priv->height;
- vf->priv->out.off_left = 0;
- vf->priv->out.off_right = 0;
- vf->priv->out.row_left = 0;
- vf->priv->out.row_right = 0;
-
- //check output format
- switch (vf->priv->out.fmt) {
- case ANAGLYPH_RC_GRAY:
- case ANAGLYPH_RC_HALF:
- case ANAGLYPH_RC_COLOR:
- case ANAGLYPH_RC_DUBOIS:
- case ANAGLYPH_GM_GRAY:
- case ANAGLYPH_GM_HALF:
- case ANAGLYPH_GM_COLOR:
- case ANAGLYPH_GM_DUBOIS:
- case ANAGLYPH_YB_GRAY:
- case ANAGLYPH_YB_HALF:
- case ANAGLYPH_YB_COLOR:
- case ANAGLYPH_YB_DUBOIS:
- memcpy(vf->priv->ana_matrix, ana_coeff[vf->priv->out.fmt],
- sizeof(vf->priv->ana_matrix));
- break;
- case SIDE_BY_SIDE_2_LR:
- d_width /= 2;
- case SIDE_BY_SIDE_LR:
- vf->priv->out.width = vf->priv->width * 2;
- vf->priv->out.off_right = vf->priv->width * 3;
- break;
- case SIDE_BY_SIDE_2_RL:
- d_width /= 2;
- case SIDE_BY_SIDE_RL:
- vf->priv->out.width = vf->priv->width * 2;
- vf->priv->out.off_left = vf->priv->width * 3;
- break;
- case ABOVE_BELOW_2_LR:
- d_height /= 2;
- case ABOVE_BELOW_LR:
- vf->priv->out.height = vf->priv->height * 2;
- vf->priv->out.row_right = vf->priv->height;
- break;
- case ABOVE_BELOW_2_RL:
- d_height /= 2;
- case ABOVE_BELOW_RL:
- vf->priv->out.height = vf->priv->height * 2;
- vf->priv->out.row_left = vf->priv->height;
- break;
- case INTERLEAVE_ROWS_LR:
- vf->priv->row_step = 2;
- vf->priv->height = vf->priv->height / 2;
- vf->priv->out.off_right = vf->priv->width * 3;
- vf->priv->in.off_right += vf->priv->in.width * 3;
- break;
- case INTERLEAVE_ROWS_RL:
- vf->priv->row_step = 2;
- vf->priv->height = vf->priv->height / 2;
- vf->priv->out.off_left = vf->priv->width * 3;
- vf->priv->in.off_left += vf->priv->in.width * 3;
- break;
- case MONO_R:
- //same as MONO_L only needs switching of input offsets
- vf->priv->in.off_left = vf->priv->in.off_right;
- vf->priv->in.row_left = vf->priv->in.row_right;
- //nobreak;
- case MONO_L:
- //use default settings
- break;
- default:
- MP_WARN(vf, "[stereo3d] stereo format of output is not supported\n");
- return 0;
- break;
- }
- vf_rescale_dsize(&d_width, &d_height, width, height,
- vf->priv->out.width, vf->priv->out.height);
- return vf_next_config(vf, vf->priv->out.width, vf->priv->out.height,
- d_width, d_height, flags, outfmt);
-}
-
-static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
-{
- if (vf->priv->in.fmt == vf->priv->out.fmt) { //nothing to do
- return mpi;
- } else {
- int out_off_left, out_off_right;
- int in_off_left = vf->priv->in.row_left * mpi->stride[0] +
- vf->priv->in.off_left;
- int in_off_right = vf->priv->in.row_right * mpi->stride[0] +
- vf->priv->in.off_right;
-
- struct mp_image *dmpi = vf_alloc_out_image(vf);
- if (!dmpi)
- return NULL;
- mp_image_copy_attributes(dmpi, mpi);
-
- out_off_left = vf->priv->out.row_left * dmpi->stride[0] +
- vf->priv->out.off_left;
- out_off_right = vf->priv->out.row_right * dmpi->stride[0] +
- vf->priv->out.off_right;
-
- switch (vf->priv->out.fmt) {
- case SIDE_BY_SIDE_LR:
- case SIDE_BY_SIDE_RL:
- case SIDE_BY_SIDE_2_LR:
- case SIDE_BY_SIDE_2_RL:
- case ABOVE_BELOW_LR:
- case ABOVE_BELOW_RL:
- case ABOVE_BELOW_2_LR:
- case ABOVE_BELOW_2_RL:
- case INTERLEAVE_ROWS_LR:
- case INTERLEAVE_ROWS_RL:
- memcpy_pic(dmpi->planes[0] + out_off_left,
- mpi->planes[0] + in_off_left,
- 3 * vf->priv->width,
- vf->priv->height,
- dmpi->stride[0] * vf->priv->row_step,
- mpi->stride[0] * vf->priv->row_step);
- memcpy_pic(dmpi->planes[0] + out_off_right,
- mpi->planes[0] + in_off_right,
- 3 * vf->priv->width,
- vf->priv->height,
- dmpi->stride[0] * vf->priv->row_step,
- mpi->stride[0] * vf->priv->row_step);
- break;
- case MONO_L:
- case MONO_R:
- memcpy_pic(dmpi->planes[0],
- mpi->planes[0] + in_off_left,
- 3 * vf->priv->width,
- vf->priv->height,
- dmpi->stride[0],
- mpi->stride[0]);
- break;
- case ANAGLYPH_RC_GRAY:
- case ANAGLYPH_RC_HALF:
- case ANAGLYPH_RC_COLOR:
- case ANAGLYPH_RC_DUBOIS:
- case ANAGLYPH_GM_GRAY:
- case ANAGLYPH_GM_HALF:
- case ANAGLYPH_GM_COLOR:
- case ANAGLYPH_GM_DUBOIS:
- case ANAGLYPH_YB_GRAY:
- case ANAGLYPH_YB_HALF:
- case ANAGLYPH_YB_COLOR:
- case ANAGLYPH_YB_DUBOIS: {
- int x,y,il,ir,o;
- unsigned char *source = mpi->planes[0];
- unsigned char *dest = dmpi->planes[0];
- unsigned int out_width = vf->priv->out.width;
- int *ana_matrix[3];
-
- for(int i = 0; i < 3; i++)
- ana_matrix[i] = vf->priv->ana_matrix[i];
-
- for (y = 0; y < vf->priv->out.height; y++) {
- o = dmpi->stride[0] * y;
- il = in_off_left + y * mpi->stride[0];
- ir = in_off_right + y * mpi->stride[0];
- for (x = 0; x < out_width; x++) {
- dest[o ] = ana_convert(
- ana_matrix[0], source + il, source + ir); //red out
- dest[o + 1] = ana_convert(
- ana_matrix[1], source + il, source + ir); //green out
- dest[o + 2] = ana_convert(
- ana_matrix[2], source + il, source + ir); //blue out
- il += 3;
- ir += 3;
- o += 3;
- }
- }
- break;
- }
- default:
- MP_WARN(vf, "[stereo3d] stereo format of output is not supported\n");
- return NULL;
- break;
- }
-
- talloc_free(mpi);
- return dmpi;
- }
-}
-
-static int query_format(struct vf_instance *vf, unsigned int fmt)
-{
- switch (fmt)
- case IMGFMT_RGB24:
- return vf_next_query_format(vf, fmt);
- return 0;
-}
-
const struct m_opt_choice_alternatives stereo_code_names[] = {
{"arcg", ANAGLYPH_RC_GRAY},
{"anaglyph_red_cyan_gray", ANAGLYPH_RC_GRAY},
@@ -455,23 +132,12 @@ const struct m_opt_choice_alternatives stereo_code_names[] = {
{ NULL, 0}
};
-// Fortunately, the short names are the same as the libavfilter port.
-// The long names won't work, though.
-static const char *rev_map_name(int val)
-{
- for (int n = 0; stereo_code_names[n].name; n++) {
- if (stereo_code_names[n].value == val)
- return stereo_code_names[n].name;
- }
- return NULL;
-}
-
// Extremely stupid; can be dropped when the internal filter is dropped,
// and OPT_CHOICE_C() can be used instead.
static int opt_to_stereo3dmode(int val)
{
- // Find x for rev_map_name(val) == MP_STEREO3D_NAME(x)
- const char *name = rev_map_name(val);
+ // Find x for name == MP_STEREO3D_NAME(x)
+ const char *name = m_opt_choice_str(stereo_code_names, val);
for (int n = 0; n < MP_STEREO3D_COUNT; n++) {
const char *o = MP_STEREO3D_NAME(val);
if (name && o && strcmp(o, name) == 0)
@@ -479,33 +145,6 @@ static int opt_to_stereo3dmode(int val)
}
return MP_STEREO3D_INVALID;
}
-static int stereo3dmode_to_opt(int val)
-{
- // Find x for rev_map_name(x) == MP_STEREO3D_NAME(val)
- const char *name = MP_STEREO3D_NAME(val);
- for (int n = 0; stereo_code_names[n].name; n++) {
- if (name && strcmp(stereo_code_names[n].name, name) == 0)
- return stereo_code_names[n].value;
- }
- return -1;
-}
-
-static bool handle_auto_in(struct vf_instance *vf)
-{
- if (vf->priv->auto_in) {
- int inv = stereo3dmode_to_opt(vf->fmt_in.stereo_in);
- if (inv < 0) {
- MP_ERR(vf, "Unknown/unsupported 3D mode.\n");
- return false;
- }
- vf->priv->in.fmt = inv;
- vf->fmt_out.stereo_in = vf->fmt_out.stereo_out =
- opt_to_stereo3dmode(vf->priv->out.fmt);
- }
- return true;
-}
-
-#if HAVE_LIBAVFILTER
static int lavfi_reconfig(struct vf_instance *vf,
struct mp_image_params *in,
@@ -519,15 +158,15 @@ static int lavfi_reconfig(struct vf_instance *vf,
return -1;
}
vf_lw_update_graph(vf, "stereo3d", "%s:%s",
- inf, rev_map_name(p->out.fmt));
- out->stereo_in = out->stereo_out = opt_to_stereo3dmode(p->out.fmt);
+ inf, m_opt_choice_str(stereo_code_names, p->out_fmt));
+ out->stereo_in = out->stereo_out = opt_to_stereo3dmode(p->out_fmt);
}
return 0;
}
static void lavfi_init(vf_instance_t *vf)
{
- if (vf->priv->in.fmt == STEREO_AUTO &&
+ if (vf->priv->in_fmt == STEREO_AUTO &&
vf_lw_set_graph(vf, vf->priv->lw_opts, "stereo3d", "null") >= 0)
{
vf_lw_set_reconfig_cb(vf, lavfi_reconfig);
@@ -535,33 +174,18 @@ static void lavfi_init(vf_instance_t *vf)
}
if (vf_lw_set_graph(vf, vf->priv->lw_opts, "stereo3d", "%s:%s",
- rev_map_name(vf->priv->in.fmt),
- rev_map_name(vf->priv->out.fmt)) >= 0)
+ m_opt_choice_str(stereo_code_names, vf->priv->in_fmt),
+ m_opt_choice_str(stereo_code_names, vf->priv->out_fmt)) >= 0)
return;
}
-#else
-
-const struct m_sub_options vf_lw_conf = {0};
-
-static void lavfi_init(vf_instance_t *vf)
-{
- // doing nothing will make it use the internal implementation
-}
-
-#endif
-
static int vf_open(vf_instance_t *vf)
{
- vf->config = config;
- vf->filter = filter;
- vf->query_format = query_format;
-
- if (vf->priv->out.fmt == STEREO_AUTO) {
+ if (vf->priv->out_fmt == STEREO_AUTO) {
MP_FATAL(vf, "No autodetection for stereo output.\n");
return 0;
}
- if (vf->priv->in.fmt == STEREO_AUTO)
+ if (vf->priv->in_fmt == STEREO_AUTO)
vf->priv->auto_in = 1;
lavfi_init(vf);
@@ -570,10 +194,8 @@ static int vf_open(vf_instance_t *vf)
#define OPT_BASE_STRUCT struct vf_priv_s
static const m_option_t vf_opts_fields[] = {
- OPT_GENERAL(int, "in", in.fmt, 0, .type = CONF_TYPE_CHOICE,
- .priv = (void *)stereo_code_names),
- OPT_GENERAL(int, "out", out.fmt, 0, .type = CONF_TYPE_CHOICE,
- .priv = (void *)stereo_code_names),
+ OPT_CHOICE_C("in", in_fmt, 0, stereo_code_names),
+ OPT_CHOICE_C("out", out_fmt, 0, stereo_code_names),
OPT_SUBSTRUCT("", lw_opts, vf_lw_conf, 0),
{0}
};