Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
F
ffworker
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Video AG Infrastruktur
ffworker
Commits
b6ebc494
Commit
b6ebc494
authored
Nov 01, 2017
by
Julian Rother
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Got rid of JSTR_SIZE
parent
9d277ec9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
21 deletions
+14
-21
remux.c
remux.c
+3
-4
thumbnail.c
thumbnail.c
+3
-3
util.h
util.h
+3
-3
util/json.c
util/json.c
+5
-11
No files found.
remux.c
View file @
b6ebc494
...
...
@@ -9,13 +9,12 @@ static AVRational chapter_time_base = {1, 1};
void
parse_dict
(
AVDictionary
**
d
,
char
*
s
)
{
char
*
val
;
char
key
[
JSTR_SIZE
],
value
[
JSTR_SIZE
];
for
(
s
=
jenter
(
s
);
s
;
s
=
jnext
(
s
))
{
if
(
val
=
jstr
b
(
jvalue
(
s
),
0
,
value
))
av_dict_set
(
d
,
jstr
b
(
s
,
0
,
key
),
val
,
0
);
if
(
val
=
jstr
(
jvalue
(
s
),
0
))
av_dict_set
(
d
,
jstr
(
s
,
0
),
val
,
0
);
else
av_dict_set_int
(
d
,
jstr
b
(
s
,
0
,
key
),
jint
(
jvalue
(
s
),
0
),
0
);
av_dict_set_int
(
d
,
jstr
(
s
,
0
),
jint
(
jvalue
(
s
),
0
),
0
);
}
}
...
...
thumbnail.c
View file @
b6ebc494
...
...
@@ -25,7 +25,7 @@ AVFrame *scale_frame(AVFrame *frame, enum AVPixelFormat pix_fmt,
int
main
(
int
argc
,
char
*
argv
[])
{
int
err
,
vidx
;
char
lectureid
[
JSTR_SIZE
],
*
src
,
*
tmp
,
*
dest
;
char
*
src
,
*
tmp
,
*
dest
;
AVFormatContext
*
demux
,
*
mux
;
AVCodecContext
*
dec
,
*
enc
;
AVPacket
pkt
;
...
...
@@ -37,10 +37,10 @@ int main(int argc, char *argv[])
/* Prepare arguments */
jobid
=
atoi
(
argv
[
1
]);
jstrb
(
jlookup
(
argv
[
4
],
"lectureid"
),
"-1"
,
lectureid
);
src
=
mprintf
(
"%s/%s"
,
CONFIG_VIDEOS_RELEASED
,
jstr
(
jlookup
(
argv
[
4
],
"path"
),
""
));
tmp
=
mprintf
(
"%s/.tmp-%i"
,
CONFIG_VIDEOS_TMP
,
jobid
);
dest
=
mprintf
(
"%s/thumbnail/l_%s.jpg"
,
CONFIG_VIDEOS_RELEASED
,
lectureid
);
dest
=
mprintf
(
"%s/thumbnail/l_%s.jpg"
,
CONFIG_VIDEOS_RELEASED
,
jstr
(
jlookup
(
argv
[
4
],
"lectureid"
),
"0"
));
ping_job
(
jobid
,
"running"
,
0
);
/* Open src */
...
...
util.h
View file @
b6ebc494
...
...
@@ -19,11 +19,11 @@ int ping_job(int id, char *state, char *status, ...);
void
job_failed
(
char
*
msg
,
...);
/* JSON parser */
#define JS
TR
_SIZE 100
#define JS
ON_KEY
_SIZE 100
ssize_t
jbin
(
char
*
s
,
char
*
buf
,
size_t
len
);
char
*
jstrb
(
char
*
s
,
char
*
err
,
char
*
buf
);
char
*
jstr
(
char
*
s
,
char
*
err
);
char
*
jstrb
(
char
*
s
,
char
*
err
,
char
*
buf
,
size_t
len
);
#define jstr(s, e) jstrb(s, e, (char[JSON_KEY_SIZE]){0}, JSON_KEY_SIZE)
int
jint
(
char
*
s
,
int
err
);
char
*
jenter
(
char
*
s
);
char
*
jnext
(
char
*
s
);
...
...
util/json.c
View file @
b6ebc494
...
...
@@ -135,22 +135,16 @@ ssize_t jbin(char *s, char *buf, size_t len)
return
i
;
}
char
*
jstrb
(
char
*
s
,
char
*
err
,
char
*
buf
)
char
*
jstrb
(
char
*
s
,
char
*
err
,
char
*
buf
,
size_t
len
)
{
ssize_t
res
;
res
=
jbin
(
s
,
buf
,
JSTR_SIZE
);
if
(
res
==
-
1
||
res
+
1
>=
JSTR_SIZE
)
res
=
jbin
(
s
,
buf
,
len
);
if
(
res
==
-
1
||
res
+
1
>=
len
)
return
err
;
buf
[
res
]
=
0
;
return
buf
;
}
char
*
jstr
(
char
*
s
,
char
*
err
)
{
static
__thread
char
buf
[
JSTR_SIZE
];
return
jstrb
(
s
,
err
,
buf
);
}
int
jint
(
char
*
s
,
int
err
)
{
if
(
!
s
)
...
...
@@ -199,14 +193,14 @@ char *jvalue(char *s)
char
*
jlookup
(
char
*
s
,
char
*
key
)
{
static
__thread
char
buf
[
JS
TR
_SIZE
];
static
__thread
char
buf
[
JS
ON_KEY
_SIZE
];
if
(
!
s
)
return
0
;
s
=
skip_ws
(
s
);
if
(
*
s
!=
'{'
)
return
0
;
for
(
s
=
skip_ws
(
s
+
1
);
s
;
s
=
jnext
(
s
))
if
(
!
strcmp
(
jstrb
(
s
,
"INVALID KEY"
,
buf
),
key
))
if
(
!
strcmp
(
jstrb
(
s
,
"INVALID KEY"
,
BL
(
buf
)
),
key
))
return
jvalue
(
s
);
return
0
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment