History

avformat/flvdec: support demux av1 in enhanced flv

Steven Liu committed 3 years ago

Commit 23b02551 parent 7a5e9a61 file · +10 −2Browse files

Unified · Split

libavformat/flvdec.c+10−2
@@ -318,6 +318,8 @@ static int flv_same_video_codec(AVFormatContext *s, AVCodecParameters *vpar, int · 317 unmodified lines
318318 switch(codec_id) {
319319 case MKBETAG('h', 'v', 'c', '1'):
320320 return vpar->codec_id == AV_CODEC_ID_HEVC;
321+ case MKBETAG('a', 'v', '0', '1'):
322+ return vpar->codec_id == AV_CODEC_ID_AV1;
321323 default:
322324 break;
323325 }
@@ -359,6 +361,10 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, · 35 unmodified lines
359361 par->codec_id = AV_CODEC_ID_HEVC;
360362 vstreami->need_parsing = AVSTREAM_PARSE_HEADERS;
361363 return 4;
364+ case MKBETAG('a', 'v', '0', '1'):
365+ par->codec_id = AV_CODEC_ID_AV1;
366+ vstreami->need_parsing = AVSTREAM_PARSE_HEADERS;
367+ return 4;
362368 default:
363369 break;
364370 }
@@ -1278,7 +1284,8 @@ retry_duration: · 913 unmodified lines
12781284 if (st->codecpar->codec_id == AV_CODEC_ID_AAC ||
12791285 st->codecpar->codec_id == AV_CODEC_ID_H264 ||
12801286 st->codecpar->codec_id == AV_CODEC_ID_MPEG4 ||
1281− st->codecpar->codec_id == AV_CODEC_ID_HEVC) {
1287+ st->codecpar->codec_id == AV_CODEC_ID_HEVC ||
1288+ st->codecpar->codec_id == AV_CODEC_ID_AV1) {
12821289 int type = 0;
12831290 if (flv->exheader && stream_type == FLV_STREAM_TYPE_VIDEO) {
12841291 type = flags & 0x0F;
@@ -1309,7 +1316,8 @@ retry_duration: · 24 unmodified lines
13091316 }
13101317 }
13111318 if (type == 0 && (!st->codecpar->extradata || st->codecpar->codec_id == AV_CODEC_ID_AAC ||
1312− st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_HEVC)) {
1319+ st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_HEVC ||
1320+ st->codecpar->codec_id == AV_CODEC_ID_AV1)) {
13131321 AVDictionaryEntry *t;
13141322
13151323 if (st->codecpar->extradata) {

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