diff options
author | wm4 <wm4@nowhere> | 2019-10-17 22:49:26 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2019-10-17 22:49:26 +0200 |
commit | 60ab82df322bd91fd1c999dfaa3dd1784617734b (patch) | |
tree | 6d485985218e2728dc09105e2d9aef391cca5a15 /video/mp_image.c | |
parent | c75e0320f60f93f0db40c949320fd9cee27cb52e (diff) | |
download | mpv-60ab82df322bd91fd1c999dfaa3dd1784617734b.tar.bz2 mpv-60ab82df322bd91fd1c999dfaa3dd1784617734b.tar.xz |
video, demux: rip out unused spherical metadata code
This was preparation into something that never happened.
Spherical video is a shit idea anyway.
Diffstat (limited to 'video/mp_image.c')
-rw-r--r-- | video/mp_image.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/video/mp_image.c b/video/mp_image.c index 3ef2b3b6f6..c15c6b55fc 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -40,14 +40,6 @@ #include "sws_utils.h" #include "fmt-conversion.h" -const struct m_opt_choice_alternatives mp_spherical_names[] = { - {"auto", MP_SPHERICAL_AUTO}, - {"none", MP_SPHERICAL_NONE}, - {"unknown", MP_SPHERICAL_UNKNOWN}, - {"equirect", MP_SPHERICAL_EQUIRECTANGULAR}, - {0} -}; - // Determine strides, plane sizes, and total required size for an image // allocation. Returns total size on success, <0 on error. Unused planes // have out_stride/out_plane_size to 0, and out_plane_offset set to -1 up @@ -522,7 +514,6 @@ void mp_image_copy_attributes(struct mp_image *dst, struct mp_image *src) dst->params.p_h = src->params.p_h; dst->params.color = src->params.color; dst->params.chroma_location = src->params.chroma_location; - dst->params.spherical = src->params.spherical; dst->nominal_fps = src->nominal_fps; // ensure colorspace consistency if (mp_image_params_get_forced_csp(&dst->params) != @@ -659,12 +650,6 @@ char *mp_image_params_to_str_buf(char *b, size_t bs, mp_snprintf_cat(b, bs, " stereo=%s", MP_STEREO3D_NAME_DEF(p->stereo3d, "?")); } - if (p->spherical.type != MP_SPHERICAL_NONE) { - const float *a = p->spherical.ref_angles; - mp_snprintf_cat(b, bs, " (%s %f/%f/%f)", - m_opt_choice_str(mp_spherical_names, p->spherical.type), - a[0], a[1], a[2]); - } } else { snprintf(b, bs, "???"); } @@ -699,16 +684,6 @@ bool mp_image_params_valid(const struct mp_image_params *p) return true; } -static bool mp_spherical_equal(const struct mp_spherical_params *p1, - const struct mp_spherical_params *p2) -{ - for (int n = 0; n < 3; n++) { - if (p1->ref_angles[n] != p2->ref_angles[n]) - return false; - } - return p1->type == p2->type; -} - bool mp_image_params_equal(const struct mp_image_params *p1, const struct mp_image_params *p2) { @@ -719,8 +694,7 @@ bool mp_image_params_equal(const struct mp_image_params *p1, mp_colorspace_equal(p1->color, p2->color) && p1->chroma_location == p2->chroma_location && p1->rotate == p2->rotate && - p1->stereo3d == p2->stereo3d && - mp_spherical_equal(&p1->spherical, &p2->spherical); + p1->stereo3d == p2->stereo3d; } // Set most image parameters, but not image format or size. @@ -894,7 +868,6 @@ struct mp_image *mp_image_from_av_frame(struct AVFrame *src) struct mp_image_params *p = (void *)src->opaque_ref->data; dst->params.rotate = p->rotate; dst->params.stereo3d = p->stereo3d; - dst->params.spherical = p->spherical; // Might be incorrect if colorspace changes. dst->params.color.light = p->color.light; } |