Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

general uniforms support #21

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

general uniforms support #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68d6f4f
general uniforms support
turengege Jul 19, 2018
77f725a
fix wrong glsl name in example
turengege Jul 19, 2018
1eba414
fix uniform location check(0 is a valid uniform location)
turengege Jul 20, 2018
2a3e2ad
support two move Uniform variable data types: vec and ivec
turengege Jul 21, 2018
587e638
change the error message when no suitable data type is founded
turengege Jul 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,17 @@ Default Options:

Custom Options:
```bash
./ffmpeg -i media/0.mp4 -i media/1.mp4 -filter_complex "gltransition=duration=4:offset=1.5:source=crosswarp.glsl" -y out.mp4
./ffmpeg -i media/0.mp4 -i media/1.mp4 -filter_complex "gltransition=duration=4:offset=1.5:source=crosswarp.glsl,format=420p" -y out.mp4
```

Uniform Variables Setting:
- supported date types: `int`, `float`, `ivec`, `vec`
- use `vec2(1.0,2.0)` instead of `vec2(1.0, 2.0 )`, no spaces in `uniforms` arguments
- use `1.0` instead of `1` if the uniform variable is defined as float in glsl script;
```bash
ffmpeg -i media/0.mp4 -i media/1.mp4 -filter_complex "gltransition=duration=4:offset=1.5:source=WaterDrop.glsl:uniforms='amplitude=10.0&speed=15.5',format=yuv420p" -y out.mp4

ffmpeg -i media/0.mp4 -i media/1.mp4 -filter_complex "gltransition=duration=2:offset=1.5:source=fadecolor.glsl:uniforms='color=vec3(0.0,0.5,0.0)',format=yuv420p" -y out.mp4
```

Params:
Expand All @@ -147,9 +157,10 @@ There is no limit to the number of video streams you can concat together in one
- **support default values for gl-transition uniforms**
- this is the reason a lot of gl-transitions currently appear to not function properly
- remove restriction that both inputs be the same size
- support general gl-transition uniforms
- add gl-transition logic for aspect ratios and resize mode
- transpile webgl glsl to opengl glsl via angle
- support more data types of general uniform
- matrices

## Related

Expand Down
159 changes: 159 additions & 0 deletions vf_gltransition.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "libavutil/opt.h"
#include "internal.h"
#include "framesync.h"
#include "errno.h"

