History

avcodec/extract_extradata: add support for H266/VVC

James Almer committed 3 years ago

Commit 136e96a1 parent 0b8c1f21 file · +16 −3Browse files

Unified · Split

libavcodec/extract_extradata_bsf.c+16−3
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 #include "hevc.h"
3232 #include "startcode.h"
3333 #include "vc1_common.h"
34+#include "vvc.h"
3435
3536 typedef struct ExtractExtradataContext {
3637 const AVClass *class;
@@ -134,6 +135,9 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, · 97 unmodified lines
134135 static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt,
135136 uint8_t **data, int *size)
136137 {
138+ static const int extradata_nal_types_vvc[] = {
139+ VVC_VPS_NUT, VVC_SPS_NUT, VVC_PPS_NUT,
140+ };
137141 static const int extradata_nal_types_hevc[] = {
138142 HEVC_NAL_VPS, HEVC_NAL_SPS, HEVC_NAL_PPS,
139143 };
@@ -148,7 +152,10 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, · 8 unmodified lines
148152 int nb_extradata_nal_types;
149153 int i, has_sps = 0, has_vps = 0, ret = 0;
150154
151− if (ctx->par_in->codec_id == AV_CODEC_ID_HEVC) {
155+ if (ctx->par_in->codec_id == AV_CODEC_ID_VVC) {
156+ extradata_nal_types = extradata_nal_types_vvc;
157+ nb_extradata_nal_types = FF_ARRAY_ELEMS(extradata_nal_types_vvc);
158+ } else if (ctx->par_in->codec_id == AV_CODEC_ID_HEVC) {
152159 extradata_nal_types = extradata_nal_types_hevc;
153160 nb_extradata_nal_types = FF_ARRAY_ELEMS(extradata_nal_types_hevc);
154161 } else {
@@ -165,7 +172,10 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, · 10 unmodified lines
165172 H2645NAL *nal = &s->h2645_pkt.nals[i];
166173 if (val_in_array(extradata_nal_types, nb_extradata_nal_types, nal->type)) {
167174 extradata_size += nal->raw_size + 3;
168− if (ctx->par_in->codec_id == AV_CODEC_ID_HEVC) {
175+ if (ctx->par_in->codec_id == AV_CODEC_ID_VVC) {
176+ if (nal->type == VVC_SPS_NUT) has_sps = 1;
177+ if (nal->type == VVC_VPS_NUT) has_vps = 1;
178+ } else if (ctx->par_in->codec_id == AV_CODEC_ID_HEVC) {
169179 if (nal->type == HEVC_NAL_SPS) has_sps = 1;
170180 if (nal->type == HEVC_NAL_VPS) has_vps = 1;
171181 } else {
@@ -177,7 +187,8 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, · 5 unmodified lines
177187 }
178188
179189 if (extradata_size &&
180− ((ctx->par_in->codec_id == AV_CODEC_ID_HEVC && has_sps && has_vps) ||
190+ ((ctx->par_in->codec_id == AV_CODEC_ID_VVC && has_sps) ||
191+ (ctx->par_in->codec_id == AV_CODEC_ID_HEVC && has_sps && has_vps) ||
181192 (ctx->par_in->codec_id == AV_CODEC_ID_H264 && has_sps))) {
182193 AVBufferRef *filtered_buf = NULL;
183194 PutByteContext pb_filtered_data, pb_extradata;
@@ -335,6 +346,7 @@ static const struct { · 151 unmodified lines
335346 { AV_CODEC_ID_MPEG2VIDEO, extract_extradata_mpeg12 },
336347 { AV_CODEC_ID_MPEG4, extract_extradata_mpeg4 },
337348 { AV_CODEC_ID_VC1, extract_extradata_vc1 },
349+ { AV_CODEC_ID_VVC, extract_extradata_h2645 },
338350 };
339351
340352 static int extract_extradata_init(AVBSFContext *ctx)
@@ -404,6 +416,7 @@ static const enum AVCodecID codec_ids[] = { · 63 unmodified lines
404416 AV_CODEC_ID_MPEG2VIDEO,
405417 AV_CODEC_ID_MPEG4,
406418 AV_CODEC_ID_VC1,
419+ AV_CODEC_ID_VVC,
407420 AV_CODEC_ID_NONE,
408421 };
409422

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t