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	- G.728 decoder	21	- G.728 decoder
22	- pad_cuda filter	22	- pad_cuda filter
23	- Sanyo LD-ADPCM decoder	23	- Sanyo LD-ADPCM decoder
		24	- APV in MP4/ISOBMFF demuxing
24		25
25		26
26	version 7.1:	27	version 7.1:

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

     case AV_CODEC_ID_VP9:
         sti->need_parsing = AVSTREAM_PARSE_FULL;
         break;
+    case AV_CODEC_ID_APV:
     case AV_CODEC_ID_EVC:
     case AV_CODEC_ID_AV1:
         /* field_order detection of H264 requires parsing */
 { MKTAG('a','m','v','e'), mov_read_amve }, /* ambient viewing environment box */
 { MKTAG('l','h','v','C'), mov_read_lhvc },
 { MKTAG('l','v','c','C'), mov_read_glbl },
+{ MKTAG('a','p','v','C'), mov_read_glbl },
 #if CONFIG_IAMFDEC
 { MKTAG('i','a','c','b'), mov_read_iacb },
 #endif
                 return FFERROR_REDO;
         }
 #endif
-        else
+        else if (st->codecpar->codec_id == AV_CODEC_ID_APV && sample->size > 4) {
+            const uint32_t au_size = avio_rb32(sc->pb);
+            ret = av_get_packet(sc->pb, pkt, au_size);
+        } else
             ret = av_get_packet(sc->pb, pkt, sample->size);
         if (ret < 0) {
             if (should_retry(sc->pb, ret)) {

@@ -32,7 +32,7 @@ · 31 unmodified lines
32	#include "version_major.h"	32	#include "version_major.h"
33		33
34	#define LIBAVFORMAT_VERSION_MINOR 1	34	#define LIBAVFORMAT_VERSION_MINOR 1
35	#define LIBAVFORMAT_VERSION_MICRO 101	35	#define LIBAVFORMAT_VERSION_MICRO 102
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, \

Keyboard shortcuts