Showing the changes to libavfilter/avfilter.h (1 of 6 files). Show all
Unified · Split
| @@ -29,7 +29,7 @@ · 28 unmodified lines | |||
| 29 | #include "libavutil/rational.h" | 29 | #include "libavutil/rational.h" |
| 30 | 30 | ||
| 31 | #define LIBAVFILTER_VERSION_MAJOR 2 | 31 | #define LIBAVFILTER_VERSION_MAJOR 2 |
| 32 | #define LIBAVFILTER_VERSION_MINOR 26 | 32 | #define LIBAVFILTER_VERSION_MINOR 27 |
| 33 | #define LIBAVFILTER_VERSION_MICRO 0 | 33 | #define LIBAVFILTER_VERSION_MICRO 0 |
| 34 | 34 | ||
| 35 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | 35 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |
| @@ -264,6 +264,11 @@ AVFilterFormats *avfilter_all_formats(enum AVMediaType type); · 228 unmodified lines | |||
| 264 | */ | 264 | */ |
| 265 | AVFilterFormats *avfilter_all_channel_layouts(void); | 265 | AVFilterFormats *avfilter_all_channel_layouts(void); |
| 266 | 266 | ||
| 267 | /** | ||
| 268 | * Return a list of all audio packing formats. | ||
| 269 | */ | ||
| 270 | AVFilterFormats *avfilter_all_packing_formats(void); | ||
| 271 | |||
| 267 | /** | 272 | /** |
| 268 | * Return a format list which contains the intersection of the formats of | 273 | * Return a format list which contains the intersection of the formats of |
| 269 | * a and b. Also, all the references of a, all the references of b, and | 274 | * a and b. Also, all the references of a, all the references of b, and |
| @@ -482,6 +487,7 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per · 212 unmodified lines | |||
| 482 | void avfilter_set_common_pixel_formats(AVFilterContext *ctx, AVFilterFormats *formats); | 487 | void avfilter_set_common_pixel_formats(AVFilterContext *ctx, AVFilterFormats *formats); |
| 483 | void avfilter_set_common_sample_formats(AVFilterContext *ctx, AVFilterFormats *formats); | 488 | void avfilter_set_common_sample_formats(AVFilterContext *ctx, AVFilterFormats *formats); |
| 484 | void avfilter_set_common_channel_layouts(AVFilterContext *ctx, AVFilterFormats *formats); | 489 | void avfilter_set_common_channel_layouts(AVFilterContext *ctx, AVFilterFormats *formats); |
| 490 | void avfilter_set_common_packing_formats(AVFilterContext *ctx, AVFilterFormats *formats); | ||
| 485 | 491 | ||
| 486 | /** Default handler for query_formats() */ | 492 | /** Default handler for query_formats() */ |
| 487 | int avfilter_default_query_formats(AVFilterContext *ctx); | 493 | int avfilter_default_query_formats(AVFilterContext *ctx); |
| @@ -570,6 +576,11 @@ struct AVFilterContext { · 82 unmodified lines | |||
| 570 | void *priv; ///< private data for use by the filter | 576 | void *priv; ///< private data for use by the filter |
| 571 | }; | 577 | }; |
| 572 | 578 | ||
| 579 | enum AVFilterPacking { | ||
| 580 | AVFILTER_PACKED = 0, | ||
| 581 | AVFILTER_PLANAR, | ||
| 582 | }; | ||
| 583 | |||
| 573 | /** | 584 | /** |
| 574 | * A link between two filters. This contains pointers to the source and | 585 | * A link between two filters. This contains pointers to the source and |
| 575 | * destination filters between which this link exists, and the indexes of | 586 | * destination filters between which this link exists, and the indexes of |
| @@ -597,9 +608,10 @@ struct AVFilterLink { · 21 unmodified lines | |||
| 597 | int w; ///< agreed upon image width | 608 | int w; ///< agreed upon image width |
| 598 | int h; ///< agreed upon image height | 609 | int h; ///< agreed upon image height |
| 599 | AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio | 610 | AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio |
| 600 | /* These two parameters apply only to audio */ | 611 | /* These parameters apply only to audio */ |
| 601 | int64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h) | 612 | int64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h) |
| 602 | int64_t sample_rate; ///< samples per second | 613 | int64_t sample_rate; ///< samples per second |
| 614 | int planar; ///< agreed upon packing mode of audio buffers. true if planar. | ||
| 603 | 615 | ||
| 604 | int format; ///< agreed upon media format | 616 | int format; ///< agreed upon media format |
| 605 | 617 | ||
| @@ -615,6 +627,8 @@ struct AVFilterLink { · 9 unmodified lines | |||
| 615 | 627 | ||
| 616 | AVFilterFormats *in_chlayouts; | 628 | AVFilterFormats *in_chlayouts; |
| 617 | AVFilterFormats *out_chlayouts; | 629 | AVFilterFormats *out_chlayouts; |
| 630 | AVFilterFormats *in_packing; | ||
| 631 | AVFilterFormats *out_packing; | ||
| 618 | 632 | ||
| 619 | /** | 633 | /** |
| 620 | * The buffer reference currently being sent across the link by the source | 634 | * The buffer reference currently being sent across the link by the source |