From: Zhao Zhili <quinkblack@foxmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Zhao Zhili <zhilizhao@tencent.com>
Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/cbs_h2645: add discarded_unit implementation for H.264
Date: Thu, 18 May 2023 05:23:39 +0800
Message-ID: <tencent_D70B38AD163D4D34A016CDB1CFEA553EA707@qq.com> (raw)
In-Reply-To: <20230517212343.1874354-1-quinkblack@foxmail.com>
From: Zhao Zhili <zhilizhao@tencent.com>
---
libavcodec/cbs_h2645.c | 53 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index 80e48829af..c616ac2202 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -1213,6 +1213,58 @@ static int cbs_h265_write_nal_unit(CodedBitstreamContext *ctx,
return 0;
}
+static int cbs_h264_discarded_nal_unit(CodedBitstreamContext *ctx,
+ const CodedBitstreamUnit *unit,
+ enum AVDiscard skip)
+{
+ H264RawNALUnitHeader *header;
+ H264RawSliceHeader *slice;
+ int slice_type_i, slice_type_b, slice_type_si;
+
+ if (skip <= AVDISCARD_DEFAULT)
+ return 0;
+
+ // keep non-VCL
+ if (unit->type != H264_NAL_SLICE &&
+ unit->type != H264_NAL_IDR_SLICE &&
+ unit->type != H264_NAL_AUXILIARY_SLICE)
+ return 0;
+
+ if (skip >= AVDISCARD_ALL)
+ return 1;
+
+ if (skip >= AVDISCARD_NONKEY && unit->type != H264_NAL_IDR_SLICE)
+ return 1;
+
+ header = (H264RawNALUnitHeader *)unit->content;
+ if (!header) {
+ av_log(ctx->log_ctx, AV_LOG_WARNING,
+ "h264 nal unit header is null, missing decompose?\n");
+ return 0;
+ }
+
+ if (skip >= AVDISCARD_NONREF && !header->nal_ref_idc)
+ return 1;
+
+ slice = (H264RawSliceHeader *)unit->content;
+ if (!slice) {
+ av_log(ctx->log_ctx, AV_LOG_WARNING,
+ "h264 slice header is null, missing decompose?\n");
+ return 0;
+ }
+
+ slice_type_i = slice->slice_type % 5 == 2;
+ slice_type_b = slice->slice_type % 5 == 1;
+ slice_type_si = slice->slice_type % 5 == 4;
+
+ if (skip >= AVDISCARD_BIDIR && slice_type_b)
+ return 1;
+ if (skip >= AVDISCARD_NONINTRA && !slice_type_i && !slice_type_si)
+ return 1;
+
+ return 0;
+}
+
static int cbs_h2645_unit_requires_zero_byte(enum AVCodecID codec_id,
CodedBitstreamUnitType type,
int nal_unit_index)
@@ -1441,6 +1493,7 @@ const CodedBitstreamType ff_cbs_type_h264 = {
.split_fragment = &cbs_h2645_split_fragment,
.read_unit = &cbs_h264_read_nal_unit,
.write_unit = &cbs_h264_write_nal_unit,
+ .discarded_unit = &cbs_h264_discarded_nal_unit,
.assemble_fragment = &cbs_h2645_assemble_fragment,
.flush = &cbs_h264_flush,
--
2.25.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next parent reply other threads:[~2023-05-17 13:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230517212343.1874354-1-quinkblack@foxmail.com>
2023-05-17 21:23 ` Zhao Zhili [this message]
2023-05-17 21:23 ` [FFmpeg-devel] [PATCH 3/6] avcodec/cbs_h2645: add discard_unit implementation for H.265 Zhao Zhili
2023-05-17 21:23 ` [FFmpeg-devel] [PATCH 4/6] avcodec/filter_units_bsf: add skip frame support Zhao Zhili
2023-05-17 21:23 ` [FFmpeg-devel] [PATCH 5/6] avcodec/filter_units_bsf: reindent after previous commit Zhao Zhili
2023-05-17 21:23 ` [FFmpeg-devel] [PATCH 6/6] fate/cbs: add tests for discard_units Zhao Zhili
2023-05-18 13:33 ` Zhao Zhili
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_D70B38AD163D4D34A016CDB1CFEA553EA707@qq.com \
--to=quinkblack@foxmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=zhilizhao@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git