RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mlpdec: reset lossless crc checking when stream ends 

Fixes invalid reports of bad lossless crc.
While here make end of stream message into debug level as it is
not really important to user.
Also wait for new major sync frame as invalid concating of files
may produce invalid files, which cause various errors.
This commit is contained in:
Paul B Mahol 2021-08-28 01:57:31 +02:00
parent 9f420163c6
commit 034133a0df
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/mlpdec.c
View File

@ -53,6 +53,8 @@
typedef struct SubStream {
/// Set if a valid restart header has been read. Otherwise the substream cannot be decoded.
uint8_t restart_seen;
/// Set if end of stream is encountered
uint8_t end_of_stream;
//@{
/** restart header data */
@ -1286,8 +1288,8 @@ static int read_access_unit(AVCodecContext *avctx, void* data,
else if (m->avctx->codec_id == AV_CODEC_ID_MLP && shorten_by != 0xD234)
return AVERROR_INVALIDDATA;
if (substr == m->max_decoded_substream)
av_log(m->avctx, AV_LOG_INFO, "End of stream indicated.\n");
av_log(m->avctx, AV_LOG_DEBUG, "End of stream indicated.\n");
s->end_of_stream = 1;
}
if (substream_parity_present[substr]) {
@ -1319,6 +1321,16 @@ next_substr:
if ((ret = output_data(m, m->max_decoded_substream, data, got_frame_ptr)) < 0)
return ret;
for (substr = 0; substr <= m->max_decoded_substream; substr++){
SubStream *s = &m->substream[substr];
if (s->end_of_stream) {
s->lossless_check_data = 0xffffffff;
s->end_of_stream = 0;
m->params_valid = 0;
}
}
return length;
substream_length_mismatch: