Add missing typecast and re-enable timestamp test

BUG=webm:701

Change-Id: I1d8a6e263fddb9e4cc6265a313011a18d18bbf9e

diff --git a/test/timestamp_test.cc b/test/timestamp_test.cc
index ba1cbce47bdbd5aa05ace7af84b5e0a0d53b3e0d..021ea621fbb4f327944b8b80c68493ea0664b6d4 100644 (file)
--- a/test/timestamp_test.cc
+++ b/test/timestamp_test.cc
@@ -100,6 +100,8 @@ TEST_P(TimestampTestVp9Only, TestVpxRollover) {
 
 VP8_INSTANTIATE_TEST_CASE(TimestampTest,
                           ::testing::Values(::libvpx_test::kTwoPassGood));
+VP8_INSTANTIATE_TEST_CASE(TimestampTestVp9Only,
+                          ::testing::Values(::libvpx_test::kTwoPassGood));
 VP9_INSTANTIATE_TEST_CASE(TimestampTest,
                           ::testing::Values(::libvpx_test::kTwoPassGood));
 VP9_INSTANTIATE_TEST_CASE(TimestampTestVp9Only,

diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
index eb04f67fa6c0e5542ceb9d8f0c0d576191445e8f..07ea52c053b52edaa3e76ae8c820259c7ce7716f 100644 (file)
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -912,8 +912,8 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t *ctx,
 
     dst_time_stamp =
         pts_val * ctx->timestamp_ratio.num / ctx->timestamp_ratio.den;
-    dst_end_time_stamp = (pts_val + duration) * ctx->timestamp_ratio.num /
-                         ctx->timestamp_ratio.den;
+    dst_end_time_stamp = (pts_val + (int64_t)duration) *
+                         ctx->timestamp_ratio.num / ctx->timestamp_ratio.den;
 
     if (img != NULL) {
       res = image2yuvconfig(img, &sd);