Generalize pixel format enum fields to int formats.

This is needed to make the libavfilter framework work with audio filters. In particular add a type field to AVFilterLink, change the field types: enum PixelFormat format -> int format in AVFilterBuffer enum PixelFormat *formats -> int *formats in AVFilterFormats enum PixelFormat *format -> int format in AVFilterLink and change the function signatures: AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmts); -> AVFilterFormats *avfilter_make_format_list(const int *fmts); int avfilter_add_colorspace(AVFilterFormats **avff, enum PixelFormat pix_fmt); -> int avfilter_add_format(AVFilterFormats **avff, int fmt); AVFilterFormats *avfilter_all_colorspaces(void); -> AVFilterFormats *avfilter_all_formats(enum AVMediaType type); This change breaks libavfilter API/ABI. Patch by S.N. Hemanth Meenakshisundaram |smeenaks|ucsd|edu|. Originally committed as revision 24424 to svn://svn.ffmpeg.org/ffmpeg/trunk

S.N. Hemanth Meenakshisundaram committed 16 years ago

Commit bdab6141 parent 98137a16 files · +43 −33Browse files

Showing the changes to libavfilter (6 of 6 files). Show all

Unified · Split

6 files

libavfilter/avfilter.c +4 −2
libavfilter/avfilter.h +13 −11
libavfilter/avfiltergraph.c +2 −2
libavfilter/defaults.c +5 −1
libavfilter/formats.c +17 −15
libavfilter/vf_scale.c +2 −2

libavfilter/avfilter.c+4−2

     link->dst     = dst;
     link->srcpad  = srcpad;
     link->dstpad  = dstpad;
-    link->format  = PIX_FMT_NONE;
+    link->type    = src->output_pads[srcpad].type;
+    assert(PIX_FMT_NONE == -1 && SAMPLE_FMT_NONE == -1);
+    link->format  = -1;
     return 0;
 }
     link->dstpad = in;
     filt->inputs[in] = link;
