avformat/mov: add support for APV streams

Dawid Kozinski committed 1 year ago

Commit 219f2341 parent 934e1c24 files · +10 −2Browse files

Unified · Split

4 files

@@ -21,6 +21,7 @@ version <next>: · 20 unmodified lines
21	21	- G.728 decoder
22	22	- pad_cuda filter
23	23	- Sanyo LD-ADPCM decoder
	24	+- APV in MP4/ISOBMFF demuxing
24	25
25	26
26	27	version 7.1:

@@ -299,6 +299,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { · 298 unmodified lines
299	299
300	300	{ AV_CODEC_ID_AVS3, MKTAG('a', 'v', 's', '3') },
301	301
	302	+ { AV_CODEC_ID_APV, MKTAG('a', 'p', 'v', '1') },
	303	+
302	304	{ AV_CODEC_ID_NONE, 0 },
303	305	};
304	306

@@ -2987,6 +2987,7 @@ static int mov_finalize_stsd_codec(MOVContext c, AVIOContext pb, · 2986 unmodified lines
2987	2987	case AV_CODEC_ID_VP9:
2988	2988	sti->need_parsing = AVSTREAM_PARSE_FULL;
2989	2989	break;
	2990	+ case AV_CODEC_ID_APV:
2990	2991	case AV_CODEC_ID_EVC:
2991	2992	case AV_CODEC_ID_AV1:
2992	2993	/* field_order detection of H264 requires parsing */
@@ -9325,6 +9326,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { · 6332 unmodified lines
9325	9326	{ MKTAG('a','m','v','e'), mov_read_amve }, /* ambient viewing environment box */
9326	9327	{ MKTAG('l','h','v','C'), mov_read_lhvc },
9327	9328	{ MKTAG('l','v','c','C'), mov_read_glbl },
	9329	+{ MKTAG('a','p','v','C'), mov_read_glbl },
9328	9330	#if CONFIG_IAMFDEC
9329	9331	{ MKTAG('i','a','c','b'), mov_read_iacb },
9330	9332	#endif
@@ -11032,7 +11034,10 @@ static int mov_read_packet(AVFormatContext s, AVPacket pkt) · 1701 unmodified lines
11032	11034	return FFERROR_REDO;
11033	11035	}
11034	11036	#endif
11035		− else
	11037	+ else if (st->codecpar->codec_id == AV_CODEC_ID_APV && sample->size > 4) {
	11038	+ const uint32_t au_size = avio_rb32(sc->pb);
	11039	+ ret = av_get_packet(sc->pb, pkt, au_size);
	11040	+ } else
11036	11041	ret = av_get_packet(sc->pb, pkt, sample->size);
11037	11042	if (ret < 0) {
11038	11043	if (should_retry(sc->pb, ret)) {

@@ -32,7 +32,7 @@ · 31 unmodified lines
32	32	#include "version_major.h"
33	33
34	34	#define LIBAVFORMAT_VERSION_MINOR 1
35		−#define LIBAVFORMAT_VERSION_MICRO 101
	35	+#define LIBAVFORMAT_VERSION_MICRO 102
36	36
37	37	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
38	38	LIBAVFORMAT_VERSION_MINOR, \

Keyboard shortcuts