[FFmpeg-cvslog] avformat/rpl: Allow a file to have audio, but not video
Cameron Cawley
git at videolan.org
Fri Jul 5 21:53:24 EEST 2019
ffmpeg | branch: master | Cameron Cawley <ccawley2011 at gmail.com> | Fri Jun 14 20:51:34 2019 +0100| [1f8336fd985de3e2e49526e703da0820cd6abdce] | committer: Michael Niedermayer
avformat/rpl: Allow a file to have audio, but not video
Signed-off-by: Cameron Cawley <ccawley2011 at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f8336fd985de3e2e49526e703da0820cd6abdce
---
libavformat/rpl.c | 78 +++++++++++++++++++++++++++++++------------------------
1 file changed, 44 insertions(+), 34 deletions(-)
diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index 683b3a835a..dbbcd13b41 100644
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -124,7 +124,7 @@ static int rpl_read_header(AVFormatContext *s)
uint32_t i;
- int32_t audio_format, chunk_catalog_offset, number_of_chunks;
+ int32_t video_format, audio_format, chunk_catalog_offset, number_of_chunks;
AVRational fps;
char line[RPL_LINE_LENGTH];
@@ -144,39 +144,47 @@ static int rpl_read_header(AVFormatContext *s)
av_dict_set(&s->metadata, "author" , line, 0);
// video headers
- vst = avformat_new_stream(s, NULL);
- if (!vst)
- return AVERROR(ENOMEM);
- vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
- vst->codecpar->codec_tag = read_line_and_int(pb, &error); // video format
- vst->codecpar->width = read_line_and_int(pb, &error); // video width
- vst->codecpar->height = read_line_and_int(pb, &error); // video height
- vst->codecpar->bits_per_coded_sample = read_line_and_int(pb, &error); // video bits per sample
- error |= read_line(pb, line, sizeof(line)); // video frames per second
- fps = read_fps(line, &error);
- avpriv_set_pts_info(vst, 32, fps.den, fps.num);
-
- // Figure out the video codec
- switch (vst->codecpar->codec_tag) {
+ video_format = read_line_and_int(pb, &error);
+ if (video_format) {
+ vst = avformat_new_stream(s, NULL);
+ if (!vst)
+ return AVERROR(ENOMEM);
+ vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ vst->codecpar->codec_tag = video_format;
+ vst->codecpar->width = read_line_and_int(pb, &error); // video width
+ vst->codecpar->height = read_line_and_int(pb, &error); // video height
+ vst->codecpar->bits_per_coded_sample = read_line_and_int(pb, &error); // video bits per sample
+
+ // Figure out the video codec
+ switch (vst->codecpar->codec_tag) {
#if 0
- case 122:
- vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE122;
- break;
+ case 122:
+ vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE122;
+ break;
#endif
- case 124:
- vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE124;
- // The header is wrong here, at least sometimes
- vst->codecpar->bits_per_coded_sample = 16;
- break;
- case 130:
- vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE130;
- break;
- default:
- avpriv_report_missing_feature(s, "Video format %s",
- av_fourcc2str(vst->codecpar->codec_tag));
- vst->codecpar->codec_id = AV_CODEC_ID_NONE;
+ case 124:
+ vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE124;
+ // The header is wrong here, at least sometimes
+ vst->codecpar->bits_per_coded_sample = 16;
+ break;
+ case 130:
+ vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE130;
+ break;
+ default:
+ avpriv_report_missing_feature(s, "Video format %s",
+ av_fourcc2str(vst->codecpar->codec_tag));
+ vst->codecpar->codec_id = AV_CODEC_ID_NONE;
+ }
+ } else {
+ for (i = 0; i < 3; i++)
+ error |= read_line(pb, line, sizeof(line));
}
+ error |= read_line(pb, line, sizeof(line)); // video frames per second
+ fps = read_fps(line, &error);
+ if (vst)
+ avpriv_set_pts_info(vst, 32, fps.den, fps.num);
+
// Audio headers
// ARMovie supports multiple audio tracks; I don't have any
@@ -246,7 +254,7 @@ static int rpl_read_header(AVFormatContext *s)
}
rpl->frames_per_chunk = read_line_and_int(pb, &error); // video frames per chunk
- if (rpl->frames_per_chunk > 1 && vst->codecpar->codec_tag != 124)
+ if (vst && rpl->frames_per_chunk > 1 && vst->codecpar->codec_tag != 124)
av_log(s, AV_LOG_WARNING,
"Don't know how to split frames for video format %s. "
"Video stream will be broken!\n", av_fourcc2str(vst->codecpar->codec_tag));
@@ -261,7 +269,8 @@ static int rpl_read_header(AVFormatContext *s)
read_line_and_int(pb, &error); // (file index)
error |= read_line(pb, line, sizeof(line)); // offset to "helpful" sprite
error |= read_line(pb, line, sizeof(line)); // size of "helpful" sprite
- error |= read_line(pb, line, sizeof(line)); // offset to key frame list
+ if (vst)
+ error |= read_line(pb, line, sizeof(line)); // offset to key frame list
// Read the index
avio_seek(pb, chunk_catalog_offset, SEEK_SET);
@@ -274,8 +283,9 @@ static int rpl_read_header(AVFormatContext *s)
error = -1;
continue;
}
- av_add_index_entry(vst, offset, i * rpl->frames_per_chunk,
- video_size, rpl->frames_per_chunk, 0);
+ if (vst)
+ av_add_index_entry(vst, offset, i * rpl->frames_per_chunk,
+ video_size, rpl->frames_per_chunk, 0);
if (ast)
av_add_index_entry(ast, offset + video_size, total_audio_size,
audio_size, audio_size * 8, 0);
More information about the ffmpeg-cvslog
mailing list