vp[89]enc: Properly convert between GStreamer and encoder timebase

... by switching numerator and denominator when scaling.

https://bugzilla.gnome.org/show_bug.cgi?id=749122

diff --git a/ext/vpx/gstvp8enc.c b/ext/vpx/gstvp8enc.c
index 2d9500d..364bfa3 100644 (file)
--- a/ext/vpx/gstvp8enc.c
+++ b/ext/vpx/gstvp8enc.c
@@ -1886,8 +1886,8 @@ gst_vp8_enc_drain (GstVideoEncoder * video_encoder)
 
   pts =
       gst_util_uint64_scale (encoder->last_pts,
-      encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND,
-      encoder->cfg.g_timebase.den);
+      encoder->cfg.g_timebase.den,
+      encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND);
 
   status = vpx_codec_encode (&encoder->encoder, NULL, pts, 0, flags, deadline);
   g_mutex_unlock (&encoder->encoder_lock);
@@ -2011,15 +2011,14 @@ gst_vp8_enc_handle_frame (GstVideoEncoder * video_encoder,
   g_mutex_lock (&encoder->encoder_lock);
   pts =
       gst_util_uint64_scale (frame->pts,
-      encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND,
-      encoder->cfg.g_timebase.den);
+      encoder->cfg.g_timebase.den,
+      encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND);
   encoder->last_pts = frame->pts;
 
   if (frame->duration != GST_CLOCK_TIME_NONE) {
     duration =
-        gst_util_uint64_scale (frame->duration,
-        encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND,
-        encoder->cfg.g_timebase.den);
+        gst_util_uint64_scale (frame->duration, encoder->cfg.g_timebase.den,
+        encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND);
     encoder->last_pts += frame->duration;
   } else {
     duration = 1;

diff --git a/ext/vpx/gstvp9enc.c b/ext/vpx/gstvp9enc.c
index c730341..4f272b4 100644 (file)
--- a/ext/vpx/gstvp9enc.c
+++ b/ext/vpx/gstvp9enc.c
@@ -1822,8 +1822,8 @@ gst_vp9_enc_drain (GstVideoEncoder * video_encoder)
 
   pts =
       gst_util_uint64_scale (encoder->last_pts,
-      encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND,
-      encoder->cfg.g_timebase.den);
+      encoder->cfg.g_timebase.den,
+      encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND);
 
   status = vpx_codec_encode (&encoder->encoder, NULL, pts, 0, flags, deadline);
   g_mutex_unlock (&encoder->encoder_lock);
@@ -1941,15 +1941,14 @@ gst_vp9_enc_handle_frame (GstVideoEncoder * video_encoder,
   g_mutex_lock (&encoder->encoder_lock);
   pts =
       gst_util_uint64_scale (frame->pts,
-      encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND,
-      encoder->cfg.g_timebase.den);
+      encoder->cfg.g_timebase.den,
+      encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND);
   encoder->last_pts = frame->pts;
 
   if (frame->duration != GST_CLOCK_TIME_NONE) {
     duration =
-        gst_util_uint64_scale (frame->duration,
-        encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND,
-        encoder->cfg.g_timebase.den);
+        gst_util_uint64_scale (frame->duration, encoder->cfg.g_timebase.den,
+        encoder->cfg.g_timebase.num * (GstClockTime) GST_SECOND);
     encoder->last_pts += frame->duration;
   } else {
     duration = 1;