ref: 951ebec82008fcbeda984c93464507ea56f0f857
parent: 2c3947b925768c048409dd3d64794c4304118469
author: Sigrid Haflínudóttir <ftrvxmtrx@gmail.com>
date: Sun Sep 20 17:15:29 EDT 2020
support updated mcfs
--- a/decoder_vpx.c
+++ b/decoder_vpx.c
@@ -53,6 +53,7 @@
f->crop.bottom = im->d_h;
yuv420_rgb24(im->w, im->h, im->planes[0], im->planes[1], im->planes[2], im->stride[0], im->stride[1], f->rgb, f->w*3);
vpx_img_free(im);
+ fprint(2, "%zd %zd %g\n", sf.timestamp, lasttimestamp, d->timebase);
f->dt = (sf.timestamp - lasttimestamp) * d->timebase * 1000000000ULL;
lasttimestamp = sf.timestamp;
--- a/misc.c
+++ b/misc.c
@@ -7,11 +7,11 @@
int nproc, debug;
static char *fmts[] = {- [FmtAV1] = "av01",
- [FmtVP9] = "vp09",
- [FmtVP8] = "vp08",
- [FmtH264] = "avc1",
- [FmtAAC] = "mp4a",
+ [FmtAV1] = "av1",
+ [FmtVP9] = "vp9",
+ [FmtVP8] = "vp8",
+ [FmtH264] = "h264",
+ [FmtAAC] = "aac",
[FmtOpus] = "opus",
};
--- a/stream.c
+++ b/stream.c
@@ -8,8 +8,8 @@
char *name;
Streamops *o;
}ops[] = {- {"ivf", &ivfops}, {"mc", &mcops},+ {"ivf", &ivfops}, {"audio", &audops},};
--- a/stream.h
+++ b/stream.h
@@ -17,6 +17,7 @@
/* audio */
FmtAAC,
FmtOpus,
+ FmtVorbis,
};
struct Streamframe {--- a/stream_audio.c
+++ b/stream_audio.c
@@ -12,6 +12,7 @@
static char *progs[] = {[FmtAAC] = "/bin/audio/aacdec",
[FmtOpus] = "/bin/audio/opusdec",
+ [FmtVorbis] = "/bin/audio/oggdec",
};
extern Streamops audops;
--- a/stream_mc.c
+++ b/stream_mc.c
@@ -37,8 +37,9 @@
audfmt(char *fmt)
{ static char *fmts[] = {- [FmtAAC] = "mp4a",
+ [FmtAAC] = "aac",
[FmtOpus] = "opus",
+ [FmtVorbis] = "vorbis",
};
int i;
@@ -59,8 +60,8 @@
Biobuf b;
char *argv[] = {"mcfs",
- "-i",
filename,
+ nil,
nil,
nil,
};
--
⑨