mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-19 04:53:25 +00:00
avcodec/evc_frame_merge: use a GetBitContext to parse entire NALUs
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
c7183a22db
commit
7fc6c7633e
@ -74,57 +74,50 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out)
|
|||||||
{
|
{
|
||||||
EVCFMergeContext *ctx = bsf->priv_data;
|
EVCFMergeContext *ctx = bsf->priv_data;
|
||||||
AVPacket *in = ctx->in;
|
AVPacket *in = ctx->in;
|
||||||
uint8_t *buffer, *nalu = NULL;
|
uint8_t *buffer;
|
||||||
GetBitContext gb;
|
GetBitContext gb;
|
||||||
enum EVCNALUnitType nalu_type;
|
enum EVCNALUnitType nalu_type;
|
||||||
int tid, nalu_size = 0;
|
uint32_t nalu_size;
|
||||||
int au_end_found = 0;
|
int tid, au_end_found = 0;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
err = ff_bsf_get_packet_ref(bsf, in);
|
err = ff_bsf_get_packet_ref(bsf, in);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
nalu_size = evc_read_nal_unit_length(in->data, EVC_NALU_LENGTH_PREFIX_SIZE, bsf);
|
|
||||||
if (nalu_size <= 0) {
|
|
||||||
err = AVERROR_INVALIDDATA;
|
|
||||||
goto end;
|
|
||||||
}
|
|
||||||
|
|
||||||
nalu = in->data + EVC_NALU_LENGTH_PREFIX_SIZE;
|
|
||||||
nalu_size = in->size - EVC_NALU_LENGTH_PREFIX_SIZE;
|
|
||||||
|
|
||||||
// NAL unit parsing needed to determine if end of AU was found
|
// NAL unit parsing needed to determine if end of AU was found
|
||||||
if (nalu_size <= 0) {
|
nalu_size = evc_read_nal_unit_length(in->data, EVC_NALU_LENGTH_PREFIX_SIZE, bsf);
|
||||||
|
if (!nalu_size || nalu_size > INT_MAX) {
|
||||||
av_log(bsf, AV_LOG_ERROR, "Invalid NAL unit size: (%d)\n", nalu_size);
|
av_log(bsf, AV_LOG_ERROR, "Invalid NAL unit size: (%d)\n", nalu_size);
|
||||||
err = AVERROR_INVALIDDATA;
|
err = AVERROR_INVALIDDATA;
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = init_get_bits8(&gb, in->data + EVC_NALU_LENGTH_PREFIX_SIZE, nalu_size);
|
||||||
|
if (err < 0)
|
||||||
|
return err;
|
||||||
|
|
||||||
// @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic (Table 4 - NAL unit type codes and NAL unit type classes)
|
// @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic (Table 4 - NAL unit type codes and NAL unit type classes)
|
||||||
// @see enum EVCNALUnitType in evc.h
|
// @see enum EVCNALUnitType in evc.h
|
||||||
nalu_type = evc_get_nalu_type(nalu, nalu_size, bsf);
|
if (get_bits1(&gb)) {// forbidden_zero_bit
|
||||||
|
av_log(bsf, AV_LOG_ERROR, "Invalid NAL unit header\n");
|
||||||
|
err = AVERROR_INVALIDDATA;
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
|
||||||
|
nalu_type = get_bits(&gb, 6) - 1;
|
||||||
if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) {
|
if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) {
|
||||||
av_log(bsf, AV_LOG_ERROR, "Invalid NAL unit type: (%d)\n", nalu_type);
|
av_log(bsf, AV_LOG_ERROR, "Invalid NAL unit type: (%d)\n", nalu_type);
|
||||||
err = AVERROR_INVALIDDATA;
|
err = AVERROR_INVALIDDATA;
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
tid = ff_evc_get_temporal_id(nalu, nalu_size, bsf);
|
tid = get_bits(&gb, 3);
|
||||||
if (tid < 0) {
|
skip_bits(&gb, 5); // nuh_reserved_zero_5bits
|
||||||
av_log(bsf, AV_LOG_ERROR, "Invalid temporial id: (%d)\n", tid);
|
skip_bits1(&gb); // nuh_extension_flag
|
||||||
err = AVERROR_INVALIDDATA;
|
|
||||||
goto end;
|
|
||||||
}
|
|
||||||
|
|
||||||
nalu += EVC_NALU_HEADER_SIZE;
|
|
||||||
nalu_size -= EVC_NALU_HEADER_SIZE;
|
|
||||||
|
|
||||||
switch (nalu_type) {
|
switch (nalu_type) {
|
||||||
case EVC_SPS_NUT:
|
case EVC_SPS_NUT:
|
||||||
err = init_get_bits8(&gb, nalu, nalu_size);
|
|
||||||
if (err < 0)
|
|
||||||
return err;
|
|
||||||
err = ff_evc_parse_sps(&gb, &ctx->ps);
|
err = ff_evc_parse_sps(&gb, &ctx->ps);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
av_log(bsf, AV_LOG_ERROR, "SPS parsing error\n");
|
av_log(bsf, AV_LOG_ERROR, "SPS parsing error\n");
|
||||||
@ -132,9 +125,6 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case EVC_PPS_NUT:
|
case EVC_PPS_NUT:
|
||||||
err = init_get_bits8(&gb, nalu, nalu_size);
|
|
||||||
if (err < 0)
|
|
||||||
return err;
|
|
||||||
err = ff_evc_parse_pps(&gb, &ctx->ps);
|
err = ff_evc_parse_pps(&gb, &ctx->ps);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
av_log(bsf, AV_LOG_ERROR, "PPS parsing error\n");
|
av_log(bsf, AV_LOG_ERROR, "PPS parsing error\n");
|
||||||
@ -145,10 +135,6 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out)
|
|||||||
case EVC_NOIDR_NUT: {
|
case EVC_NOIDR_NUT: {
|
||||||
EVCParserSliceHeader sh;
|
EVCParserSliceHeader sh;
|
||||||
|
|
||||||
err = init_get_bits8(&gb, nalu, nalu_size);
|
|
||||||
if (err < 0)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
err = ff_evc_parse_slice_header(&gb, &sh, &ctx->ps, nalu_type);
|
err = ff_evc_parse_slice_header(&gb, &sh, &ctx->ps, nalu_type);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
av_log(bsf, AV_LOG_ERROR, "Slice header parsing error\n");
|
av_log(bsf, AV_LOG_ERROR, "Slice header parsing error\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user