-    /* if any information on supported colorspaces already exists on the
+    /* if any information on supported media formats already exists on the
      * link, we need to preserve that */
     if(link->out_formats)
         avfilter_formats_changeref(&link->out_formats,

libavfilter/avfilter.h+13−11

 #include "libavutil/avutil.h"
 #define LIBAVFILTER_VERSION_MAJOR  1
-#define LIBAVFILTER_VERSION_MINOR 25
+#define LIBAVFILTER_VERSION_MINOR 26
 #define LIBAVFILTER_VERSION_MICRO  1
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
 {
     uint8_t *data[4];           ///< buffer data for each plane
     int linesize[4];            ///< number of bytes per line
-    enum PixelFormat format;    ///< colorspace
+    int format;                 ///< media format
     unsigned refcount;          ///< number of references to this buffer
 struct AVFilterFormats
 {
     unsigned format_count;      ///< number of formats
-    enum PixelFormat *formats;  ///< list of pixel formats
+    int *formats;               ///< list of media formats
     unsigned refcount;          ///< number of references to this list
     AVFilterFormats ***refs;    ///< references to this list
 /**
  * Create a list of supported formats. This is intended for use in
  * AVFilter->query_formats().
- * @param pix_fmts list of pixel formats, terminated by PIX_FMT_NONE
+ * @param fmts list of media formats, terminated by -1
  * @return the format list, with no existing references
  */
-AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmts);
+AVFilterFormats *avfilter_make_format_list(const int *fmts);
 /**
- * Add pix_fmt to the list of pixel formats contained in *avff.
+ * Add fmt to the list of media formats contained in *avff.
  * If *avff is NULL the function allocates the filter formats struct
  * and puts its pointer in *avff.
  *
  * @return a non negative value in case of success, or a negative
  * value corresponding to an AVERROR code in case of error
  */
-int avfilter_add_colorspace(AVFilterFormats **avff, enum PixelFormat pix_fmt);
+int avfilter_add_format(AVFilterFormats **avff, int fmt);
 /**
- * Return a list of all colorspaces supported by FFmpeg.
+ * Return a list of all formats supported by FFmpeg for the given media type.
  */
-AVFilterFormats *avfilter_all_colorspaces(void);
+AVFilterFormats *avfilter_all_formats(enum AVMediaType type);
 /**
  * Return a format list which contains the intersection of the formats of
         AVLINK_INIT             ///< complete
     } init_state;
+    enum AVMediaType type;      ///< filter media type
     int w;                      ///< agreed upon image width
     int h;                      ///< agreed upon image height
-    enum PixelFormat format;    ///< agreed upon image colorspace
+    int format;                 ///< agreed upon media format
     /**
      * Lists of formats supported by the input and output filters respectively.
                   AVFilterContext *dst, unsigned dstpad);
 /**
- * Negotiate the colorspace, dimensions, etc of all inputs to a filter.
+ * Negotiate the media format, dimensions, etc of all inputs to a filter.
  * @param filter the filter to negotiate the properties for its inputs
  * @return       zero on successful negotiation
  */

libavfilter/avfiltergraph.c+2−2

@@ -111,7 +111,7 @@ static int query_formats(AVFilterGraph graph, AVClass log_ctx) · 110 unmodified lines
111	int scaler_count = 0;	111	int scaler_count = 0;
112	char inst_name[30];	112	char inst_name[30];
113		113
114	/* ask all the sub-filters for their supported colorspaces */	114	/* ask all the sub-filters for their supported media formats */
115	for(i = 0; i < graph->filter_count; i ++) {	115	for(i = 0; i < graph->filter_count; i ++) {
116	if(graph->filters[i]->filter->query_formats)	116	if(graph->filters[i]->filter->query_formats)
117	graph->filters[i]->filter->query_formats(graph->filters[i]);	117	graph->filters[i]->filter->query_formats(graph->filters[i]);
@@ -197,7 +197,7 @@ int avfilter_graph_config_formats(AVFilterGraph graph, AVClass log_ctx) · 79 unmodified lines
197	return -1;	197	return -1;
198		198
199	/* Once everything is merged, it's possible that we'll still have	199	/* Once everything is merged, it's possible that we'll still have
200	* multiple valid colorspace choices. We pick the first one. */	200	* multiple valid media format choices. We pick the first one. */
201	pick_formats(graph);	201	pick_formats(graph);
202		202
203	return 0;	203	return 0;

libavfilter/defaults.c+5−1

 int avfilter_default_query_formats(AVFilterContext *ctx)
 {
-    avfilter_set_common_formats(ctx, avfilter_all_colorspaces());
+    enum AVMediaType type = ctx->inputs [0] ? ctx->inputs [0]->type :
+                            ctx->outputs[0] ? ctx->outputs[0]->type :
+                            AVMEDIA_TYPE_VIDEO;
+    avfilter_set_common_formats(ctx, avfilter_all_formats(type));
     return 0;
 }

libavfilter/formats.c+17−15

     return ret;
 }
-AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmts)
+AVFilterFormats *avfilter_make_format_list(const int *fmts)
 {
     AVFilterFormats *formats;
     int count;
-    for (count = 0; pix_fmts[count] != PIX_FMT_NONE; count++)
+    for (count = 0; fmts[count] != -1; count++)
         ;
     formats               = av_mallocz(sizeof(AVFilterFormats));
     formats->formats      = av_malloc(sizeof(*formats->formats) * count);
     formats->format_count = count;
-    memcpy(formats->formats, pix_fmts, sizeof(*formats->formats) * count);
+    memcpy(formats->formats, fmts, sizeof(*formats->formats) * count);
     return formats;
 }
-int avfilter_add_colorspace(AVFilterFormats **avff, enum PixelFormat pix_fmt)
+int avfilter_add_format(AVFilterFormats **avff, int fmt)
 {
-    enum PixelFormat *pix_fmts;
+    int *fmts;
     if (!(*avff) && !(*avff = av_mallocz(sizeof(AVFilterFormats))))
         return AVERROR(ENOMEM);
-    pix_fmts = av_realloc((*avff)->formats,
+    fmts = av_realloc((*avff)->formats,
-                          sizeof((*avff)->formats) * ((*avff)->format_count+1));
+                      sizeof((*avff)->formats) * ((*avff)->format_count+1));
-    if (!pix_fmts)
+    if (!fmts)
         return AVERROR(ENOMEM);
-    (*avff)->formats = pix_fmts;
+    (*avff)->formats = fmts;
-    (*avff)->formats[(*avff)->format_count++] = pix_fmt;
+    (*avff)->formats[(*avff)->format_count++] = fmt;
     return 0;
 }
-AVFilterFormats *avfilter_all_colorspaces(void)
+AVFilterFormats *avfilter_all_formats(enum AVMediaType type)
 {
     AVFilterFormats *ret = NULL;
-    enum PixelFormat pix_fmt;
+    int fmt;
+    int num_formats = type == AVMEDIA_TYPE_VIDEO ? PIX_FMT_NB : 0;
-    for (pix_fmt = 0; pix_fmt < PIX_FMT_NB; pix_fmt++)
+    for (fmt = 0; fmt < num_formats; fmt++)
-        if (!(av_pix_fmt_descriptors[pix_fmt].flags & PIX_FMT_HWACCEL))
+        if ((type != AVMEDIA_TYPE_VIDEO) ||
-            avfilter_add_colorspace(&ret, pix_fmt);
+            (type == AVMEDIA_TYPE_VIDEO && !(av_pix_fmt_descriptors[fmt].flags & PIX_FMT_HWACCEL)))
+            avfilter_add_format(&ret, fmt);
     return ret;
 }

libavfilter/vf_scale.c+2−2

@@ -83,7 +83,7 @@ static int query_formats(AVFilterContext *ctx) · 82 unmodified lines
83	formats = NULL;	83	formats = NULL;
84	for (pix_fmt = 0; pix_fmt < PIX_FMT_NB; pix_fmt++)	84	for (pix_fmt = 0; pix_fmt < PIX_FMT_NB; pix_fmt++)
85	if ( sws_isSupportedInput(pix_fmt)	85	if ( sws_isSupportedInput(pix_fmt)
86	&& (ret = avfilter_add_colorspace(&formats, pix_fmt)) < 0) {	86	&& (ret = avfilter_add_format(&formats, pix_fmt)) < 0) {
87	avfilter_formats_unref(&formats);	87	avfilter_formats_unref(&formats);
88	return ret;	88	return ret;
89	}	89	}
@@ -93,7 +93,7 @@ static int query_formats(AVFilterContext *ctx) · 3 unmodified lines
93	formats = NULL;	93	formats = NULL;
94	for (pix_fmt = 0; pix_fmt < PIX_FMT_NB; pix_fmt++)	94	for (pix_fmt = 0; pix_fmt < PIX_FMT_NB; pix_fmt++)
95	if ( sws_isSupportedOutput(pix_fmt)	95	if ( sws_isSupportedOutput(pix_fmt)
96	&& (ret = avfilter_add_colorspace(&formats, pix_fmt)) < 0) {	96	&& (ret = avfilter_add_format(&formats, pix_fmt)) < 0) {
97	avfilter_formats_unref(&formats);	97	avfilter_formats_unref(&formats);
98	return ret;	98	return ret;
99	}	99	}

Generalize pixel format enum fields to int formats.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code