lavfi: add audio channel packing negotiation fields

Mina Nagy Zaki committed 15 years ago

Commit b57df291 parent 7bda0c96 files · +51 −3Browse files

Unified · Split

6 files

doc/APIchanges +8 −0
libavfilter/avfilter.c +3 −0
libavfilter/avfilter.h +16 −2
libavfilter/avfiltergraph.c +5 −1
libavfilter/defaults.c +8 −0
libavfilter/formats.c +11 −0

@@ -13,6 +13,14 @@ libavutil: 2011-04-18 · 12 unmodified lines
13		13
14	API changes, most recent first:	14	API changes, most recent first:
15		15
		16	2011-07-16 - xxxxxx - lavfi 2.27.0
		17	Add audio packing negotiation fields and helper functions.
		18
		19	In particular, add AVFilterPacking enum, planar, in_packings and
		20	out_packings fields to AVFilterLink, and the functions:
		21	avfilter_set_common_packing_formats()
		22	avfilter_all_packing_formats()
		23
16	2011-07-10 - a67c061 - lavf 53.3.0	24	2011-07-10 - a67c061 - lavf 53.3.0
17	Add avformat_find_stream_info(), deprecate av_find_stream_info().	25	Add avformat_find_stream_info(), deprecate av_find_stream_info().
18		26

libavfilter/avfilter.c+3−0

     if (link->out_chlayouts)
         avfilter_formats_changeref(&link->out_chlayouts,
                                    &filt->outputs[filt_dstpad_idx]->out_chlayouts);
+    if (link->out_packing)
+        avfilter_formats_changeref(&link->out_packing,
+                                   &filt->outputs[filt_dstpad_idx]->out_packing);
     return 0;
 }

libavfilter/avfilter.h+16−2

 #include "libavutil/rational.h"
 #define LIBAVFILTER_VERSION_MAJOR  2
-#define LIBAVFILTER_VERSION_MINOR 26
+#define LIBAVFILTER_VERSION_MINOR 27
 #define LIBAVFILTER_VERSION_MICRO  0
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
  */
 AVFilterFormats *avfilter_all_channel_layouts(void);
+/**
+ * Return a list of all audio packing formats.
+ */
+AVFilterFormats *avfilter_all_packing_formats(void);
 /**
  * Return a format list which contains the intersection of the formats of
  * a and b. Also, all the references of a, all the references of b, and
 void avfilter_set_common_pixel_formats(AVFilterContext *ctx, AVFilterFormats *formats);
 void avfilter_set_common_sample_formats(AVFilterContext *ctx, AVFilterFormats *formats);
 void avfilter_set_common_channel_layouts(AVFilterContext *ctx, AVFilterFormats *formats);
+void avfilter_set_common_packing_formats(AVFilterContext *ctx, AVFilterFormats *formats);
 /** Default handler for query_formats() */
 int avfilter_default_query_formats(AVFilterContext *ctx);
     void *priv;                     ///< private data for use by the filter
 };
+enum AVFilterPacking {
+    AVFILTER_PACKED = 0,
+    AVFILTER_PLANAR,
+};
 /**
  * A link between two filters. This contains pointers to the source and
  * destination filters between which this link exists, and the indexes of
     int w;                      ///< agreed upon image width
     int h;                      ///< agreed upon image height
     AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio
-    /* These two parameters apply only to audio */
+    /* These parameters apply only to audio */
     int64_t channel_layout;     ///< channel layout of current buffer (see libavutil/audioconvert.h)
     int64_t sample_rate;        ///< samples per second
+    int planar;                 ///< agreed upon packing mode of audio buffers. true if planar.
     int format;                 ///< agreed upon media format
     AVFilterFormats *in_chlayouts;
     AVFilterFormats *out_chlayouts;
+    AVFilterFormats *in_packing;
+    AVFilterFormats *out_packing;
     /**
      * The buffer reference currently being sent across the link by the source

libavfilter/avfiltergraph.c+5−1

         link->channel_layout = link->in_chlayouts->formats[0];
         avfilter_formats_unref(&link->in_chlayouts);
         avfilter_formats_unref(&link->out_chlayouts);
-    }
+        link->in_packing->format_count = 1;
+        link->planar = link->in_packing->formats[0] == AVFILTER_PLANAR;
+        avfilter_formats_unref(&link->in_packing);
+        avfilter_formats_unref(&link->out_packing);
+    }
 }
 static void pick_formats(AVFilterGraph *graph)

libavfilter/defaults.c+8−0

                        offsetof(AVFilterLink, out_chlayouts));
 }
+void avfilter_set_common_packing_formats(AVFilterContext *ctx, AVFilterFormats *formats)
+{
+    set_common_formats(ctx, formats, AVMEDIA_TYPE_AUDIO,
+                       offsetof(AVFilterLink, in_packing),
+                       offsetof(AVFilterLink, out_packing));
+}
 int avfilter_default_query_formats(AVFilterContext *ctx)
 {
     avfilter_set_common_pixel_formats(ctx, avfilter_all_formats(AVMEDIA_TYPE_VIDEO));
     avfilter_set_common_sample_formats(ctx, avfilter_all_formats(AVMEDIA_TYPE_AUDIO));
     avfilter_set_common_channel_layouts(ctx, avfilter_all_channel_layouts());
+    avfilter_set_common_packing_formats(ctx, avfilter_all_packing_formats());
     return 0;
 }

libavfilter/formats.c+11−0

@@ -173,6 +173,17 @@ AVFilterFormats *avfilter_all_channel_layouts(void) · 172 unmodified lines
173	return avfilter_make_format64_list(chlayouts);	173	return avfilter_make_format64_list(chlayouts);
174	}	174	}
175		175
		176	AVFilterFormats *avfilter_all_packing_formats(void)
		177	{
		178	static int packing[] = {
		179	AVFILTER_PACKED,
		180	AVFILTER_PLANAR,
		181	-1,
		182	};
		183
		184	return avfilter_make_format_list(packing);
		185	}
		186
176	void avfilter_formats_ref(AVFilterFormats f, AVFilterFormats *ref)	187	void avfilter_formats_ref(AVFilterFormats f, AVFilterFormats *ref)
177	{	188	{
178	*ref = f;	189	*ref = f;

lavfi: add audio channel packing negotiation fields

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code