diff options
| author | Marton Balint <cus@passwd.hu> | 2020-02-28 01:10:45 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-03-14 22:25:25 +0100 |
| commit | 27a8146990e6e5f798a115b4491d0f67147c1c60 (patch) | |
| tree | c60f12ece8ad29bd51f15df45d1fdbaf633cf240 /libavformat/mxfdec.c | |
| parent | aef2016bb02fba377481789bf6a84e1176b83c25 (diff) | |
avformat/mxf: get rid of samples per frame array usage
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/mxfdec.c')
| -rw-r--r-- | libavformat/mxfdec.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 9a48e2d2d1..9113e2a09c 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3307,20 +3307,17 @@ static int mxf_get_next_track_edit_unit(MXFContext *mxf, MXFTrack *track, int64_ static int64_t mxf_compute_sample_count(MXFContext *mxf, AVStream *st, int64_t edit_unit) { - int i, total = 0, size = 0; MXFTrack *track = st->priv_data; AVRational time_base = av_inv_q(track->edit_rate); AVRational sample_rate = av_inv_q(st->time_base); - const MXFSamplesPerFrame *spf = NULL; - int64_t sample_count; // For non-audio sample_count equals current edit unit if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) return edit_unit; - if ((sample_rate.num / sample_rate.den) == 48000) - spf = ff_mxf_get_samples_per_frame(mxf->fc, time_base); - if (!spf) { + if ((sample_rate.num / sample_rate.den) == 48000) { + return av_rescale_q(edit_unit, sample_rate, track->edit_rate); + } else { int remainder = (sample_rate.num * time_base.num) % (time_base.den * sample_rate.den); if (remainder) @@ -3331,20 +3328,6 @@ static int64_t mxf_compute_sample_count(MXFContext *mxf, AVStream *st, sample_rate.num, sample_rate.den); return av_rescale_q(edit_unit, sample_rate, track->edit_rate); } - - while (spf->samples_per_frame[size]) { - total += spf->samples_per_frame[size]; - size++; - } - - av_assert2(size); - - sample_count = (edit_unit / size) * (uint64_t)total; - for (i = 0; i < edit_unit % size; i++) { - sample_count += spf->samples_per_frame[i]; - } - - return sample_count; } /** |