summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2016-10-08 14:33:59 +0200
committerVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2016-10-19 18:21:29 +0200
commitb60e2df63d8e1c214021dfb8a2bc302ce03eb97a (patch)
treeecf58eec70798340c25609fe494c3eb25d33f064
parent56ace0022e906970cdb1de94cd9f4e96b49b0462 (diff)
downloadgstreamer-vaapi-b60e2df63d8e1c214021dfb8a2bc302ce03eb97a.tar.gz
encoder: h264,h265: fix regression in offset count
In commit dc35dafa a bug was introduced because I assumed that GST_CLOCK_TIME_NONE is zero when is -1. This patch fixes that mistake. https://bugzilla.gnome.org/show_bug.cgi?id=772259
-rw-r--r--gst-libs/gst/vaapi/gstvaapiencoder_h264.c2
-rw-r--r--gst-libs/gst/vaapi/gstvaapiencoder_h265.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_h264.c b/gst-libs/gst/vaapi/gstvaapiencoder_h264.c
index e213e6b4..377bcb68 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_h264.c
@@ -2446,7 +2446,7 @@ reset_properties (GstVaapiEncoderH264 * encoder)
encoder->cts_offset = gst_util_uint64_scale (GST_SECOND,
GST_VAAPI_ENCODER_FPS_D (encoder), GST_VAAPI_ENCODER_FPS_N (encoder));
else
- encoder->cts_offset = GST_CLOCK_TIME_NONE;
+ encoder->cts_offset = 0;
/* init max_frame_num, max_poc */
encoder->log2_max_frame_num =
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_h265.c b/gst-libs/gst/vaapi/gstvaapiencoder_h265.c
index 26569fc3..5513bb44 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder_h265.c
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_h265.c
@@ -1909,7 +1909,7 @@ reset_properties (GstVaapiEncoderH265 * encoder)
encoder->cts_offset = gst_util_uint64_scale (GST_SECOND,
GST_VAAPI_ENCODER_FPS_D (encoder), GST_VAAPI_ENCODER_FPS_N (encoder));
else
- encoder->cts_offset = GST_CLOCK_TIME_NONE;
+ encoder->cts_offset = 0;
/* init max_poc */
encoder->log2_max_pic_order_cnt =