int width = ctx->inputs[LEFT]->w;
int height = ctx->inputs[LEFT]->h;
AVRational time_base = ctx->inputs[LEFT]->time_base;
+ AVRational frame_rate = ctx->inputs[LEFT]->frame_rate;
// check size and fps match on the other input
if (width != ctx->inputs[RIGHT]->w ||
return AVERROR_INVALIDDATA;
} else if (av_cmp_q(time_base, ctx->inputs[RIGHT]->time_base) != 0) {
av_log(ctx, AV_LOG_ERROR,
- "Left and right framerates differ (%d/%d vs %d/%d).\n",
+ "Left and right time bases differ (%d/%d vs %d/%d).\n",
time_base.num, time_base.den,
ctx->inputs[RIGHT]->time_base.num,
ctx->inputs[RIGHT]->time_base.den);
return AVERROR_INVALIDDATA;
+ } else if (av_cmp_q(frame_rate, ctx->inputs[RIGHT]->frame_rate) != 0) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Left and right framerates differ (%d/%d vs %d/%d).\n",
+ frame_rate.num, frame_rate.den,
+ ctx->inputs[RIGHT]->frame_rate.num,
+ ctx->inputs[RIGHT]->frame_rate.den);
+ return AVERROR_INVALIDDATA;
}
s->pix_desc = av_pix_fmt_desc_get(outlink->format);
switch (s->format) {
case AV_STEREO3D_FRAMESEQUENCE:
time_base.den *= 2;
+ frame_rate.num *= 2;
+
s->double_pts = AV_NOPTS_VALUE;
break;
case AV_STEREO3D_COLUMNS:
outlink->w = width;
outlink->h = height;
outlink->time_base = time_base;
+ outlink->frame_rate= frame_rate;
return 0;
}
-#tb 0: 1/25
+#tb 0: 1/50
0, 0, 0, 1, 152064, 0x05b789ef
0, 1, 1, 1, 152064, 0x05b789ef
0, 2, 2, 1, 152064, 0x4bb46551
-0, 3, 3, 1, 152064, 0x9dddf64a
-0, 4, 4, 1, 152064, 0x2a8380b0
-0, 5, 5, 1, 152064, 0x4de3b652
-0, 6, 6, 1, 152064, 0xedb5a8e6
-0, 7, 7, 1, 152064, 0xe20f7c23
-0, 8, 8, 1, 152064, 0x5ab58bac
-0, 9, 9, 1, 152064, 0x1f1b8026
-0, 10, 10, 1, 152064, 0x91373915
-0, 11, 11, 1, 152064, 0x02344760
-0, 12, 12, 1, 152064, 0x30f5fcd5
-0, 13, 13, 1, 152064, 0xc711ad61
-0, 14, 14, 1, 152064, 0x24eca223
+0, 3, 3, 1, 152064, 0x4bb46551
+0, 4, 4, 1, 152064, 0x9dddf64a
+0, 5, 5, 1, 152064, 0x9dddf64a
+0, 6, 6, 1, 152064, 0x2a8380b0
+0, 7, 7, 1, 152064, 0x2a8380b0
+0, 8, 8, 1, 152064, 0x4de3b652
+0, 9, 9, 1, 152064, 0x4de3b652
+0, 10, 10, 1, 152064, 0xedb5a8e6
+0, 11, 11, 1, 152064, 0xedb5a8e6
+0, 12, 12, 1, 152064, 0xe20f7c23
+0, 13, 13, 1, 152064, 0xe20f7c23
+0, 14, 14, 1, 152064, 0x5ab58bac