#ifndef __APPLE__
# define GL_TRANSITION_USING_EGL //remove this line if you don't want to use EGL
Expand Down Expand Up @@ -98,6 +99,7 @@ typedef struct {
double duration;
double offset;
char *source;
char *uniforms;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these uniforms should be freed in uninit

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think FFmpeg will do this cleaning up. I am not sure, will check it out later.


// timestamp of the first frame in the output, in the timebase units
int64_t first_pts;
Expand Down Expand Up @@ -132,11 +134,113 @@ static const AVOption gltransition_options[] = {
{ "duration", "transition duration in seconds", OFFSET(duration), AV_OPT_TYPE_DOUBLE, {.dbl=1.0}, 0, DBL_MAX, FLAGS },
{ "offset", "delay before startingtransition in seconds", OFFSET(offset), AV_OPT_TYPE_DOUBLE, {.dbl=0.0}, 0, DBL_MAX, FLAGS },
{ "source", "path to the gl-transition source file (defaults to basic fade)", OFFSET(source), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
{ "uniforms", "uniform vars setting, e.g. uniforms='some_var=1.0&other_var=1'", OFFSET(uniforms), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
{NULL}
};

typedef struct {
char **strings;
int len;
} StringArray_t;

FRAMESYNC_DEFINE_CLASS(gltransition, GLTransitionContext, fs);

static StringArray_t parseQueryString (const char *str_query) {
StringArray_t sa;
int offset = 0;
int offset_seg = 0;
int cursor_start = 0;
int cursor_end= 0;
int cnt_seg = 1;
auto len = (int) (strlen(str_query));
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's opt for strnlen_s here, as it's safer, and str_querymay be NULL.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will require users to use C11 if we choose strnlen_s, because FFmpeg seems to be built on C99 by default.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

str_query may be NULL


for (int i = 0; i < len; i++) {
if (str_query[i] == '=' || str_query[i] == '&') {
cnt_seg++;
}
}
char **strings = (char **) av_malloc(sizeof(char *) * cnt_seg);
sa.len = cnt_seg;

for (; offset <= len; offset++) {
if (str_query[offset] == '=' || str_query[offset] == '&' || offset == len) {
int word_len = cursor_end - cursor_start;
char *seg = (char *) malloc(sizeof(char) * (word_len+ 1));
strncpy(seg, str_query+cursor_start, (size_t)(word_len));
seg[word_len] = '\0';
strings [offset_seg] = seg;
offset_seg++;
cursor_end++;
cursor_start = cursor_end;
} else {
cursor_end++;
}
}
sa.strings = strings ;
return sa;
}


static int strToInt(char *to_convert, int *i) {
char *p = to_convert;
errno = 0;
*i = (int) strtol(to_convert, &p, 10);
if (errno != 0 || to_convert == p || *p != 0) {
return 0;
}
return 1;
}

static int strToFloat(char *to_convert, float *f) {
char *p = to_convert;
errno = 0;
*f = strtof(to_convert, &p);
if (errno != 0 || to_convert == p || *p != 0) {
return 0;
}
return 1;
}

#define STRING_SPLIT_DEFINE(type, Type) \
static void strSplit##Type(const char *strLiteral, const char *delimiter, type *pOutputs, int len) { \
char *token, *str, *tofree; \
int offset = 0; \
tofree = str = strdup(strLiteral); \
while ((token = strsep(&str, delimiter)) && offset < len) { \
type t; \
if (!strTo##Type(token, &t)) { \
t = (type)0; \
} \
pOutputs[offset] = t; \
offset++; \
} \
free(tofree); \
}

STRING_SPLIT_DEFINE(int, Int)
STRING_SPLIT_DEFINE(float, Float)

//assume that the string is compact
#define PARSE_GLSL_VECTOR(glType, typeLen, type, Type) \
static int parseGlSL##Type##Vector(const char* str,type *pOutput,int *pShape){ \
int len = (int)strlen(str); \
int bodyPos = typeLen + 2; \
if (memcmp(str,glType, typeLen) != 0) { \
return 0; \
} \
*pShape = (int) (str[typeLen] - '0'); \
int bodyLen = len - bodyPos; \
char *body = (char *) av_malloc(sizeof(char) * bodyLen); \
strncpy(body, str + bodyPos, (size_t) bodyLen - 1); \
body[bodyLen-1] = '\0'; \
strSplit##Type(body, ",", pOutput, *pShape); \
av_free(body); \
return 1; \
}

PARSE_GLSL_VECTOR("vec", 3, float, Float)
PARSE_GLSL_VECTOR("ivec", 4, int, Int)

static GLuint build_shader(AVFilterContext *ctx, const GLchar *shader_source, GLenum type)
{
GLuint shader = glCreateShader(type);
Expand Down Expand Up @@ -280,6 +384,61 @@ static void setup_uniforms(AVFilterLink *fromLink)
// TODO: initialize this in config_props for "to" input
c->_toR = glGetUniformLocation(c->program, "_toR");
glUniform1f(c->_toR, fromLink->w / (float)fromLink->h);

StringArray_t sa = parseQueryString(c->uniforms);
if(sa.len >0){
for(int i = 0;i<sa.len;i+=2){
GLint location = glGetUniformLocation(c->program, sa.strings[i]);
if (location >= 0) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's throw an error if this is not the case; better to be strict with potential errors here rather than ignoring it silently.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is an err message can't get location of uniform .. if location is not valid, but I agree that throwing an error is the right choice.

int intVar;
float floatVar;
int vecShape = 0;
int intVec[4] = {0};
float floatVec[4] = {0.0};
if (parseGlSLFloatVector(sa.strings[i + 1], floatVec, &vecShape)) {
switch (vecShape) {
case 2:
glUniform2f(location, floatVec[0], floatVec[1]);
break;
case 3:
glUniform3f(location, floatVec[0], floatVec[1], floatVec[2]);
break;
case 4:
glUniform4f(location, floatVec[0], floatVec[1], floatVec[2], floatVec[3]);
break;
default:
break;
}
} else if (parseGlSLIntVector(sa.strings[i + 1], intVec, &vecShape)) {
switch (vecShape) {
case 2:
glUniform2i(location, intVec[0], intVec[1]);
break;
case 3:
glUniform3i(location, intVec[0], intVec[1], intVec[2]);
break;
case 4:
glUniform4i(location, intVec[0], intVec[1], intVec[2], intVec[3]);
default:
break;
}
} else if (strToInt(sa.strings[i + 1], &intVar)) {
glUniform1i(location, intVar);
} else if (strToFloat(sa.strings[i + 1], &floatVar)) {
glUniform1f(location, floatVar);
} else {
av_log(ctx, AV_LOG_ERROR, "value %s not supported, supported: int float ivec vec)", sa.strings[i + 1]);
}
} else {
av_log(ctx, AV_LOG_ERROR, "can't get location of uniform: %s,fail set value: %s\n", sa.strings[i],
sa.strings[i + 1]);
}
}
//free strings;
for (int i = 0; i < sa.len; i++) {
free(sa.strings[i]);
}
}
}

static int setup_gl(AVFilterLink *inLink)
Expand Down