Skip to content
This repository has been archived by the owner on Feb 16, 2023. It is now read-only.

vidmix: fix VIDEO_TIMEBASE #118

Merged
merged 1 commit into from
Dec 30, 2022
Merged

vidmix: fix VIDEO_TIMEBASE #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion include/rem_vidmix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct vidmix_source;
* @param frame Video frame
* @param arg Handler argument
*/
typedef void (vidmix_frame_h)(uint32_t ts, const struct vidframe *frame,
typedef void (vidmix_frame_h)(uint64_t ts, const struct vidframe *frame,
void *arg);

int vidmix_alloc(struct vidmix **mixp);
Expand Down
21 changes: 13 additions & 8 deletions src/vidmix/vidmix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
#include <rem_vidconv.h>
#include <rem_vidmix.h>

/*
* Clock-rate for video timestamp
*/
#define VIDEO_TIMEBASE 1000000U


struct vidmix {
mtx_t rwlock;
Expand Down Expand Up @@ -186,7 +191,7 @@ static int vidmix_thread(void *arg)
{
struct vidmix_source *src = arg;
struct vidmix *mix = src->mix;
uint64_t ts = tmr_jiffies();
uint64_t ts = tmr_jiffies_usec();

mtx_lock(&src->mutex);

Expand All @@ -200,7 +205,7 @@ static int vidmix_thread(void *arg)
sys_usleep(4000);
mtx_lock(&src->mutex);

now = tmr_jiffies();
now = tmr_jiffies_usec();

if (ts > now)
continue;
Expand Down Expand Up @@ -258,7 +263,7 @@ static int vidmix_thread(void *arg)

mtx_unlock(&mix->rwlock);

src->fh((uint32_t)ts * 90, src->frame_tx, src->arg);
src->fh(ts, src->frame_tx, src->arg);

ts += src->fint;
}
Expand All @@ -273,7 +278,7 @@ static int content_thread(void *arg)
{
struct vidmix_source *src = arg;
struct vidmix *mix = src->mix;
uint64_t ts = tmr_jiffies();
uint64_t ts = tmr_jiffies_usec();

mtx_lock(&src->mutex);

Expand All @@ -286,7 +291,7 @@ static int content_thread(void *arg)
sys_usleep(4000);
mtx_lock(&src->mutex);

now = tmr_jiffies();
now = tmr_jiffies_usec();

if (ts > now)
continue;
Expand All @@ -300,7 +305,7 @@ static int content_thread(void *arg)
if (!lsrc->content || !lsrc->frame_rx || lsrc == src)
continue;

src->fh((uint32_t)ts * 90, lsrc->frame_rx, src->arg);
src->fh(ts, lsrc->frame_rx, src->arg);
break;
}

Expand Down Expand Up @@ -380,7 +385,7 @@ int vidmix_source_alloc(struct vidmix_source **srcp, struct vidmix *mix,
return ENOMEM;

src->mix = mem_ref(mix);
src->fint = 1000/fps;
src->fint = VIDEO_TIMEBASE/fps;
src->content = content;
src->fh = fh;
src->arg = arg;
Expand Down Expand Up @@ -577,7 +582,7 @@ void vidmix_source_set_rate(struct vidmix_source *src, unsigned fps)
return;

mtx_lock(&src->mutex);
src->fint = 1000/fps;
src->fint = VIDEO_TIMEBASE/fps;
mtx_unlock(&src->mutex);
}

Expand Down