diff options
| author | Debargha Mukherjee <debargha@google.com> | 2019-12-05 19:14:41 -0800 |
|---|---|---|
| committer | Debargha Mukherjee <debargha@google.com> | 2019-12-05 19:15:53 -0800 |
| commit | 04383393e47142f801eda822277e12b9214bc63a (patch) | |
| tree | d9f751233b84aad38ed5984dc6ecfb194a30b892 | |
| parent | 1d49040369c3e553f13ffb1690c4a27a58796abd (diff) | |
| download | libvpx-04383393e47142f801eda822277e12b9214bc63a.tar libvpx-04383393e47142f801eda822277e12b9214bc63a.tar.gz libvpx-04383393e47142f801eda822277e12b9214bc63a.tar.bz2 libvpx-04383393e47142f801eda822277e12b9214bc63a.zip | |
Add missing typecast and re-enable timestamp test
BUG=webm:701
Change-Id: I1d8a6e263fddb9e4cc6265a313011a18d18bbf9e
| -rw-r--r-- | test/timestamp_test.cc | 2 | ||||
| -rw-r--r-- | vp8/vp8_cx_iface.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/timestamp_test.cc b/test/timestamp_test.cc index ba1cbce47..021ea621f 100644 --- 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 eb04f67fa..07ea52c05 100644 --- 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); |