Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

h264: add STAP-A decode with long startcodes #1101

Merged
merged 1 commit into from
Apr 11, 2024
Merged

h264: add STAP-A decode with long startcodes #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/re_h264.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,4 @@ bool h264_is_keyframe(int type);
int h264_stap_encode(struct mbuf *mb, const uint8_t *frame,
size_t frame_sz);
int h264_stap_decode_annexb(struct mbuf *mb_frame, struct mbuf *mb_pkt);
int h264_stap_decode_annexb_long(struct mbuf *mb_frame, struct mbuf *mb_pkt);
53 changes: 41 additions & 12 deletions src/h264/nal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,17 +365,8 @@ int h264_stap_encode(struct mbuf *mb, const uint8_t *frame,
}


/**
* Decode STAP-A payload and convert to Annex-B NAL units
*
* @param mb_frame Target mbuffer for frame with multiple NAL units
* @param mb_pkt Input packet with STAP-A payload
*
* @return 0 if success, otherwise errorcode
*
* NOTE: The NAL header must be decoded outside
*/
int h264_stap_decode_annexb(struct mbuf *mb_frame, struct mbuf *mb_pkt)
static int stap_decode_annexb_int(struct mbuf *mb_frame, struct mbuf *mb_pkt,
bool long_startcode)
{
if (!mb_frame || !mb_pkt)
return EINVAL;
Expand All @@ -398,8 +389,13 @@ int h264_stap_decode_annexb(struct mbuf *mb_frame, struct mbuf *mb_pkt)
#endif

static const uint8_t sc3[] = {0, 0, 1};
static const uint8_t sc4[] = {0, 0, 0, 1};

int err = mbuf_write_mem(mb_frame, sc3, sizeof(sc3));
int err;
if (long_startcode)
err = mbuf_write_mem(mb_frame, sc4, sizeof(sc4));
else
err = mbuf_write_mem(mb_frame, sc3, sizeof(sc3));
err |= mbuf_write_mem(mb_frame, mbuf_buf(mb_pkt), len);
if (err)
return err;
Expand All @@ -409,3 +405,36 @@ int h264_stap_decode_annexb(struct mbuf *mb_frame, struct mbuf *mb_pkt)

return 0;
}


/**
* Decode STAP-A payload and convert to Annex-B NAL units
*
* @param mb_frame Target mbuffer for frame with multiple NAL units
* @param mb_pkt Input packet with STAP-A payload
*
* @return 0 if success, otherwise errorcode
*
* NOTE: The NAL header must be decoded outside
*/
int h264_stap_decode_annexb(struct mbuf *mb_frame, struct mbuf *mb_pkt)
{
return stap_decode_annexb_int(mb_frame, mb_pkt, false);
}


/**
* Decode STAP-A payload and convert to Annex-B NAL units
* with long startcode (0x00 0x00 0x00 0x01).
*
* @param mb_frame Target mbuffer for frame with multiple NAL units
* @param mb_pkt Input packet with STAP-A payload
*
* @return 0 if success, otherwise errorcode
*
* NOTE: The NAL header must be decoded outside
*/
int h264_stap_decode_annexb_long(struct mbuf *mb_frame, struct mbuf *mb_pkt)
{
return stap_decode_annexb_int(mb_frame, mb_pkt, true);
}
87 changes: 64 additions & 23 deletions test/h264.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,9 @@ static void dump_rtp(const uint8_t *p, size_t size)
#endif


static int test_h264_stap_a_encode(void)
static int test_h264_stap_a_encode_base(const uint8_t *frame, size_t len,
bool long_startcode)
{
static const uint8_t frame[] = {

/* AUD */
0x00, 0x00, 0x01,
0x09, 0x10,

/* SPS */
0x00, 0x00, 0x01,
0x67, 0x42, 0xc0, 0x1f, 0x8c, 0x8d, 0x40,

/* PPS */
0x00, 0x00, 0x01,
0x68, 0xce, 0x3c, 0x80,

/* IDR_SLICE */
0x00, 0x00, 0x01,
0x65, 0xb8, 0x00, 0x04, 0x00, 0x00, 0x05, 0x39,
};
enum { MAX_NRI = 3 };
struct mbuf *mb_pkt = mbuf_alloc(256);
struct mbuf *mb_frame = mbuf_alloc(256);
Expand All @@ -100,7 +83,7 @@ static int test_h264_stap_a_encode(void)
goto out;
}

err = h264_stap_encode(mb_pkt, frame, sizeof(frame));
err = h264_stap_encode(mb_pkt, frame, len);
if (err)
goto out;

Expand All @@ -112,10 +95,16 @@ static int test_h264_stap_a_encode(void)
ASSERT_EQ(MAX_NRI, hdr.nri); /* NOTE: max NRI */
ASSERT_EQ(H264_NALU_STAP_A, hdr.type);

err = h264_stap_decode_annexb(mb_frame, mb_pkt);
ASSERT_EQ(0, err);
if (long_startcode) {
err = h264_stap_decode_annexb_long(mb_frame, mb_pkt);
ASSERT_EQ(0, err);
}
else {
err = h264_stap_decode_annexb(mb_frame, mb_pkt);
ASSERT_EQ(0, err);
}

TEST_MEMCMP(frame, sizeof(frame), mb_frame->buf, mb_frame->end);
TEST_MEMCMP(frame, len, mb_frame->buf, mb_frame->end);

out:
mem_deref(mb_frame);
Expand All @@ -125,6 +114,58 @@ static int test_h264_stap_a_encode(void)
}


static int test_h264_stap_a_encode(void)
{
static const uint8_t frame[] = {

/* AUD */
0x00, 0x00, 0x01,
0x09, 0x10,

/* SPS */
0x00, 0x00, 0x01,
0x67, 0x42, 0xc0, 0x1f, 0x8c, 0x8d, 0x40,

/* PPS */
0x00, 0x00, 0x01,
0x68, 0xce, 0x3c, 0x80,

/* IDR_SLICE */
0x00, 0x00, 0x01,
0x65, 0xb8, 0x00, 0x04, 0x00, 0x00, 0x05, 0x39,
};
static const uint8_t frame_long[] = {

/* AUD */
0x00, 0x00, 0x00, 0x01,
0x09, 0x10,

/* SPS */
0x00, 0x00, 0x00, 0x01,
0x67, 0x42, 0xc0, 0x1f, 0x8c, 0x8d, 0x40,

/* PPS */
0x00, 0x00, 0x00, 0x01,
0x68, 0xce, 0x3c, 0x80,

/* IDR_SLICE */
0x00, 0x00, 0x00, 0x01,
0x65, 0xb8, 0x00, 0x04, 0x00, 0x00, 0x05, 0x39,
};
int err;

err = test_h264_stap_a_encode_base(frame, sizeof(frame), false);
TEST_ERR(err);

err = test_h264_stap_a_encode_base(frame_long, sizeof(frame_long),
true);
TEST_ERR(err);

out:
return err;
}


static int test_h264_stap_a_decode(void)
{
static const uint8_t pkt[] = {
Expand Down
Loading