You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-10 06:10:52 +02:00
avformat/mov: add support for APV streams
Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com> Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
committed by
James Almer
parent
934e1c23b0
commit
219f234e07
@@ -21,6 +21,7 @@ version <next>:
|
||||
- G.728 decoder
|
||||
- pad_cuda filter
|
||||
- Sanyo LD-ADPCM decoder
|
||||
- APV in MP4/ISOBMFF demuxing
|
||||
|
||||
|
||||
version 7.1:
|
||||
|
@@ -299,6 +299,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
|
||||
|
||||
{ AV_CODEC_ID_AVS3, MKTAG('a', 'v', 's', '3') },
|
||||
|
||||
{ AV_CODEC_ID_APV, MKTAG('a', 'p', 'v', '1') },
|
||||
|
||||
{ AV_CODEC_ID_NONE, 0 },
|
||||
};
|
||||
|
||||
|
@@ -2987,6 +2987,7 @@ static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb,
|
||||
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 */
|
||||
@@ -9325,6 +9326,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = {
|
||||
{ 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
|
||||
@@ -11032,7 +11034,10 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
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 @@
|
||||
#include "version_major.h"
|
||||
|
||||
#define LIBAVFORMAT_VERSION_MINOR 1
|
||||
#define LIBAVFORMAT_VERSION_MICRO 101
|
||||
#define LIBAVFORMAT_VERSION_MICRO 102
|
||||
|
||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||
LIBAVFORMAT_VERSION_MINOR, \
|
||||
|
Reference in New Issue
Block a user