Skip to content
Snippets Groups Projects
Commit 30c0a4cf authored by Julian Rother's avatar Julian Rother
Browse files

Moved checktime out of transcode.c and added calls to remux

parent a8ab6dea
No related branches found
No related tags found
No related merge requests found
...@@ -57,6 +57,8 @@ int main(int argc, char *argv[]) ...@@ -57,6 +57,8 @@ int main(int argc, char *argv[])
job_failed("Writing temporary file failed: %s", av_err2str(err)); job_failed("Writing temporary file failed: %s", av_err2str(err));
while (!av_read_frame(demux, &pkt)) while (!av_read_frame(demux, &pkt))
{ {
if (!checktime(30))
ping_job(jobid, "running", 0);
if (pkt.stream_index >= demux->nb_streams if (pkt.stream_index >= demux->nb_streams
|| idxmap[pkt.stream_index] == -1) || idxmap[pkt.stream_index] == -1)
continue; continue;
......
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <time.h>
#include <libavutil/opt.h> #include <libavutil/opt.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
...@@ -245,22 +244,6 @@ void connect_pads(AVFilterInOut **ins, AVFilterInOut **outs) ...@@ -245,22 +244,6 @@ void connect_pads(AVFilterInOut **ins, AVFilterInOut **outs)
} }
} }
int checktime(time_t min)
{
static struct timespec prev = {};
time_t delta;
struct timespec t;
clock_gettime(CLOCK_MONOTONIC, &t);
if (t.tv_sec < prev.tv_sec)
delta = min;
else
delta = t.tv_sec - prev.tv_sec;
if (delta < min)
return 1;
memcpy(&prev, &t, sizeof(prev));
return 0;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int err, i, progress, _progress; int err, i, progress, _progress;
......
...@@ -17,6 +17,7 @@ double fileduration(char *path); ...@@ -17,6 +17,7 @@ double fileduration(char *path);
size_t filesize(char *path); size_t filesize(char *path);
char *json_fileinfo(char *path); char *json_fileinfo(char *path);
void overwrite_check(char *path); void overwrite_check(char *path);
int checktime(time_t min);
#define WORKER_APIKEY "WORKER_APIKEY" #define WORKER_APIKEY "WORKER_APIKEY"
#define WORKER_APIBASE "WORKER_APIBASE" #define WORKER_APIBASE "WORKER_APIBASE"
......
#include <time.h>
#include <string.h>
#include "../util.h"
int checktime(time_t min)
{
static struct timespec prev = {};
time_t delta;
struct timespec t;
clock_gettime(CLOCK_MONOTONIC, &t);
if (t.tv_sec < prev.tv_sec)
delta = min;
else
delta = t.tv_sec - prev.tv_sec;
if (delta < min)
return 1;
memcpy(&prev, &t, sizeof(prev));
return 0;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment