virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavfi/perms: add seed option.

Browse Source
This commit is contained in:
Clément Bœsch
2013-03-26 02:39:55 +01:00
parent e600d0628e
commit 9371467d9d
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/filters.texi
View File

@@ -6249,6 +6249,12 @@ Make the frame read-only if writable, and writable if read-only.
@item random @item random
Set each output frame read-only or writable randomly. Set each output frame read-only or writable randomly.
@end table @end table
@item seed
Set the seed for the @var{random} mode, must be an integer included between
@code{0} and @code{UINT32_MAX}. If not specified, or if explicitly set to
@code{-1}, the filter will try to use a good random seed on a best effort
basis.
@end table @end table
Note: in case of auto-inserted filter between the permission filter and the Note: in case of auto-inserted filter between the permission filter and the

14
libavfilter/f_perms.c
View File

@@ -34,6 +34,7 @@ enum mode {
typedef struct { typedef struct {
const AVClass *class; const AVClass *class;
AVLFG lfg; AVLFG lfg;
int64_t random_seed;
enum mode mode; enum mode mode;
} PermsContext; } PermsContext;
@@ -47,6 +48,7 @@ static const AVOption options[] = {
{ "rw", "set all output frames writable", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_RW}, INT_MIN, INT_MAX, FLAGS, "mode" }, { "rw", "set all output frames writable", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_RW}, INT_MIN, INT_MAX, FLAGS, "mode" },
{ "toggle", "switch permissions", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_TOGGLE}, INT_MIN, INT_MAX, FLAGS, "mode" }, { "toggle", "switch permissions", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_TOGGLE}, INT_MIN, INT_MAX, FLAGS, "mode" },
{ "random", "set permissions randomly", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_RANDOM}, INT_MIN, INT_MAX, FLAGS, "mode" }, { "random", "set permissions randomly", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_RANDOM}, INT_MIN, INT_MAX, FLAGS, "mode" },
{ "seed", "set the seed for the random mode", OFFSET(random_seed), AV_OPT_TYPE_INT64, {.i64 = -1}, -1, UINT32_MAX, FLAGS },
{ NULL } { NULL }
}; };
@@ -54,9 +56,15 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
{ {
PermsContext *perms = ctx->priv; PermsContext *perms = ctx->priv;
// TODO: add a seed option if (perms->mode == MODE_RANDOM) {
if (perms->mode == MODE_RANDOM) uint32_t seed;
av_lfg_init(&perms->lfg, av_get_random_seed());
if (perms->random_seed == -1)
perms->random_seed = av_get_random_seed();
seed = perms->random_seed;
av_log(ctx, AV_LOG_INFO, "random seed: 0x%08x\n", seed);
av_lfg_init(&perms->lfg, seed);
}
return 0; return 0;
} }

2
libavfilter/version.h
View File

@@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 48 #define LIBAVFILTER_VERSION_MINOR 48
#define LIBAVFILTER_VERSION_MICRO 104 #define LIBAVFILTER_VERSION_MICRO 105
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \