har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mov: fix ISO/IEC 23003-5 support

Browse Source 
Missing floating-point formats support.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili 2023-03-06 20:02:07 +08:00
parent a6e9d01f88
commit d04dbf48fc
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/isom.h
View File

@ -418,6 +418,8 @@ static inline enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags)
#define MOV_ISMV_TTML_TAG MKTAG('d', 'f', 'x', 'p') #define MOV_ISMV_TTML_TAG MKTAG('d', 'f', 'x', 'p')
#define MOV_MP4_TTML_TAG MKTAG('s', 't', 'p', 'p') #define MOV_MP4_TTML_TAG MKTAG('s', 't', 'p', 'p')
#define MOV_MP4_FPCM_TAG MKTAG('f', 'p', 'c', 'm')
#define MOV_MP4_IPCM_TAG MKTAG('i', 'p', 'c', 'm')
struct MP4TrackKindValueMapping { struct MP4TrackKindValueMapping {
int disposition; int disposition;

49
libavformat/mov.c
View File

@ -1591,6 +1591,10 @@ static int mov_read_pcmc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
int format_flags; int format_flags;
int version, flags; int version, flags;
int pcm_sample_size;
AVFormatContext *fc = c->fc;
AVStream *st;
MOVStreamContext *sc;
if (atom.size < 6) { if (atom.size < 6) {
av_log(c->fc, AV_LOG_ERROR, "Empty pcmC box\n"); av_log(c->fc, AV_LOG_ERROR, "Empty pcmC box\n");
@ -1608,6 +1612,51 @@ static int mov_read_pcmc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
} }
format_flags = avio_r8(pb); format_flags = avio_r8(pb);
pcm_sample_size = avio_r8(pb);
if (fc->nb_streams < 1)
return AVERROR_INVALIDDATA;
st = fc->streams[fc->nb_streams - 1];
sc = st->priv_data;
if (sc->format == MOV_MP4_FPCM_TAG) {
switch (pcm_sample_size) {
case 32:
st->codecpar->codec_id = AV_CODEC_ID_PCM_F32BE;
break;
case 64:
st->codecpar->codec_id = AV_CODEC_ID_PCM_F64BE;
break;
default:
av_log(fc, AV_LOG_ERROR, "invalid pcm_sample_size %d for %s\n",
pcm_sample_size,
av_fourcc2str(sc->format));
return AVERROR_INVALIDDATA;
}
} else if (sc->format == MOV_MP4_IPCM_TAG) {
switch (pcm_sample_size) {
case 16:
st->codecpar->codec_id = AV_CODEC_ID_PCM_S16BE;
break;
case 24:
st->codecpar->codec_id = AV_CODEC_ID_PCM_S24BE;
break;
case 32:
st->codecpar->codec_id = AV_CODEC_ID_PCM_S32BE;
break;
default:
av_log(fc, AV_LOG_ERROR, "invalid pcm_sample_size %d for %s\n",
pcm_sample_size,
av_fourcc2str(sc->format));
return AVERROR_INVALIDDATA;
}
} else {
av_log(fc, AV_LOG_ERROR, "'pcmC' with invalid sample entry '%s'\n",
av_fourcc2str(sc->format));
return AVERROR_INVALIDDATA;
}
if (format_flags & 1) // indicates little-endian format. If not present, big-endian format is used if (format_flags & 1) // indicates little-endian format. If not present, big-endian format is used
set_last_stream_little_endian(c->fc); set_last_stream_little_endian(c->fc);