lavfi/abuffersink: add sample_rates field to AVABufferSinkParams

Allow to select sample rates.

Stefano Sabatini committed 13 years ago

Commit b59cd081 parent 5085b464 files · +19 −1Browse files

Unified · Split

4 files

@@ -15,6 +15,9 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2013-02-24 - xxxxxx - lavfi 3.41.100 - buffersink.h
		19	Add sample_rates field to AVABufferSinkParams.
		20
18	2013-01-17 - a1a707f - lavf 54.61.100	21	2013-01-17 - a1a707f - lavf 54.61.100
19	Add av_codec_get_tag2().	22	Add av_codec_get_tag2().
20		23

@@ -48,6 +48,7 @@ typedef struct { · 47 unmodified lines
48	const int64_t *channel_layouts; ///< list of allowed channel layouts, terminated by -1	48	const int64_t *channel_layouts; ///< list of allowed channel layouts, terminated by -1
49	const int *channel_counts; ///< list of allowed channel counts, terminated by -1	49	const int *channel_counts; ///< list of allowed channel counts, terminated by -1
50	int all_channel_counts; ///< if not 0, accept any channel count or layout	50	int all_channel_counts; ///< if not 0, accept any channel count or layout
		51	int *sample_rates; ///< list of allowed sample rates, terminated by -1
51	} AVABufferSinkParams;	52	} AVABufferSinkParams;
52		53
53	/**	54	/**

     enum AVSampleFormat *sample_fmts;       ///< list of accepted sample formats, terminated by AV_SAMPLE_FMT_NONE
     int64_t *channel_layouts;               ///< list of accepted channel layouts, terminated by -1
     int all_channel_counts;
+    int *sample_rates;                      ///< list of accepted sample rates, terminated by -1
 } BufferSinkContext;
 #define FIFO_INIT_SIZE 8
         if (!buf->sample_fmts)
             return AVERROR(ENOMEM);
     }
+    if (params && params->sample_rates) {
+        buf->sample_rates = ff_copy_int_list(params->sample_rates);
+        if (!buf->sample_rates)
+            return AVERROR(ENOMEM);
+    }
     if (params && (params->channel_layouts || params->channel_counts)) {
         if (params->all_channel_counts) {
             av_log(ctx, AV_LOG_ERROR,
     BufferSinkContext *buf = ctx->priv;
     av_freep(&buf->sample_fmts);
+    av_freep(&buf->sample_rates);
     av_freep(&buf->channel_layouts);
     common_uninit(ctx);
 }
         ff_set_common_channel_layouts(ctx, layouts);
     }
+    if (buf->sample_rates) {
+        formats = ff_make_format_list(buf->sample_rates);
+        if (!formats)
+            return AVERROR(ENOMEM);
+        ff_set_common_samplerates(ctx, formats);
+    }
     return 0;
 }

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	#include "libavutil/avutil.h"	29	#include "libavutil/avutil.h"
30		30
31	#define LIBAVFILTER_VERSION_MAJOR 3	31	#define LIBAVFILTER_VERSION_MAJOR 3
32	#define LIBAVFILTER_VERSION_MINOR 40	32	#define LIBAVFILTER_VERSION_MINOR 41
33	#define LIBAVFILTER_VERSION_MICRO 100	33	#define LIBAVFILTER_VERSION_MICRO 100
34		34
35	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \	35	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \

Keyboard shortcuts