virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avformat/mvdec: make audio stream conditional

Browse Source 
Only allocate an audio stream if there is one in the data.  Silicon
Graphics movie format will contain default values (16 bit samples, 2
audio channels, 22050 Hz sample rate) even when no audio is present in
the file.  This confuses FFmpeg into thinking such an audio stream is
present with 0 samples in it.

There is a flag value in the format to indicate whether or not audio is
present.  This patch checks that and behaves accordingly.

Signed-off-by: John-Paul Stewart <jpstewart@personalprojects.net>
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Reviewed-by: Peter Ross <pross@xvid.org>
This commit is contained in:
John-Paul Stewart 2021-12-31 20:11:47 -05:00 committed by Peter Ross
parent 24b93022fe
commit a8da115143
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavformat/mvdec.c
View File

@ -45,6 +45,10 @@ typedef struct MvContext {
int aformat; ///< audio format int aformat; ///< audio format
} MvContext; } MvContext;
/* these magic numbers are defined in moviefile.h on Silicon Grahpics IRIX */
#define MOVIE_SOUND 1
#define MOVIE_SILENT 2
#define AUDIO_FORMAT_SIGNED 401 #define AUDIO_FORMAT_SIGNED 401
static int mv_probe(const AVProbeData *p) static int mv_probe(const AVProbeData *p)
@ -305,18 +309,25 @@ static int mv_read_header(AVFormatContext *avctx)
avio_skip(pb, 10); avio_skip(pb, 10);
fps = av_d2q(av_int2double(avio_rb64(pb)), INT_MAX);
/* allocate audio track first to prevent unnecessary seeking /* allocate audio track first to prevent unnecessary seeking
* (audio packet always precede video packet for a given frame) */ * (audio packet always precede video packet for a given frame) */
v = avio_rb16(pb);
if (v == MOVIE_SOUND) {
/* movie has sound so allocate an audio stream */
ast = avformat_new_stream(avctx, NULL); ast = avformat_new_stream(avctx, NULL);
if (!ast) if (!ast)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} else if (v != MOVIE_SILENT)
return AVERROR_INVALIDDATA;
avio_skip(pb, 2);
vst = avformat_new_stream(avctx, NULL); vst = avformat_new_stream(avctx, NULL);
if (!vst) if (!vst)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
fps = av_d2q(av_int2double(avio_rb64(pb)), INT_MAX);
avpriv_set_pts_info(vst, 64, fps.den, fps.num); avpriv_set_pts_info(vst, 64, fps.den, fps.num);
avio_skip(pb, 4);
vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
vst->avg_frame_rate = fps; vst->avg_frame_rate = fps;
vst->duration = vst->nb_frames = avio_rb32(pb); vst->duration = vst->nb_frames = avio_rb32(pb);
@ -338,6 +349,7 @@ static int mv_read_header(AVFormatContext *avctx)
vst->codecpar->height = avio_rb32(pb); vst->codecpar->height = avio_rb32(pb);
avio_skip(pb, 12); avio_skip(pb, 12);
if (ast) {
ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
ast->nb_frames = vst->nb_frames; ast->nb_frames = vst->nb_frames;
ast->codecpar->sample_rate = avio_rb32(pb); ast->codecpar->sample_rate = avio_rb32(pb);
@ -373,6 +385,8 @@ static int mv_read_header(AVFormatContext *avctx)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
avio_skip(pb, 8); avio_skip(pb, 8);
} else
avio_skip(pb, 24); /* skip meaningless audio metadata */
var_read_metadata(avctx, "title", 0x80); var_read_metadata(avctx, "title", 0x80);
var_read_metadata(avctx, "comment", 0x100); var_read_metadata(avctx, "comment", 0x100);
@ -386,9 +400,11 @@ static int mv_read_header(AVFormatContext *avctx)
if (avio_feof(pb)) if (avio_feof(pb))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
avio_skip(pb, 8); avio_skip(pb, 8);
if (ast) {
av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME);
av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME);
timestamp += asize / (ast->codecpar->channels * (uint64_t)bytes_per_sample); timestamp += asize / (ast->codecpar->channels * (uint64_t)bytes_per_sample);
}
av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME);
} }
} else if (!version && avio_rb16(pb) == 3) { } else if (!version && avio_rb16(pb) == 3) {
avio_skip(pb, 4); avio_skip(pb, 4);