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
10- ADPCM IMA Xbox decoder10- ADPCM IMA Xbox decoder
11- Enhanced FLV v2: Multitrack audio/video, modern codec support11- Enhanced FLV v2: Multitrack audio/video, modern codec support
12- Animated JPEG XL encoding (via libjxl)12- Animated JPEG XL encoding (via libjxl)
13- VVC in Matroska
13 14
14version 7.1:15version 7.1:
15- Raw Captions with Time (RCWT) closed caption demuxer16- 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
90 {"V_MPEG4/ISO/SP" , AV_CODEC_ID_MPEG4},90 {"V_MPEG4/ISO/SP" , AV_CODEC_ID_MPEG4},
91 {"V_MPEG4/ISO/AVC" , AV_CODEC_ID_H264},91 {"V_MPEG4/ISO/AVC" , AV_CODEC_ID_H264},
92 {"V_MPEGH/ISO/HEVC" , AV_CODEC_ID_HEVC},92 {"V_MPEGH/ISO/HEVC" , AV_CODEC_ID_HEVC},
93 {"V_MPEGI/ISO/VVC" , AV_CODEC_ID_VVC},
93 {"V_MPEG4/MS/V3" , AV_CODEC_ID_MSMPEG4V3},94 {"V_MPEG4/MS/V3" , AV_CODEC_ID_MSMPEG4V3},
94 {"V_PRORES" , AV_CODEC_ID_PRORES},95 {"V_PRORES" , AV_CODEC_ID_PRORES},
95 {"V_REAL/RV10" , AV_CODEC_ID_RV10},96 {"V_REAL/RV10" , AV_CODEC_ID_RV10},
libavformat/matroskaenc.c+8−2
@@ -39,6 +39,7 @@ · 38 unmodified lines
39#include "riff.h"39#include "riff.h"
40#include "version.h"40#include "version.h"
41#include "vorbiscomment.h"41#include "vorbiscomment.h"
42#include "vvc.h"
42#include "wv.h"43#include "wv.h"
43 44
44#include "libavutil/avstring.h"45#include "libavutil/avstring.h"
@@ -1141,6 +1142,9 @@ static int mkv_assemble_native_codecprivate(AVFormatContext *s, AVIOContext *dyn · 1096 unmodified lines
1141 case AV_CODEC_ID_HEVC:1142 case AV_CODEC_ID_HEVC:
1142 return ff_isom_write_hvcc(dyn_cp, extradata,1143 return ff_isom_write_hvcc(dyn_cp, extradata,
1143 extradata_size, 0, s);1144 extradata_size, 0, s);
1145 case AV_CODEC_ID_VVC:
1146 return ff_isom_write_vvcc(dyn_cp, extradata,
1147 extradata_size, 0);
1144 case AV_CODEC_ID_ALAC:1148 case AV_CODEC_ID_ALAC:
1145 if (extradata_size < 36) {1149 if (extradata_size < 36) {
1146 av_log(s, AV_LOG_ERROR,1150 av_log(s, AV_LOG_ERROR,
@@ -3441,8 +3445,10 @@ static int mkv_init(struct AVFormatContext *s) · 2294 unmodified lines
3441 break;3445 break;
3442 case AV_CODEC_ID_H264:3446 case AV_CODEC_ID_H264:
3443 case AV_CODEC_ID_HEVC:3447 case AV_CODEC_ID_HEVC:
3444 if ((par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 ||3448 case AV_CODEC_ID_VVC:
3445 par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6) &&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)) &&
3446 (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1))3452 (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1))
3447 track->reformat = mkv_reformat_h2645;3453 track->reformat = mkv_reformat_h2645;
3448 break;3454 break;
libavformat/version.h+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
32#include "version_major.h"32#include "version_major.h"
33 33
34#define LIBAVFORMAT_VERSION_MINOR 934#define LIBAVFORMAT_VERSION_MINOR 9
35#define LIBAVFORMAT_VERSION_MICRO 10535#define LIBAVFORMAT_VERSION_MICRO 106
36 36
37#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \37#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
38 LIBAVFORMAT_VERSION_MINOR, \38 LIBAVFORMAT_VERSION_MINOR, \
tests/fate-run.sh+2−2
@@ -402,8 +402,8 @@ lavf_container_fate() · 401 unmodified lines
402 cleanfiles="$cleanfiles $file"402 cleanfiles="$cleanfiles $file"
403 input="${target_samples}/$1"403 input="${target_samples}/$1"
404 do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" \404 do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" \
405 "$ENC_OPTS -metadata title=lavftest" -vcodec copy -acodec copy || return405 "$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 $3406 do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $4
407}407}
408 408
409lavf_image(){409lavf_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
77FATE_LAVF_CONTAINER_FATE-$(call ALLYES, H264_DEMUXER H264_PARSER MOV_MUXER) += h264.mp477FATE_LAVF_CONTAINER_FATE-$(call ALLYES, H264_DEMUXER H264_PARSER MOV_MUXER) += h264.mp4
78FATE_LAVF_CONTAINER_FATE-$(call ALLYES, HEVC_DEMUXER HEVC_PARSER EXTRACT_EXTRADATA_BSF MOV_MUXER) += hevc.mp478FATE_LAVF_CONTAINER_FATE-$(call ALLYES, HEVC_DEMUXER HEVC_PARSER EXTRACT_EXTRADATA_BSF MOV_MUXER) += hevc.mp4
79FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MOV_DEMUXER MOV_MUXER) += mv_hevc.mov79FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MOV_DEMUXER MOV_MUXER) += mv_hevc.mov
80FATE_LAVF_CONTAINER_FATE-$(call ALLYES, VVC_DEMUXER VVC_PARSER SETTS_BSF MATROSKA_MUXER) += vvc.mkv
80FATE_LAVF_CONTAINER_FATE-$(call ALLYES, VVC_DEMUXER VVC_PARSER MOV_MUXER) += vvc.mp481FATE_LAVF_CONTAINER_FATE-$(call ALLYES, VVC_DEMUXER VVC_PARSER MOV_MUXER) += vvc.mp4
81FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += vp3.ogg82FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += vp3.ogg
82FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGV_MUXER) += vp8.ogg83FATE_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
91$(FATE_LAVF_CONTAINER_FATE): REF = $(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf-fate-%=%)92$(FATE_LAVF_CONTAINER_FATE): REF = $(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf-fate-%=%)
92$(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF)93$(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF)
93 94
94fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "-c:v copy"95fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "" "-c:v copy"
95fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "-c:v copy"96fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "" "-c:v copy"
96fate-lavf-fate-evc.mp4: CMD = lavf_container_fate "evc/akiyo_cif.evc" "" "-c:v copy"97fate-lavf-fate-evc.mp4: CMD = lavf_container_fate "evc/akiyo_cif.evc" "" "" "-c:v copy"
97fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264" "" "-c:v copy"98fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264" "" "" "-c:v copy"
98fate-lavf-fate-hevc.mp4: CMD = lavf_container_fate "hevc-conformance/HRD_A_Fujitsu_2.bit" "" "-c:v copy"99fate-lavf-fate-hevc.mp4: CMD = lavf_container_fate "hevc-conformance/HRD_A_Fujitsu_2.bit" "" "" "-c:v copy"
99fate-lavf-fate-vvc.mp4: CMD = lavf_container_fate "vvc-conformance/VPS_A_3.bit" "" "-c:v copy"100fate-lavf-fate-vvc.mkv: CMD = lavf_container_fate "vvc-conformance/VPS_A_3.bit" "" "-bsf:v setts=pts=DTS" "-c:v copy"
101fate-lavf-fate-vvc.mp4: CMD = lavf_container_fate "vvc-conformance/VPS_A_3.bit" "" "" "-c:v copy"
100fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto"102fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto"
101fate-lavf-fate-vp8.ogg: CMD = lavf_container_fate "vp8/RRSF49-short.webm" "" "-acodec copy"103fate-lavf-fate-vp8.ogg: CMD = lavf_container_fate "vp8/RRSF49-short.webm" "" "" "-c:a copy"
102fate-lavf-fate-latm: CMD = lavf_container_fate "aac/al04_44.mp4" "" "-acodec copy"104fate-lavf-fate-latm: CMD = lavf_container_fate "aac/al04_44.mp4" "" "" "-c:a copy"
103fate-lavf-fate-mv_hevc.mov: CMD = lavf_container_fate "hevc/multiview.mov" "" "-c:v copy"105fate-lavf-fate-mv_hevc.mov: CMD = lavf_container_fate "hevc/multiview.mov" "" "" "-c:v copy"
104fate-lavf-fate-mp3: CMD = lavf_container_fate "mp3-conformance/he_32khz.bit" "" "-acodec copy"106fate-lavf-fate-mp3: CMD = lavf_container_fate "mp3-conformance/he_32khz.bit" "" "" "-c:a copy"
105fate-lavf-fate-qtrle_mace6.mov: CMD = lavf_container_fate "qtrle/Animation-16Greys.mov" "-idct auto"107fate-lavf-fate-qtrle_mace6.mov: CMD = lavf_container_fate "qtrle/Animation-16Greys.mov" "-idct auto"
106fate-lavf-fate-cram.avi: CMD = lavf_container_fate "cram/toon.avi" "-idct auto"108fate-lavf-fate-cram.avi: CMD = lavf_container_fate "cram/toon.avi" "-idct auto"
107fate-lavf-fate-hevc.flv: CMD = lavf_container_fate "mkv/hdr10tags-both.mkv" "" "-c:v copy"109fate-lavf-fate-hevc.flv: CMD = lavf_container_fate "mkv/hdr10tags-both.mkv" "" "" "-c:v copy"
108 110
109FATE_SAMPLES_FFMPEG += $(FATE_LAVF_CONTAINER_FATE)111FATE_SAMPLES_FFMPEG += $(FATE_LAVF_CONTAINER_FATE)
110fate-lavf-fate fate-lavf: $(FATE_LAVF_CONTAINER_FATE)112fate-lavf-fate fate-lavf: $(FATE_LAVF_CONTAINER_FATE)
tests/ref/lavf-fate/vvc.mkv+3−0
@@ -0,0 +1,3 @@
1088fe4756b99c28031ba41d1a841a1cb *tests/data/lavf-fate/lavf.vvc.mkv
216351 tests/data/lavf-fate/lavf.vvc.mkv
3tests/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