@@ -1786,8 +1786,8 @@ TEST(EncodeAPI, Buganizer441668134) {
17861786
17871787// Encode a few frames, with realtime mode and tile_rows set to 1,
17881788// with row-mt enabled. This triggers an assertion in vp9_bitstream.c (in
1789- // function write_modes()), as in the issue:42105459 . In this test it happens on
1790- // very first encoded frame since lag_in_frames = 0. Issue is due to enabling
1789+ // function write_modes()), as in the issue:442105459 . In this test it happens
1790+ // on very first encoded frame since lag_in_frames = 0. Issue is due to enabling
17911791// TILE_ROWS, with number of tile_rows more than the number of superblocks.
17921792// This test sets 2 tile_rows with height corresponding to 1 superblock (sb).
17931793TEST (EncodeAPI, Buganizer442105459_2RowTiles) {
@@ -1825,7 +1825,7 @@ TEST(EncodeAPI, Buganizer442105459_2RowTiles) {
18251825 int num_frames = 2 ;
18261826 // Per-frame constants captured from the original run (indices consumed per
18271827 // frame)
1828- const unsigned long frame_pts_mul[] = { 33333UL , 33333UL };
1828+ const vpx_codec_pts_t frame_pts_mul[] = { 33333UL , 33333UL };
18291829 const unsigned long frame_durations[] = { 33333UL , 33333UL };
18301830 const vpx_enc_deadline_t frame_deadlines[] = { VPX_DL_REALTIME,
18311831 VPX_DL_REALTIME };
@@ -1838,10 +1838,10 @@ TEST(EncodeAPI, Buganizer442105459_2RowTiles) {
18381838 VPX_CODEC_OK);
18391839 }
18401840 // Flush encoder.
1841- ASSERT_EQ (vpx_codec_encode (&ctx, NULL , 0 , 0 , 0 , VPX_DL_REALTIME), 0 );
1841+ ASSERT_EQ (vpx_codec_encode (&ctx, nullptr , 0 , 0 , 0 , VPX_DL_REALTIME), 0 );
18421842 // Get remaining data
1843- vpx_codec_iter_t iter = NULL ;
1844- while (vpx_codec_get_cx_data (&ctx, &iter) != NULL ) {
1843+ vpx_codec_iter_t iter = nullptr ;
1844+ while (vpx_codec_get_cx_data (&ctx, &iter) != nullptr ) {
18451845 // Process remaining packets
18461846 }
18471847 vpx_img_free (img);
@@ -1850,8 +1850,8 @@ TEST(EncodeAPI, Buganizer442105459_2RowTiles) {
18501850
18511851// Encode a few frames, with realtime mode and tile_rows set to 1,
18521852// with row-mt enabled. This triggers an assertion in vp9_bitstream.c (in
1853- // function write_modes()), as in the issue:42105459 . In this test it happens on
1854- // very first encoded frame since lag_in_frames = 0. Issue is due to enabling
1853+ // function write_modes()), as in the issue:442105459 . In this test it happens
1854+ // on very first encoded frame since lag_in_frames = 0. Issue is due to enabling
18551855// TILE_ROWS, with number of tile_rows more than the number of superblocks.
18561856// This test sets 4 tile_rows with height corresponding to 3 superblocks.
18571857TEST (EncodeAPI, Buganizer442105459_4RowTiles) {
@@ -1889,7 +1889,7 @@ TEST(EncodeAPI, Buganizer442105459_4RowTiles) {
18891889 int num_frames = 2 ;
18901890 // Per-frame constants captured from the original run (indices consumed per
18911891 // frame)
1892- const unsigned long frame_pts_mul[] = { 33333UL , 33333UL };
1892+ const vpx_codec_pts_t frame_pts_mul[] = { 33333UL , 33333UL };
18931893 const unsigned long frame_durations[] = { 33333UL , 33333UL };
18941894 const vpx_enc_deadline_t frame_deadlines[] = { VPX_DL_REALTIME,
18951895 VPX_DL_REALTIME };
@@ -1902,10 +1902,10 @@ TEST(EncodeAPI, Buganizer442105459_4RowTiles) {
19021902 VPX_CODEC_OK);
19031903 }
19041904 // Flush encoder.
1905- ASSERT_EQ (vpx_codec_encode (&ctx, NULL , 0 , 0 , 0 , VPX_DL_REALTIME), 0 );
1905+ ASSERT_EQ (vpx_codec_encode (&ctx, nullptr , 0 , 0 , 0 , VPX_DL_REALTIME), 0 );
19061906 // Get remaining data
1907- vpx_codec_iter_t iter = NULL ;
1908- while (vpx_codec_get_cx_data (&ctx, &iter) != NULL ) {
1907+ vpx_codec_iter_t iter = nullptr ;
1908+ while (vpx_codec_get_cx_data (&ctx, &iter) != nullptr ) {
19091909 // Process remaining packets
19101910 }
19111911 vpx_img_free (img);
0 commit comments