RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-16 20:07:04 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/cbs_av1: Allow specifying obu size byte length

Browse Source 
Signed-off-by: Fei Wang <fei.w.wang@intel.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Fei Wang 2023-09-11 15:52:27 +08:00 committed by Haihao Xiang
parent abe16daea1
commit 695477a1c7
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/cbs_av1.c
View File

@ -138,15 +138,19 @@ static int cbs_av1_read_leb128(CodedBitstreamContext *ctx, GetBitContext *gbc,
return 0; return 0;
} }
/** Minimum byte length will be used to indicate the len128 of value if byte_len is 0. */
static int cbs_av1_write_leb128(CodedBitstreamContext *ctx, PutBitContext *pbc, static int cbs_av1_write_leb128(CodedBitstreamContext *ctx, PutBitContext *pbc,
const char *name, uint64_t value) const char *name, uint64_t value, uint8_t byte_len)
{ {
int len, i; int len, i;
uint8_t byte; uint8_t byte;
CBS_TRACE_WRITE_START(); CBS_TRACE_WRITE_START();
len = (av_log2(value) + 7) / 7; if (byte_len)
av_assert0(byte_len >= (av_log2(value) + 7) / 7);
len = byte_len ? byte_len : (av_log2(value) + 7) / 7;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (put_bits_left(pbc) < 8) if (put_bits_left(pbc) < 8)
@ -618,7 +622,7 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc)
} while (0) } while (0)
#define leb128(name) do { \ #define leb128(name) do { \
CHECK(cbs_av1_write_leb128(ctx, rw, #name, current->name)); \ CHECK(cbs_av1_write_leb128(ctx, rw, #name, current->name, 0)); \
} while (0) } while (0)
#define infer(name, value) do { \ #define infer(name, value) do { \
@ -1002,10 +1006,15 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx,
if (obu->header.obu_has_size_field) { if (obu->header.obu_has_size_field) {
pbc_tmp = *pbc; pbc_tmp = *pbc;
if (obu->obu_size_byte_len) {
for (int i = 0; i < obu->obu_size_byte_len; i++)
put_bits(pbc, 8, 0);
} else {
// Add space for the size field to fill later. // Add space for the size field to fill later.
put_bits32(pbc, 0); put_bits32(pbc, 0);
put_bits32(pbc, 0); put_bits32(pbc, 0);
} }
}
td = NULL; td = NULL;
start_pos = put_bits_count(pbc); start_pos = put_bits_count(pbc);
@ -1124,7 +1133,7 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx,
end_pos /= 8; end_pos /= 8;
*pbc = pbc_tmp; *pbc = pbc_tmp;
err = cbs_av1_write_leb128(ctx, pbc, "obu_size", obu->obu_size); err = cbs_av1_write_leb128(ctx, pbc, "obu_size", obu->obu_size, obu->obu_size_byte_len);
if (err < 0) if (err < 0)
goto error; goto error;
@ -1141,8 +1150,11 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx,
} }
if (obu->obu_size > 0) { if (obu->obu_size > 0) {
if (!obu->obu_size_byte_len) {
obu->obu_size_byte_len = start_pos - data_pos;
memmove(pbc->buf + data_pos, memmove(pbc->buf + data_pos,
pbc->buf + start_pos, header_size); pbc->buf + start_pos, header_size);
}
skip_put_bytes(pbc, header_size); skip_put_bytes(pbc, header_size);
if (td) { if (td) {

1
libavcodec/cbs_av1.h
View File

@ -401,6 +401,7 @@ typedef struct AV1RawOBU {
AV1RawOBUHeader header; AV1RawOBUHeader header;
size_t obu_size; size_t obu_size;
uint8_t obu_size_byte_len;
union { union {
AV1RawSequenceHeader sequence_header; AV1RawSequenceHeader sequence_header;