History

avformat/iamf_parse: fix setting duration for the last subblock in a parameter definition

When subblock durations are constant, the last block may be smaller and the value needs to be calculated.

James Almer committed 1 year ago

Commit fb5e8ea1 parent d38fc252 files · +4 −2Browse files

Unified · Split

2 files
  1. libavformat/iamf_parse.c +2 −1
  2. libavformat/iamf_reader.c +2 −1
libavformat/iamf_parse.c+2−1
@@ -539,7 +539,8 @@ static int param_parse(void *s, IAMFContext *c, AVIOContext *pb, · 538 unmodified lines
539 if (constant_subblock_duration == 0) {539 if (constant_subblock_duration == 0) {
540 subblock_duration = ffio_read_leb(pb);540 subblock_duration = ffio_read_leb(pb);
541 total_duration += subblock_duration;541 total_duration += subblock_duration;
542 }542 } else if (i == nb_subblocks - 1)
543 subblock_duration = duration - i * constant_subblock_duration;
543 544
544 switch (type) {545 switch (type) {
545 case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN: {546 case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN: {
libavformat/iamf_reader.c+2−1
@@ -178,7 +178,8 @@ static int parameter_block_obu(AVFormatContext *s, IAMFDemuxContext *c, · 177 unmodified lines
178 if (!param_definition->mode && !constant_subblock_duration) {178 if (!param_definition->mode && !constant_subblock_duration) {
179 subblock_duration = ffio_read_leb(pb);179 subblock_duration = ffio_read_leb(pb);
180 total_duration += subblock_duration;180 total_duration += subblock_duration;
181 }181 } else if (i == nb_subblocks - 1)
182 subblock_duration = duration - i * constant_subblock_duration;
182 183
183 switch (param->type) {184 switch (param->type) {
184 case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN: {185 case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN: {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t