| Message ID | TYSPR06MB6433FA48CD3FA24F4F6A17E7AA7A2@TYSPR06MB6433.apcprd06.prod.outlook.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add mp4 and ts support for vvc | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Thu, 25 Jan 2024, Nuo Mi wrote: > From: Thomas Siedel <thomas.ff@spin-digital.com> > > Add transport stream stream type 0x33 for vvc. > Add STREAM_TYPE_VIDEO_VVC to MPEG-1/2 and MPEG-2 transport stream. > Add basic transport stream support for TS mux/demux. > > Tested with: > ffmpeg -i NovosobornayaSquare_1920x1080.mp4 -c:v libvvenc test.ts && ffmpeg -i test.ts -f null - > ffmpeg -i NovosobornayaSquare_1920x1080.mp4 -c:v copy test.ts && ffmpeg -i test.ts -f md5 - > > Signed-off-by: Thomas Siedel <thomas.ff@spin-digital.com> > Co-Authored-By: Nuo Mi <nuomi2021@gmail.com> > --- > configure | 2 +- > libavformat/mpeg.c | 3 ++ > libavformat/mpeg.h | 1 + > libavformat/mpegts.c | 2 ++ > libavformat/mpegts.h | 1 + > libavformat/mpegtsenc.c | 65 +++++++++++++++++++++++++++++++++++++++++ > 6 files changed, 73 insertions(+), 1 deletion(-) > > diff --git a/configure b/configure > index 21663000f8..68f675a4bc 100755 > --- a/configure > +++ b/configure > @@ -3552,7 +3552,7 @@ mp3_demuxer_select="mpegaudio_parser" > mp3_muxer_select="mpegaudioheader" > mp4_muxer_select="mov_muxer" > mpegts_demuxer_select="iso_media" > -mpegts_muxer_select="ac3_parser adts_muxer latm_muxer h264_mp4toannexb_bsf hevc_mp4toannexb_bsf" > +mpegts_muxer_select="ac3_parser adts_muxer latm_muxer h264_mp4toannexb_bsf hevc_mp4toannexb_bsf vvc_mp4toannexb_bsf" > mpegtsraw_demuxer_select="mpegts_demuxer" > mxf_muxer_select="pcm_rechunk_bsf rangecoder" > mxf_d10_muxer_select="mxf_muxer" > diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c > index 781c3162d6..a0f2c6da05 100644 > --- a/libavformat/mpeg.c > +++ b/libavformat/mpeg.c > @@ -546,6 +546,9 @@ redo: > } else if (es_type == STREAM_TYPE_VIDEO_HEVC) { > codec_id = AV_CODEC_ID_HEVC; > type = AVMEDIA_TYPE_VIDEO; > + } else if (es_type == STREAM_TYPE_VIDEO_VVC) { > + codec_id = AV_CODEC_ID_VVC; > + type = AVMEDIA_TYPE_VIDEO; > } else if (es_type == STREAM_TYPE_AUDIO_AC3) { > codec_id = AV_CODEC_ID_AC3; > type = AVMEDIA_TYPE_AUDIO; > diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h > index b635295776..20592eb184 100644 > --- a/libavformat/mpeg.h > +++ b/libavformat/mpeg.h > @@ -56,6 +56,7 @@ > #define STREAM_TYPE_VIDEO_MPEG4 0x10 > #define STREAM_TYPE_VIDEO_H264 0x1b > #define STREAM_TYPE_VIDEO_HEVC 0x24 > +#define STREAM_TYPE_VIDEO_VVC 0x33 > #define STREAM_TYPE_VIDEO_CAVS 0x42 > > #define STREAM_TYPE_AUDIO_AC3 0x81 > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c > index c7fd1f5d1f..bef00c88e7 100644 > --- a/libavformat/mpegts.c > +++ b/libavformat/mpegts.c > @@ -812,6 +812,7 @@ static const StreamType ISO_types[] = { > { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, > { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000 }, > { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, > + { 0x33, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VVC }, > { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, > { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, > { 0xd2, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_AVS2 }, > @@ -867,6 +868,7 @@ static const StreamType REGD_types[] = { > { MKTAG('D', 'T', 'S', '3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, > { MKTAG('E', 'A', 'C', '3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_EAC3 }, > { MKTAG('H', 'E', 'V', 'C'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, > + { MKTAG('V', 'V', 'C', ' '), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VVC }, > { MKTAG('K', 'L', 'V', 'A'), AVMEDIA_TYPE_DATA, AV_CODEC_ID_SMPTE_KLV }, > { MKTAG('V', 'A', 'N', 'C'), AVMEDIA_TYPE_DATA, AV_CODEC_ID_SMPTE_2038 }, > { MKTAG('I', 'D', '3', ' '), AVMEDIA_TYPE_DATA, AV_CODEC_ID_TIMED_ID3 }, > diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h > index a48f14e768..14ae312c50 100644 > --- a/libavformat/mpegts.h > +++ b/libavformat/mpegts.h > @@ -128,6 +128,7 @@ > #define STREAM_TYPE_METADATA 0x15 > #define STREAM_TYPE_VIDEO_H264 0x1b > #define STREAM_TYPE_VIDEO_HEVC 0x24 > +#define STREAM_TYPE_VIDEO_VVC 0x33 > #define STREAM_TYPE_VIDEO_CAVS 0x42 > #define STREAM_TYPE_VIDEO_AVS2 0xd2 > #define STREAM_TYPE_VIDEO_AVS3 0xd4 > diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c > index 84edd418f0..e3eab9d1db 100644 > --- a/libavformat/mpegtsenc.c > +++ b/libavformat/mpegtsenc.c > @@ -368,6 +368,9 @@ static int get_dvb_stream_type(AVFormatContext *s, AVStream *st) > case AV_CODEC_ID_HEVC: > stream_type = STREAM_TYPE_VIDEO_HEVC; > break; > + case AV_CODEC_ID_VVC: > + stream_type = STREAM_TYPE_VIDEO_VVC; > + break; > case AV_CODEC_ID_CAVS: > stream_type = STREAM_TYPE_VIDEO_CAVS; > break; > @@ -467,6 +470,11 @@ static int get_m2ts_stream_type(AVFormatContext *s, AVStream *st) > case AV_CODEC_ID_HEVC: > stream_type = STREAM_TYPE_VIDEO_HEVC; > break; > + case AV_CODEC_ID_VVC: > + av_log(s, AV_LOG_ERROR, > + "MPEGTS VVC %s.\n", avcodec_get_name(st->codecpar->codec_id)); > + stream_type = STREAM_TYPE_VIDEO_VVC; > + break; Just remove this case, I doubt VVC is supported in m2ts / Blu-ray after all. > case AV_CODEC_ID_PCM_BLURAY: > stream_type = 0x80; > break; > @@ -1791,6 +1799,21 @@ static int check_hevc_startcode(AVFormatContext *s, const AVStream *st, const AV > return 0; > } > > +static int check_vvc_startcode(AVFormatContext *s, const AVStream *st, const AVPacket *pkt) > +{ > + if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001 && AV_RB24(pkt->data) != 0x000001) { > + if (!st->nb_frames) { > + av_log(s, AV_LOG_ERROR, "VVC bitstream malformed, no startcode found\n"); > + return AVERROR_PATCHWELCOME; > + } > + av_log(s, AV_LOG_WARNING, "VVC bitstream error, startcode missing, size %d", pkt->size); > + if (pkt->size) > + av_log(s, AV_LOG_WARNING, " data %08"PRIX32, AV_RB32(pkt->data)); > + av_log(s, AV_LOG_WARNING, "\n"); > + } > + return 0; > +} > + Instead of duplicating this, can you factorize it instead? > /* Based on GStreamer's gst-plugins-base/ext/ogg/gstoggstream.c > * Released under the LGPL v2.1+, written by > * Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> > @@ -2015,6 +2038,42 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) > buf = data; > size = pkt->size + 7 + extradd; > } > + } else if (st->codecpar->codec_id == AV_CODEC_ID_VVC) { > + const uint8_t *p = buf, *buf_end = p + size; > + uint32_t state = -1; > + uint32_t naltype = -1; > + int extradd = (pkt->flags & AV_PKT_FLAG_KEY) ? st->codecpar->extradata_size : 0; > + int ret = check_vvc_startcode(s, st, pkt); > + if (ret < 0) > + return ret; > + > + if (extradd && AV_RB24(st->codecpar->extradata) > 1) > + extradd = 0; > + > + do { > + p = avpriv_find_start_code(p, buf_end, &state); > + // state contains byte behind start code, p points 2 bytes behind start code > + naltype = ((AV_RB8(p)>>3) & 0x1F); > + av_log(s, AV_LOG_TRACE, "nal %"PRId32"\n", naltype ); > + if (naltype == 14 ) // VPS > + extradd = 0; > + } while (p < buf_end && naltype != 20 && naltype >= 12); > + > + if (naltype >= 12) > + extradd = 0; > + if (naltype != 20) { // AUD NAL > + data = av_malloc(pkt->size + 7 + extradd); > + if (!data) > + return AVERROR(ENOMEM); > + memcpy(data + 7, st->codecpar->extradata, extradd); > + memcpy(data + 7 + extradd, pkt->data, pkt->size); > + AV_WB32(data, 0x00000001); > + data[4] = 0; // forbidden_zero_bit, nuh_reserved_zero_bit, nuh_layer_id > + data[5] = 0xA1; // nal_unit_type(0xA), nuh_temporal_id_plus1(1) > + data[6] = (pkt->flags & AV_PKT_FLAG_KEY) << 7 | 0x28; // aud_irap_or_gdr_flag, aud_pic_type(2), rbsp_stop_one_bit > + buf = data; > + size = pkt->size + 7 + extradd; > + } > } else if (st->codecpar->codec_id == AV_CODEC_ID_OPUS) { > if (pkt->size < 2) { > av_log(s, AV_LOG_ERROR, "Opus packet too short\n"); > @@ -2271,6 +2330,12 @@ static int mpegts_check_bitstream(AVFormatContext *s, AVStream *st, > (st->codecpar->extradata_size > 0 && > st->codecpar->extradata[0] == 1))) > ret = ff_stream_add_bitstream_filter(st, "hevc_mp4toannexb", NULL); > + } else if (st->codecpar->codec_id == AV_CODEC_ID_VVC) { > + if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && > + (AV_RB24(pkt->data) != 0x000001 || > + (st->codecpar->extradata_size > 0 && > + ((st->codecpar->extradata[0] & 0xf8) == 0xf8)))) > + ret = ff_stream_add_bitstream_filter(st, "vvc_mp4toannexb", NULL); > } This can also be reworked so the checks are not duplicated thrice. Thanks, Marton
diff --git a/configure b/configure index 21663000f8..68f675a4bc 100755 --- a/configure +++ b/configure @@ -3552,7 +3552,7 @@ mp3_demuxer_select="mpegaudio_parser" mp3_muxer_select="mpegaudioheader" mp4_muxer_select="mov_muxer" mpegts_demuxer_select="iso_media" -mpegts_muxer_select="ac3_parser adts_muxer latm_muxer h264_mp4toannexb_bsf hevc_mp4toannexb_bsf" +mpegts_muxer_select="ac3_parser adts_muxer latm_muxer h264_mp4toannexb_bsf hevc_mp4toannexb_bsf vvc_mp4toannexb_bsf" mpegtsraw_demuxer_select="mpegts_demuxer" mxf_muxer_select="pcm_rechunk_bsf rangecoder" mxf_d10_muxer_select="mxf_muxer" diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 781c3162d6..a0f2c6da05 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -546,6 +546,9 @@ redo: } else if (es_type == STREAM_TYPE_VIDEO_HEVC) { codec_id = AV_CODEC_ID_HEVC; type = AVMEDIA_TYPE_VIDEO; + } else if (es_type == STREAM_TYPE_VIDEO_VVC) { + codec_id = AV_CODEC_ID_VVC; + type = AVMEDIA_TYPE_VIDEO; } else if (es_type == STREAM_TYPE_AUDIO_AC3) { codec_id = AV_CODEC_ID_AC3; type = AVMEDIA_TYPE_AUDIO; diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h index b635295776..20592eb184 100644 --- a/libavformat/mpeg.h +++ b/libavformat/mpeg.h @@ -56,6 +56,7 @@ #define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_H264 0x1b #define STREAM_TYPE_VIDEO_HEVC 0x24 +#define STREAM_TYPE_VIDEO_VVC 0x33 #define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_AUDIO_AC3 0x81 diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index c7fd1f5d1f..bef00c88e7 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -812,6 +812,7 @@ static const StreamType ISO_types[] = { { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000 }, { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, + { 0x33, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VVC }, { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, { 0xd2, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_AVS2 }, @@ -867,6 +868,7 @@ static const StreamType REGD_types[] = { { MKTAG('D', 'T', 'S', '3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, { MKTAG('E', 'A', 'C', '3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_EAC3 }, { MKTAG('H', 'E', 'V', 'C'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, + { MKTAG('V', 'V', 'C', ' '), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VVC }, { MKTAG('K', 'L', 'V', 'A'), AVMEDIA_TYPE_DATA, AV_CODEC_ID_SMPTE_KLV }, { MKTAG('V', 'A', 'N', 'C'), AVMEDIA_TYPE_DATA, AV_CODEC_ID_SMPTE_2038 }, { MKTAG('I', 'D', '3', ' '), AVMEDIA_TYPE_DATA, AV_CODEC_ID_TIMED_ID3 }, diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index a48f14e768..14ae312c50 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -128,6 +128,7 @@ #define STREAM_TYPE_METADATA 0x15 #define STREAM_TYPE_VIDEO_H264 0x1b #define STREAM_TYPE_VIDEO_HEVC 0x24 +#define STREAM_TYPE_VIDEO_VVC 0x33 #define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_VIDEO_AVS2 0xd2 #define STREAM_TYPE_VIDEO_AVS3 0xd4 diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 84edd418f0..e3eab9d1db 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -368,6 +368,9 @@ static int get_dvb_stream_type(AVFormatContext *s, AVStream *st) case AV_CODEC_ID_HEVC: stream_type = STREAM_TYPE_VIDEO_HEVC; break; + case AV_CODEC_ID_VVC: + stream_type = STREAM_TYPE_VIDEO_VVC; + break; case AV_CODEC_ID_CAVS: stream_type = STREAM_TYPE_VIDEO_CAVS; break; @@ -467,6 +470,11 @@ static int get_m2ts_stream_type(AVFormatContext *s, AVStream *st) case AV_CODEC_ID_HEVC: stream_type = STREAM_TYPE_VIDEO_HEVC; break; + case AV_CODEC_ID_VVC: + av_log(s, AV_LOG_ERROR, + "MPEGTS VVC %s.\n", avcodec_get_name(st->codecpar->codec_id)); + stream_type = STREAM_TYPE_VIDEO_VVC; + break; case AV_CODEC_ID_PCM_BLURAY: stream_type = 0x80; break; @@ -1791,6 +1799,21 @@ static int check_hevc_startcode(AVFormatContext *s, const AVStream *st, const AV return 0; } +static int check_vvc_startcode(AVFormatContext *s, const AVStream *st, const AVPacket *pkt) +{ + if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001 && AV_RB24(pkt->data) != 0x000001) { + if (!st->nb_frames) { + av_log(s, AV_LOG_ERROR, "VVC bitstream malformed, no startcode found\n"); + return AVERROR_PATCHWELCOME; + } + av_log(s, AV_LOG_WARNING, "VVC bitstream error, startcode missing, size %d", pkt->size); + if (pkt->size) + av_log(s, AV_LOG_WARNING, " data %08"PRIX32, AV_RB32(pkt->data)); + av_log(s, AV_LOG_WARNING, "\n"); + } + return 0; +} + /* Based on GStreamer's gst-plugins-base/ext/ogg/gstoggstream.c * Released under the LGPL v2.1+, written by * Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> @@ -2015,6 +2038,42 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) buf = data; size = pkt->size + 7 + extradd; } + } else if (st->codecpar->codec_id == AV_CODEC_ID_VVC) { + const uint8_t *p = buf, *buf_end = p + size; + uint32_t state = -1; + uint32_t naltype = -1; + int extradd = (pkt->flags & AV_PKT_FLAG_KEY) ? st->codecpar->extradata_size : 0; + int ret = check_vvc_startcode(s, st, pkt); + if (ret < 0) + return ret; + + if (extradd && AV_RB24(st->codecpar->extradata) > 1) + extradd = 0; + + do { + p = avpriv_find_start_code(p, buf_end, &state); + // state contains byte behind start code, p points 2 bytes behind start code + naltype = ((AV_RB8(p)>>3) & 0x1F); + av_log(s, AV_LOG_TRACE, "nal %"PRId32"\n", naltype ); + if (naltype == 14 ) // VPS + extradd = 0; + } while (p < buf_end && naltype != 20 && naltype >= 12); + + if (naltype >= 12) + extradd = 0; + if (naltype != 20) { // AUD NAL + data = av_malloc(pkt->size + 7 + extradd); + if (!data) + return AVERROR(ENOMEM); + memcpy(data + 7, st->codecpar->extradata, extradd); + memcpy(data + 7 + extradd, pkt->data, pkt->size); + AV_WB32(data, 0x00000001); + data[4] = 0; // forbidden_zero_bit, nuh_reserved_zero_bit, nuh_layer_id + data[5] = 0xA1; // nal_unit_type(0xA), nuh_temporal_id_plus1(1) + data[6] = (pkt->flags & AV_PKT_FLAG_KEY) << 7 | 0x28; // aud_irap_or_gdr_flag, aud_pic_type(2), rbsp_stop_one_bit + buf = data; + size = pkt->size + 7 + extradd; + } } else if (st->codecpar->codec_id == AV_CODEC_ID_OPUS) { if (pkt->size < 2) { av_log(s, AV_LOG_ERROR, "Opus packet too short\n"); @@ -2271,6 +2330,12 @@ static int mpegts_check_bitstream(AVFormatContext *s, AVStream *st, (st->codecpar->extradata_size > 0 && st->codecpar->extradata[0] == 1))) ret = ff_stream_add_bitstream_filter(st, "hevc_mp4toannexb", NULL); + } else if (st->codecpar->codec_id == AV_CODEC_ID_VVC) { + if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && + (AV_RB24(pkt->data) != 0x000001 || + (st->codecpar->extradata_size > 0 && + ((st->codecpar->extradata[0] & 0xf8) == 0xf8)))) + ret = ff_stream_add_bitstream_filter(st, "vvc_mp4toannexb", NULL); } return ret;