lavfi/mp: switch to an AVOptions-based system.

Clément Bœsch committed 13 years ago

Commit 838d8031 parent 70b72ca2 files · +32 −4Browse files

Unified · Split

2 files

libavfilter/avfilter.c +15 −1
libavfilter/vf_mp.c +17 −3

@@ -680,7 +680,6 @@ static const char *const filters_left_to_update[] = { · 679 unmodified lines
680	#endif	680	#endif
681	"atempo",	681	"atempo",
682	"buffer",	682	"buffer",
683	"mp",
684	"pan",	683	"pan",
685	"scale",	684	"scale",
686	};	685	};
@@ -818,6 +817,21 @@ int avfilter_init_filter(AVFilterContext filter, const char args, void *opaque · 131 unmodified lines
818	goto fail;	817	goto fail;
819	#endif	818	#endif
820	} else {	819	} else {
		820	#if CONFIG_MP_FILTER
		821	if (!strcmp(filter->filter->name, "mp")) {
		822	char *escaped;
		823
		824	if (!strncmp(args, "filter=", 7))
		825	args += 7;
		826	ret = av_escape(&escaped, args, ":=", AV_ESCAPE_MODE_BACKSLASH, 0);
		827	if (ret < 0) {
		828	av_log(filter, AV_LOG_ERROR, "Unable to escape MPlayer filters arg '%s'\n", args);
		829	goto fail;
		830	}
		831	ret = process_options(filter, &options, escaped);
		832	av_free(escaped);
		833	} else
		834	#endif
821	ret = process_options(filter, &options, args);	835	ret = process_options(filter, &options, args);
822	if (ret < 0)	836	if (ret < 0)
823	goto fail;	837	goto fail;

libavfilter/vf_mp.c+17−3

 #include "libavutil/pixdesc.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
 #include "libmpcodecs/vf.h"
 #include "libmpcodecs/img_format.h"
 }
 typedef struct {
+    const AVClass *class;
     vf_instance_t vf;
     vf_instance_t next_vf;
     AVFilterContext *avfctx;
     int frame_returned;
+    char *filter;
 } MPContext;
+#define OFFSET(x) offsetof(MPContext, x)
+#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption mp_options[] = {
+    { "filter", "set MPlayer filter name and parameters", OFFSET(filter), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
+    { NULL }
+};
+AVFILTER_DEFINE_CLASS(mp);
 void ff_mp_msg(int mod, int lev, const char *format, ... ){
     va_list va;
     va_start(va, format);
 static void dummy_free(void *opaque, uint8_t *data){}
 int ff_vf_next_put_image(struct vf_instance *vf,mp_image_t *mpi, double pts){
-    MPContext *m= (void*)vf;
+    MPContext *m= (MPContext*)(((uint8_t*)vf) - offsetof(MPContext, vf));
     AVFilterLink *outlink     = m->avfctx->outputs[0];
     AVFrame *picref = av_frame_alloc();
     int i;
 }
 int ff_vf_next_control(struct vf_instance *vf, int request, void* data){
-    MPContext *m= (void*)vf;
+    MPContext *m= (MPContext*)(((uint8_t*)vf) - offsetof(MPContext, vf));
     av_log(m->avfctx, AV_LOG_DEBUG, "Received control %d\n", request);
     return 0;
 }
 static int vf_default_query_format(struct vf_instance *vf, unsigned int fmt){
-    MPContext *m= (void*)vf;
+    MPContext *m= (MPContext*)(((uint8_t*)vf) - offsetof(MPContext, vf));
     int i;
     av_log(m->avfctx, AV_LOG_DEBUG, "query %X\n", fmt);
     m->avfctx= ctx;
+    args = m->filter;
     if(!args || 1!=sscanf(args, "%255[^:=]", name)){
         av_log(ctx, AV_LOG_ERROR, "Invalid parameter.\n");
         return AVERROR(EINVAL);
     .query_formats = query_formats,
     .inputs        = mp_inputs,
     .outputs       = mp_outputs,
+    .priv_class    = &mp_class,
 };

lavfi/mp: switch to an AVOptions-based system.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code