diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-24 09:43:02 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-28 06:29:58 +0200 |
| commit | 0df4e1ff930fedbcc7bf7b77acc7db101ce07c0b (patch) | |
| tree | 2fe14e612dc26fb71481152771b4671b93373e92 /libavformat/smacker.c | |
| parent | 40494460f51541530d8ce02ffee88b75d503e33d (diff) | |
| download | ffmpeg-0df4e1ff930fedbcc7bf7b77acc7db101ce07c0b.tar.gz | |
avformat/smacker: Fix duration for PCM audio
For non-PCM audio, a Smacker frame contains the size of the decoded
audio in the first four bytes of the audio packet data; for PCM data,
said information would be redundant and according to [1] this field does
not exist. Therefore this commit sets the duration and timestamps
properly for PCM audio.
[1]: https://wiki.multimedia.cx/index.php/Smacker#Audio_Track_Chunk
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat/smacker.c')
| -rw-r--r-- | libavformat/smacker.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 4ab150a6f0..b7a68a63f3 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -52,6 +52,7 @@ typedef struct SmackerContext { int cur_frame; int videoindex; int indexes[7]; + int duration_size[7]; /* current frame for demuxing */ uint32_t frame_size; int flags; @@ -197,6 +198,8 @@ static int smacker_read_header(AVFormatContext *s) if (par->bits_per_coded_sample == 16 && par->codec_id == AV_CODEC_ID_PCM_U8) par->codec_id = AV_CODEC_ID_PCM_S16LE; + else + smk->duration_size[i] = 4; avpriv_set_pts_info(ast, 64, 1, par->sample_rate * par->channels * par->bits_per_coded_sample / 8); } @@ -297,7 +300,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) uint32_t size; size = avio_rl32(s->pb); - if ((int)size < 8 || size > smk->frame_size) { + if ((int)size < 4 + smk->duration_size[i] || size > smk->frame_size) { av_log(s, AV_LOG_ERROR, "Invalid audio part size\n"); ret = AVERROR_INVALIDDATA; goto next_frame; @@ -315,7 +318,8 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) } pkt->stream_index = smk->indexes[i]; pkt->pts = smk->aud_pts[i]; - pkt->duration = AV_RL32(pkt->data); + pkt->duration = smk->duration_size[i] ? AV_RL32(pkt->data) + : size; smk->aud_pts[i] += pkt->duration; smk->next_audio_index = i + 1; return 0; |