Skip to content

Commit 5a89bf2

Browse files
UTest: Determine hevc defined for test.
1 parent 3bfcdf9 commit 5a89bf2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

trunk/src/kernel/srs_kernel_codec.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,13 +1066,13 @@ srs_error_t SrsFormat::hevc_demux_vps_sps_pps(SrsHevcHvccNalu* nal)
10661066
// nal data
10671067
switch (nal->nal_unit_type) {
10681068
case SrsHevcNaluType_VPS:
1069-
//err = hevc_demux_vps(&stream);
1069+
err = hevc_demux_vps(&stream);
10701070
break;
10711071
case SrsHevcNaluType_SPS:
10721072
err = hevc_demux_sps(&stream);
10731073
break;
10741074
case SrsHevcNaluType_PPS:
1075-
//err = hevc_demux_pps(&stream);
1075+
err = hevc_demux_pps(&stream);
10761076
break;
10771077
default:
10781078
break;

trunk/src/utest/srs_utest_kernel.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3985,6 +3985,7 @@ VOID TEST(KernelCodecTest, VideoFormat)
39853985
}
39863986
}
39873987

3988+
#ifndef SRS_H265
39883989
VOID TEST(KernelCodecTest, HevcVideoFormat)
39893990
{
39903991
srs_error_t err;
@@ -4047,7 +4048,7 @@ VOID TEST(KernelCodecTest, HevcVideoFormat)
40474048
SrsFormat f;
40484049
HELPER_EXPECT_SUCCESS(f.initialize());
40494050

4050-
/*HELPER_EXPECT_SUCCESS(f.on_video(0, (char *)vps_sps_pps, sizeof(vps_sps_pps)));
4051+
HELPER_EXPECT_SUCCESS(f.on_video(0, (char *)vps_sps_pps, sizeof(vps_sps_pps)));
40514052
EXPECT_EQ(1, f.video->frame_type);
40524053
EXPECT_EQ(0, f.video->avc_packet_type);
40534054

@@ -4058,9 +4059,10 @@ VOID TEST(KernelCodecTest, HevcVideoFormat)
40584059
EXPECT_EQ(1, f.video->nb_samples);
40594060

40604061
HELPER_EXPECT_SUCCESS(f.on_video(0, (char*)rawIBMF, sizeof(rawIBMF)));
4061-
EXPECT_EQ(1, f.video->nb_samples);*/
4062+
EXPECT_EQ(1, f.video->nb_samples);
40624063
}
40634064
}
4065+
#endif
40644066

40654067
VOID TEST(KernelFileTest, FileWriteReader)
40664068
{

0 commit comments

Comments
 (0)