On Mon, Jan 09, 2017 at 09:56:50AM +0100, Tobias Rapp wrote:
> OpenDML specification v1.02 states that entries of a master index chunk
> shall point to standard or field index chunks.
>
> Changed incorrect duration of last master index entry to -1 in case it
> points to another master index.
>
> Propagate error when index write fails.
>
> Signed-off-by: Tobias Rapp <t.r...@noa-archive.com>
> ---
> libavformat/avienc.c | 30 +++++++++++++++++++++++-------
> 1 file changed, 23 insertions(+), 7 deletions(-)
>
> diff --git a/libavformat/avienc.c b/libavformat/avienc.c
> index fd16fff..5d5c02a 100644
> --- a/libavformat/avienc.c
> +++ b/libavformat/avienc.c
> @@ -524,7 +524,13 @@ static int avi_write_header(AVFormatContext *s)
> return 0;
> }
>
> -static void update_odml_entry(AVFormatContext *s, int stream_index, int64_t
> ix, int size)
> +/* Index entry points to standard index */
> +#define AVI_UPDATE_ODML_ENTRY_DEFAULT 0x00000000
> +
> +/* Index entry points to another master index */
> +#define AVI_UPDATE_ODML_ENTRY_MASTER 0x00000001
> +
> +static void update_odml_entry(AVFormatContext *s, int stream_index, int64_t
> ix, int size, int flags)
> {
> AVIOContext *pb = s->pb;
> AVIContext *avi = s->priv_data;
> @@ -544,7 +550,10 @@ static void update_odml_entry(AVFormatContext *s, int
> stream_index, int64_t ix,
> avio_wl64(pb, ix); /* qwOffset */
> avio_wl32(pb, size); /* dwSize */
> ff_parse_specific_params(s->streams[stream_index], &au_byterate,
> &au_ssize, &au_scale);
> - if (s->streams[stream_index]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO
> && au_ssize > 0) {
> + if (flags & AVI_UPDATE_ODML_ENTRY_MASTER) {
> + av_assert0(s->strict_std_compliance <= FF_COMPLIANCE_NORMAL);
> + avio_wl32(pb, -1); /* dwDuration (undefined) */
> + } else if (s->streams[stream_index]->codecpar->codec_type ==
> AVMEDIA_TYPE_AUDIO && au_ssize > 0) {
> uint32_t audio_segm_size = (avist->audio_strm_length -
> avist->indexes.audio_strm_offset);
> if ((audio_segm_size % au_ssize > 0) && !avist->sample_requested) {
> avpriv_request_sample(s, "OpenDML index duration for audio
> packets with partial frames");
> @@ -567,6 +576,12 @@ static int avi_write_ix(AVFormatContext *s)
>
> av_assert0(pb->seekable);
>
> + if (avi->riff_id >= AVI_MASTER_INDEX_SIZE && s->strict_std_compliance >
> FF_COMPLIANCE_NORMAL) {
> + av_log(s, AV_LOG_ERROR, "Invalid riff index %d >= %d\n",
> + avi->riff_id, AVI_MASTER_INDEX_SIZE);
> + return AVERROR(EINVAL);
> + }
isnt it better to warn the user and inform him at the end what size
of reserved space would have been needed?
not saying iam against this, i do see how it is formally correct to
fail hard but it feels painfull to me to fail
muxing at 256gb hard when we can perfectly fine just continue and
the user can just remux the file with bigger reserved master index
to fix it
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Concerning the gods, I have no means of knowing whether they exist or not
or of what sort they may be, because of the obscurity of the subject, and
the brevity of human life -- Protagoras
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
