video: change --deinterlace behavior

This removes all GPL only code from it, and that's the whole purpose.
Also happens to be much simpler.

The "deinterlace" option still sort of exists, but only as runtime
changeable option. The main change in behavior is that the property will
not report back the actual deint state. Or in other words, if inserting
or initializing the filter fails, the deinterlace property will still
return "yes". This is in line with most recent behavior changes to
properties and options.

4 files changed, 0 insertions, 28 deletions

diff --git a/video/filter/vf.h b/video/filter/vf.h
index 8a9815078d..5146a4d15b 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -13,8 +13,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Parts under HAVE_GPL are licensed under GNU General Public License.
  */
 
 #ifndef MPLAYER_VF_H
@@ -22,8 +20,6 @@
 
 #include <stdbool.h>
 
-#include "config.h"
-
 #include "video/mp_image.h"
 #include "common/common.h"
 
@@ -143,10 +139,6 @@ struct vf_chain {
 
 enum vf_ctrl {
     VFCTRL_SEEK_RESET = 1,   // reset on picture and PTS discontinuities
-#if HAVE_GPL
-    VFCTRL_SET_DEINTERLACE,  // Set deinterlacing status
-    VFCTRL_GET_DEINTERLACE,  // Get deinterlacing status
-#endif
     VFCTRL_GET_METADATA,     // Get frame metadata from lavfi filters (e.g., cropdetect)
     /* Hack to make the OSD state object available to vf_sub which
      * access OSD/subtitle state outside of normal OSD draw time. */
diff --git a/video/filter/vf_d3d11vpp.c b/video/filter/vf_d3d11vpp.c
index 92999be639..cbd59fef93 100644
--- a/video/filter/vf_d3d11vpp.c
+++ b/video/filter/vf_d3d11vpp.c
@@ -465,12 +465,6 @@ static int control(struct vf_instance *vf, int request, void* data)
 {
     struct vf_priv_s *p = vf->priv;
     switch (request){
-    case VFCTRL_GET_DEINTERLACE:
-        *(int*)data = !!p->deint_enabled;
-        return true;
-    case VFCTRL_SET_DEINTERLACE:
-        p->deint_enabled = !!*(int*)data;
-        return true;
     case VFCTRL_SEEK_RESET:
         flush_frames(vf);
         return true;
diff --git a/video/filter/vf_vavpp.c b/video/filter/vf_vavpp.c
index e3c107c91d..4b225aa466 100644
--- a/video/filter/vf_vavpp.c
+++ b/video/filter/vf_vavpp.c
@@ -368,14 +368,7 @@ static int query_format(struct vf_instance *vf, unsigned int imgfmt)
 
 static int control(struct vf_instance *vf, int request, void* data)
 {
-    struct vf_priv_s *p = vf->priv;
     switch (request){
-    case VFCTRL_GET_DEINTERLACE:
-        *(int*)data = !!p->do_deint;
-        return true;
-    case VFCTRL_SET_DEINTERLACE:
-        p->do_deint = *(int*)data;
-        return true;
     case VFCTRL_SEEK_RESET:
         flush_frames(vf);
         return true;
diff --git a/video/filter/vf_vdpaupp.c b/video/filter/vf_vdpaupp.c
index 92a40ec8c2..a583e386f2 100644
--- a/video/filter/vf_vdpaupp.c
+++ b/video/filter/vf_vdpaupp.c
@@ -151,13 +151,6 @@ static int control(vf_instance_t *vf, int request, void *data)
     case VFCTRL_SEEK_RESET:
         mp_refqueue_flush(p->queue);
         return CONTROL_OK;
-    case VFCTRL_GET_DEINTERLACE:
-        *(int *)data = !!p->deint_enabled;
-        return true;
-    case VFCTRL_SET_DEINTERLACE:
-        p->deint_enabled = !!*(int *)data;
-        p->opts.deint = p->deint_enabled ? p->def_deintmode : 0;
-        return true;
     }
     return CONTROL_UNKNOWN;
 }