Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: Fix bad assertions in formats/mp4 and formats/mp2t tests (#1247) 

PR #1242 introduced some bad assertions that went unnoticed because we
are not yet building those modules in the cmake branch. This fixes those
so that ASSERT_ macros are not used in non-void functions, and so that
assumptions about a successful parse are always after an ASSERT_ that
the data was loaded properly.

All ASSERT_ macros from #1242 were audited, and the others were all
fine.
This commit is contained in:
Joey Parrish 2023-07-18 11:30:05 -07:00 committed by GitHub
parent 137e692406
commit c29c03c6e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packager/media/formats/mp2t/mp2t_media_parser_unittest.cc
View File

@ -122,17 +122,16 @@ class Mp2tMediaParserTest : public testing::Test {
InitializeParser(); InitializeParser();
std::vector<uint8_t> buffer = ReadTestDataFile(filename); std::vector<uint8_t> buffer = ReadTestDataFile(filename);
ASSERT_FALSE(buffer.empty()); if (buffer.empty())
EXPECT_TRUE(AppendDataInPieces(buffer.data(), return false;
buffer.size(),
append_bytes)); return AppendDataInPieces(buffer.data(), buffer.size(), append_bytes);
return true;
} }
}; };
TEST_F(Mp2tMediaParserTest, UnalignedAppend17_H264) { TEST_F(Mp2tMediaParserTest, UnalignedAppend17_H264) {
// Test small, non-segment-aligned appends. // Test small, non-segment-aligned appends.
ParseMpeg2TsFile("bear-640x360.ts", 17); ASSERT_TRUE(ParseMpeg2TsFile("bear-640x360.ts", 17));
EXPECT_EQ(79, video_frame_count_); EXPECT_EQ(79, video_frame_count_);
EXPECT_TRUE(parser_->Flush()); EXPECT_TRUE(parser_->Flush());
EXPECT_EQ(82, video_frame_count_); EXPECT_EQ(82, video_frame_count_);
@ -140,7 +139,7 @@ TEST_F(Mp2tMediaParserTest, UnalignedAppend17_H264) {
TEST_F(Mp2tMediaParserTest, UnalignedAppend512_H264) { TEST_F(Mp2tMediaParserTest, UnalignedAppend512_H264) {
// Test small, non-segment-aligned appends. // Test small, non-segment-aligned appends.
ParseMpeg2TsFile("bear-640x360.ts", 512); ASSERT_TRUE(ParseMpeg2TsFile("bear-640x360.ts", 512));
EXPECT_EQ(79, video_frame_count_); EXPECT_EQ(79, video_frame_count_);
EXPECT_TRUE(parser_->Flush()); EXPECT_TRUE(parser_->Flush());
EXPECT_EQ(82, video_frame_count_); EXPECT_EQ(82, video_frame_count_);
@ -148,7 +147,7 @@ TEST_F(Mp2tMediaParserTest, UnalignedAppend512_H264) {
TEST_F(Mp2tMediaParserTest, UnalignedAppend17_H265) { TEST_F(Mp2tMediaParserTest, UnalignedAppend17_H265) {
// Test small, non-segment-aligned appends. // Test small, non-segment-aligned appends.
ParseMpeg2TsFile("bear-640x360-hevc.ts", 17); ASSERT_TRUE(ParseMpeg2TsFile("bear-640x360-hevc.ts", 17));
EXPECT_EQ(78, video_frame_count_); EXPECT_EQ(78, video_frame_count_);
EXPECT_TRUE(parser_->Flush()); EXPECT_TRUE(parser_->Flush());
EXPECT_EQ(82, video_frame_count_); EXPECT_EQ(82, video_frame_count_);
@ -156,7 +155,7 @@ TEST_F(Mp2tMediaParserTest, UnalignedAppend17_H265) {
TEST_F(Mp2tMediaParserTest, UnalignedAppend512_H265) { TEST_F(Mp2tMediaParserTest, UnalignedAppend512_H265) {
// Test small, non-segment-aligned appends. // Test small, non-segment-aligned appends.
ParseMpeg2TsFile("bear-640x360-hevc.ts", 512); ASSERT_TRUE(ParseMpeg2TsFile("bear-640x360-hevc.ts", 512));
EXPECT_EQ(78, video_frame_count_); EXPECT_EQ(78, video_frame_count_);
EXPECT_TRUE(parser_->Flush()); EXPECT_TRUE(parser_->Flush());
EXPECT_EQ(82, video_frame_count_); EXPECT_EQ(82, video_frame_count_);
@ -166,7 +165,7 @@ TEST_F(Mp2tMediaParserTest, TimestampWrapAround) {
// "bear-640x360_ptszero_dtswraparound.ts" has been transcoded from // "bear-640x360_ptszero_dtswraparound.ts" has been transcoded from
// bear-640x360.mp4 by applying a time offset of 95442s (close to 2^33 / // bear-640x360.mp4 by applying a time offset of 95442s (close to 2^33 /
// 90000) which results in timestamp wrap around in the Mpeg2 TS stream. // 90000) which results in timestamp wrap around in the Mpeg2 TS stream.
ParseMpeg2TsFile("bear-640x360_ptswraparound.ts", 512); ASSERT_TRUE(ParseMpeg2TsFile("bear-640x360_ptswraparound.ts", 512));
EXPECT_TRUE(parser_->Flush()); EXPECT_TRUE(parser_->Flush());
EXPECT_EQ(82, video_frame_count_); EXPECT_EQ(82, video_frame_count_);
EXPECT_LT(video_min_dts_, static_cast<int64_t>(1) << 33); EXPECT_LT(video_min_dts_, static_cast<int64_t>(1) << 33);
@ -177,7 +176,7 @@ TEST_F(Mp2tMediaParserTest, PtsZeroDtsWrapAround) {
// "bear-640x360.ts" has been transcoded from bear-640x360.mp4 by applying a // "bear-640x360.ts" has been transcoded from bear-640x360.mp4 by applying a
// dts (close to 2^33 / 90000) and pts 1433 which results in dts // dts (close to 2^33 / 90000) and pts 1433 which results in dts
// wrap around in the Mpeg2 TS stream but pts does not. // wrap around in the Mpeg2 TS stream but pts does not.
ParseMpeg2TsFile("bear-640x360_ptszero_dtswraparound.ts", 512); ASSERT_TRUE(ParseMpeg2TsFile("bear-640x360_ptszero_dtswraparound.ts", 512));
EXPECT_TRUE(parser_->Flush()); EXPECT_TRUE(parser_->Flush());
EXPECT_EQ(64, video_frame_count_); EXPECT_EQ(64, video_frame_count_);
// DTS was subjected to unroll // DTS was subjected to unroll

25
packager/media/formats/mp4/mp4_media_parser_unittest.cc
View File

@ -108,7 +108,8 @@ class MP4MediaParserTest : public testing::Test {
return false; return false;
std::vector<uint8_t> buffer = ReadTestDataFile(filename); std::vector<uint8_t> buffer = ReadTestDataFile(filename);
ASSERT_FALSE(buffer.empty()); if (buffer.empty())
return false;
return AppendDataInPieces(buffer.data(), buffer.size(), append_bytes); return AppendDataInPieces(buffer.data(), buffer.size(), append_bytes);
} }
@ -117,7 +118,7 @@ class MP4MediaParserTest : public testing::Test {
TEST_F(MP4MediaParserTest, UnalignedAppend) { TEST_F(MP4MediaParserTest, UnalignedAppend) {
// Test small, non-segment-aligned appends (small enough to exercise // Test small, non-segment-aligned appends (small enough to exercise
// incremental append system) // incremental append system)
EXPECT_TRUE(ParseMP4File("bear-640x360-av_frag.mp4", 512)); ASSERT_TRUE(ParseMP4File("bear-640x360-av_frag.mp4", 512));
EXPECT_EQ(2u, num_streams_); EXPECT_EQ(2u, num_streams_);
EXPECT_EQ(201u, num_samples_); EXPECT_EQ(201u, num_samples_);
} }
@ -126,7 +127,7 @@ TEST_F(MP4MediaParserTest, UnalignedAppend) {
// the container has a 'pasp' box. // the container has a 'pasp' box.
TEST_F(MP4MediaParserTest, PixelWidthPixelHeightFromPaspBox) { TEST_F(MP4MediaParserTest, PixelWidthPixelHeightFromPaspBox) {
// This content has a 'pasp' box that has the aspect ratio. // This content has a 'pasp' box that has the aspect ratio.
EXPECT_TRUE(ParseMP4File("bear-640x360-non_square_pixel-with_pasp.mp4", 512)); ASSERT_TRUE(ParseMP4File("bear-640x360-non_square_pixel-with_pasp.mp4", 512));
const int kVideoTrackId = 1; const int kVideoTrackId = 1;
EXPECT_EQ(8u, EXPECT_EQ(8u,
@ -144,7 +145,7 @@ TEST_F(MP4MediaParserTest,
PixelWidthPixelHeightFromAVCDecoderConfigurationRecord) { PixelWidthPixelHeightFromAVCDecoderConfigurationRecord) {
// This file doesn't have pasp. The stream should extract pixel width and // This file doesn't have pasp. The stream should extract pixel width and
// height from SPS. // height from SPS.
EXPECT_TRUE( ASSERT_TRUE(
ParseMP4File("bear-640x360-non_square_pixel-without_pasp.mp4", 512)); ParseMP4File("bear-640x360-non_square_pixel-without_pasp.mp4", 512));
const int kVideoTrackId = 1; const int kVideoTrackId = 1;
@ -164,7 +165,7 @@ TEST_F(MP4MediaParserTest,
// This file doesn't have pasp. SPS for the video has // This file doesn't have pasp. SPS for the video has
// sar_width = sar_height = 0. So the stream info should return 1 for both // sar_width = sar_height = 0. So the stream info should return 1 for both
// pixel_width and pixel_height. // pixel_width and pixel_height.
EXPECT_TRUE(ParseMP4File("bear-640x360-av_frag.mp4", 512)); ASSERT_TRUE(ParseMP4File("bear-640x360-av_frag.mp4", 512));
const int kVideoTrackId = 1; const int kVideoTrackId = 1;
EXPECT_EQ(1u, EXPECT_EQ(1u,
@ -177,7 +178,7 @@ TEST_F(MP4MediaParserTest,
TEST_F(MP4MediaParserTest, BytewiseAppend) { TEST_F(MP4MediaParserTest, BytewiseAppend) {
// Ensure no incremental errors occur when parsing // Ensure no incremental errors occur when parsing
EXPECT_TRUE(ParseMP4File("bear-640x360-av_frag.mp4", 1)); ASSERT_TRUE(ParseMP4File("bear-640x360-av_frag.mp4", 1));
EXPECT_EQ(2u, num_streams_); EXPECT_EQ(2u, num_streams_);
EXPECT_EQ(201u, num_samples_); EXPECT_EQ(201u, num_samples_);
} }
@ -185,13 +186,13 @@ TEST_F(MP4MediaParserTest, BytewiseAppend) {
TEST_F(MP4MediaParserTest, MultiFragmentAppend) { TEST_F(MP4MediaParserTest, MultiFragmentAppend) {
// Large size ensures multiple fragments are appended in one call (size is // Large size ensures multiple fragments are appended in one call (size is
// larger than this particular test file) // larger than this particular test file)
EXPECT_TRUE(ParseMP4File("bear-640x360-av_frag.mp4", 300000)); ASSERT_TRUE(ParseMP4File("bear-640x360-av_frag.mp4", 300000));
EXPECT_EQ(2u, num_streams_); EXPECT_EQ(2u, num_streams_);
EXPECT_EQ(201u, num_samples_); EXPECT_EQ(201u, num_samples_);
} }
TEST_F(MP4MediaParserTest, TrailingMoov) { TEST_F(MP4MediaParserTest, TrailingMoov) {
EXPECT_TRUE(ParseMP4File("bear-640x360-trailing-moov.mp4", 1024)); ASSERT_TRUE(ParseMP4File("bear-640x360-trailing-moov.mp4", 1024));
EXPECT_EQ(2u, num_streams_); EXPECT_EQ(2u, num_streams_);
EXPECT_EQ(201u, num_samples_); EXPECT_EQ(201u, num_samples_);
} }
@ -199,7 +200,7 @@ TEST_F(MP4MediaParserTest, TrailingMoov) {
TEST_F(MP4MediaParserTest, TrailingMoovAndAdditionalMdat) { TEST_F(MP4MediaParserTest, TrailingMoovAndAdditionalMdat) {
// The additional mdat should just be ignored, so the parse is still // The additional mdat should just be ignored, so the parse is still
// successful with the same result. // successful with the same result.
EXPECT_TRUE( ASSERT_TRUE(
ParseMP4File("bear-640x360-trailing-moov-additional-mdat.mp4", 1024)); ParseMP4File("bear-640x360-trailing-moov-additional-mdat.mp4", 1024));
EXPECT_EQ(2u, num_streams_); EXPECT_EQ(2u, num_streams_);
EXPECT_EQ(201u, num_samples_); EXPECT_EQ(201u, num_samples_);
@ -222,7 +223,7 @@ TEST_F(MP4MediaParserTest, Flush) {
} }
TEST_F(MP4MediaParserTest, MPEG2_AAC_LC) { TEST_F(MP4MediaParserTest, MPEG2_AAC_LC) {
EXPECT_TRUE(ParseMP4File("bear-mpeg2-aac-only_frag.mp4", 512)); ASSERT_TRUE(ParseMP4File("bear-mpeg2-aac-only_frag.mp4", 512));
EXPECT_EQ(1u, num_streams_); EXPECT_EQ(1u, num_streams_);
EXPECT_EQ(119u, num_samples_); EXPECT_EQ(119u, num_samples_);
} }
@ -243,13 +244,13 @@ TEST_F(MP4MediaParserTest, NoMoovAfterFlush) {
} }
TEST_F(MP4MediaParserTest, NON_FRAGMENTED_MP4) { TEST_F(MP4MediaParserTest, NON_FRAGMENTED_MP4) {
EXPECT_TRUE(ParseMP4File("bear-640x360.mp4", 512)); ASSERT_TRUE(ParseMP4File("bear-640x360.mp4", 512));
EXPECT_EQ(2u, num_streams_); EXPECT_EQ(2u, num_streams_);
EXPECT_EQ(201u, num_samples_); EXPECT_EQ(201u, num_samples_);
} }
TEST_F(MP4MediaParserTest, CencWithoutDecryptionSource) { TEST_F(MP4MediaParserTest, CencWithoutDecryptionSource) {
EXPECT_TRUE(ParseMP4File("bear-640x360-v_frag-cenc-aux.mp4", 512)); ASSERT_TRUE(ParseMP4File("bear-640x360-v_frag-cenc-aux.mp4", 512));
EXPECT_EQ(1u, num_streams_); EXPECT_EQ(1u, num_streams_);
// Check if pssh is present. // Check if pssh is present.
const int kVideoTrackId = 1; const int kVideoTrackId = 1;