History

avformat/matroska: add support for VVC streams

As defined in https://github.com/ietf-wg-cellar/matroska-specification/blob/master/codec_specs.md#v_mpegiisovvc

James Almer committed 1 year ago

Commit df503701 parent 8bd66a87 files · +29 −16Browse files

Unified · Split

7 files
  1. Changelog +1 −0
  2. libavformat/matroska.c +1 −0
  3. libavformat/matroskaenc.c +8 −2
  4. libavformat/version.h +1 −1
  5. tests/fate-run.sh +2 −2
  6. tests/fate/lavf-container.mak +13 −11
  7. tests/ref/lavf-fate/vvc.mkv +3 −0
Changelog+1−0
@@ -10,6 +10,7 @@ version <next>: · 9 unmodified lines
1010 - ADPCM IMA Xbox decoder
1111 - Enhanced FLV v2: Multitrack audio/video, modern codec support
1212 - Animated JPEG XL encoding (via libjxl)
13+- VVC in Matroska
1314
1415 version 7.1:
1516 - Raw Captions with Time (RCWT) closed caption demuxer
libavformat/matroska.c+1−0
@@ -90,6 +90,7 @@ const CodecTags ff_mkv_codec_tags[]={ · 89 unmodified lines
9090 {"V_MPEG4/ISO/SP" , AV_CODEC_ID_MPEG4},
9191 {"V_MPEG4/ISO/AVC" , AV_CODEC_ID_H264},
9292 {"V_MPEGH/ISO/HEVC" , AV_CODEC_ID_HEVC},
93+ {"V_MPEGI/ISO/VVC" , AV_CODEC_ID_VVC},
9394 {"V_MPEG4/MS/V3" , AV_CODEC_ID_MSMPEG4V3},
9495 {"V_PRORES" , AV_CODEC_ID_PRORES},
9596 {"V_REAL/RV10" , AV_CODEC_ID_RV10},
libavformat/matroskaenc.c+8−2
@@ -39,6 +39,7 @@ · 38 unmodified lines
3939 #include "riff.h"
4040 #include "version.h"
4141 #include "vorbiscomment.h"
42+#include "vvc.h"
4243 #include "wv.h"
4344
4445 #include "libavutil/avstring.h"
@@ -1141,6 +1142,9 @@ static int mkv_assemble_native_codecprivate(AVFormatContext *s, AVIOContext *dyn · 1096 unmodified lines
11411142 case AV_CODEC_ID_HEVC:
11421143 return ff_isom_write_hvcc(dyn_cp, extradata,
11431144 extradata_size, 0, s);
1145+ case AV_CODEC_ID_VVC:
1146+ return ff_isom_write_vvcc(dyn_cp, extradata,
1147+ extradata_size, 0);
11441148 case AV_CODEC_ID_ALAC:
11451149 if (extradata_size < 36) {
11461150 av_log(s, AV_LOG_ERROR,
@@ -3441,8 +3445,10 @@ static int mkv_init(struct AVFormatContext *s) · 2294 unmodified lines
34413445 break;
34423446 case AV_CODEC_ID_H264:
34433447 case AV_CODEC_ID_HEVC:
3444− if ((par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 ||
3445− par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6) &&
3448+ case AV_CODEC_ID_VVC:
3449+ if (((par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0) ||
3450+ (par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6) ||
3451+ (par->codec_id == AV_CODEC_ID_VVC && par->extradata_size >= 6)) &&
34463452 (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1))
34473453 track->reformat = mkv_reformat_h2645;
34483454 break;
libavformat/version.h+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232 #include "version_major.h"
3333
3434 #define LIBAVFORMAT_VERSION_MINOR 9
35−#define LIBAVFORMAT_VERSION_MICRO 105
35+#define LIBAVFORMAT_VERSION_MICRO 106
3636
3737 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
3838 LIBAVFORMAT_VERSION_MINOR, \
tests/fate-run.sh+2−2
@@ -402,8 +402,8 @@ lavf_container_fate() · 401 unmodified lines
402402 cleanfiles="$cleanfiles $file"
403403 input="${target_samples}/$1"
404404 do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" \
405− "$ENC_OPTS -metadata title=lavftest" -vcodec copy -acodec copy || return
406− do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $3
405+ "$ENC_OPTS -metadata title=lavftest" $3 -vcodec copy -acodec copy || return
406+ do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $4
407407 }
408408
409409 lavf_image(){
tests/fate/lavf-container.mak+13−11
@@ -77,6 +77,7 @@ FATE_LAVF_CONTAINER_FATE-$(call ALLYES, EVC_DEMUXER EVC_PARSER MOV_MUXER) + · 76 unmodified lines
7777 FATE_LAVF_CONTAINER_FATE-$(call ALLYES, H264_DEMUXER H264_PARSER MOV_MUXER) += h264.mp4
7878 FATE_LAVF_CONTAINER_FATE-$(call ALLYES, HEVC_DEMUXER HEVC_PARSER EXTRACT_EXTRADATA_BSF MOV_MUXER) += hevc.mp4
7979 FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MOV_DEMUXER MOV_MUXER) += mv_hevc.mov
80+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, VVC_DEMUXER VVC_PARSER SETTS_BSF MATROSKA_MUXER) += vvc.mkv
8081 FATE_LAVF_CONTAINER_FATE-$(call ALLYES, VVC_DEMUXER VVC_PARSER MOV_MUXER) += vvc.mp4
8182 FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += vp3.ogg
8283 FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGV_MUXER) += vp8.ogg
@@ -91,20 +92,21 @@ FATE_LAVF_CONTAINER_FATE = $(FATE_LAVF_CONTAINER_FATE-yes:%=fate-lavf-fate-%) · 8 unmodified lines
9192 $(FATE_LAVF_CONTAINER_FATE): REF = $(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf-fate-%=%)
9293 $(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF)
9394
94−fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "-c:v copy"
95−fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "-c:v copy"
96−fate-lavf-fate-evc.mp4: CMD = lavf_container_fate "evc/akiyo_cif.evc" "" "-c:v copy"
97−fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264" "" "-c:v copy"
98−fate-lavf-fate-hevc.mp4: CMD = lavf_container_fate "hevc-conformance/HRD_A_Fujitsu_2.bit" "" "-c:v copy"
99−fate-lavf-fate-vvc.mp4: CMD = lavf_container_fate "vvc-conformance/VPS_A_3.bit" "" "-c:v copy"
95+fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "" "-c:v copy"
96+fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "" "-c:v copy"
97+fate-lavf-fate-evc.mp4: CMD = lavf_container_fate "evc/akiyo_cif.evc" "" "" "-c:v copy"
98+fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264" "" "" "-c:v copy"
99+fate-lavf-fate-hevc.mp4: CMD = lavf_container_fate "hevc-conformance/HRD_A_Fujitsu_2.bit" "" "" "-c:v copy"
100+fate-lavf-fate-vvc.mkv: CMD = lavf_container_fate "vvc-conformance/VPS_A_3.bit" "" "-bsf:v setts=pts=DTS" "-c:v copy"
101+fate-lavf-fate-vvc.mp4: CMD = lavf_container_fate "vvc-conformance/VPS_A_3.bit" "" "" "-c:v copy"
100102 fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto"
101−fate-lavf-fate-vp8.ogg: CMD = lavf_container_fate "vp8/RRSF49-short.webm" "" "-acodec copy"
102−fate-lavf-fate-latm: CMD = lavf_container_fate "aac/al04_44.mp4" "" "-acodec copy"
103−fate-lavf-fate-mv_hevc.mov: CMD = lavf_container_fate "hevc/multiview.mov" "" "-c:v copy"
104−fate-lavf-fate-mp3: CMD = lavf_container_fate "mp3-conformance/he_32khz.bit" "" "-acodec copy"
103+fate-lavf-fate-vp8.ogg: CMD = lavf_container_fate "vp8/RRSF49-short.webm" "" "" "-c:a copy"
104+fate-lavf-fate-latm: CMD = lavf_container_fate "aac/al04_44.mp4" "" "" "-c:a copy"
105+fate-lavf-fate-mv_hevc.mov: CMD = lavf_container_fate "hevc/multiview.mov" "" "" "-c:v copy"
106+fate-lavf-fate-mp3: CMD = lavf_container_fate "mp3-conformance/he_32khz.bit" "" "" "-c:a copy"
105107 fate-lavf-fate-qtrle_mace6.mov: CMD = lavf_container_fate "qtrle/Animation-16Greys.mov" "-idct auto"
106108 fate-lavf-fate-cram.avi: CMD = lavf_container_fate "cram/toon.avi" "-idct auto"
107−fate-lavf-fate-hevc.flv: CMD = lavf_container_fate "mkv/hdr10tags-both.mkv" "" "-c:v copy"
109+fate-lavf-fate-hevc.flv: CMD = lavf_container_fate "mkv/hdr10tags-both.mkv" "" "" "-c:v copy"
108110
109111 FATE_SAMPLES_FFMPEG += $(FATE_LAVF_CONTAINER_FATE)
110112 fate-lavf-fate fate-lavf: $(FATE_LAVF_CONTAINER_FATE)
tests/ref/lavf-fate/vvc.mkv+3−0
@@ -0,0 +1,3 @@
1+088fe4756b99c28031ba41d1a841a1cb *tests/data/lavf-fate/lavf.vvc.mkv
2+16351 tests/data/lavf-fate/lavf.vvc.mkv
3+tests/data/lavf-fate/lavf.vvc.mkv CRC=0x895790b1

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