mirror of https://git.ffmpeg.org/ffmpeg.git
mxfdec: Set DTS and PTS on video packets
This involves computing DTS/PTS from the index tables. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
8a2cb2abbf
commit
7d531e83b6
|
@ -201,6 +201,9 @@ typedef struct {
|
||||||
int current_stream;
|
int current_stream;
|
||||||
int d10;
|
int d10;
|
||||||
int broken_index;
|
int broken_index;
|
||||||
|
int64_t first_dts; /* DTS = EditUnit + first_dts */
|
||||||
|
int64_t *ptses; /* maps EditUnit -> PTS */
|
||||||
|
int nb_ptses;
|
||||||
} MXFContext;
|
} MXFContext;
|
||||||
|
|
||||||
enum MXFWrappingScheme {
|
enum MXFWrappingScheme {
|
||||||
|
@ -478,6 +481,11 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||||
pkt->pos = e->pos;
|
pkt->pos = e->pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && mxf->ptses && mxf->current_edit_unit < mxf->nb_ptses) {
|
||||||
|
pkt->dts = mxf->current_edit_unit + mxf->first_dts;
|
||||||
|
pkt->pts = mxf->ptses[mxf->current_edit_unit];
|
||||||
|
}
|
||||||
|
|
||||||
pkt->stream_index = mxf->current_stream++;
|
pkt->stream_index = mxf->current_stream++;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1229,6 +1237,91 @@ static int mxf_parse_index(MXFContext *mxf, int track_id, AVStream *st, MXFIndex
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int mxf_compute_ptses(MXFContext *mxf, MXFIndexTableSegment **sorted_segments, int nb_sorted_segments)
|
||||||
|
{
|
||||||
|
int ret, i, j, x;
|
||||||
|
int8_t max_temporal_offset = -128;
|
||||||
|
|
||||||
|
/* first compute how many entries we have */
|
||||||
|
for (i = 0; i < nb_sorted_segments; i++) {
|
||||||
|
MXFIndexTableSegment *s = sorted_segments[i];
|
||||||
|
|
||||||
|
if (!s->nb_index_entries)
|
||||||
|
return 0; /* no TemporalOffsets */
|
||||||
|
|
||||||
|
if (s->nb_index_entries == 2 * s->index_duration + 1)
|
||||||
|
mxf->nb_ptses += s->index_duration; /* Avid index */
|
||||||
|
else
|
||||||
|
mxf->nb_ptses += s->nb_index_entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* paranoid check */
|
||||||
|
if (mxf->nb_ptses <= 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (!(mxf->ptses = av_calloc(mxf->nb_ptses, sizeof(int64_t))))
|
||||||
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
|
/* we may have a few bad TemporalOffsets
|
||||||
|
* make sure the corresponding PTSes don't have the bogus value 0 */
|
||||||
|
for (x = 0; x < mxf->nb_ptses; x++)
|
||||||
|
mxf->ptses[x] = AV_NOPTS_VALUE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* We have this:
|
||||||
|
*
|
||||||
|
* x TemporalOffset
|
||||||
|
* 0: 0
|
||||||
|
* 1: 1
|
||||||
|
* 2: 1
|
||||||
|
* 3: -2
|
||||||
|
* 4: 1
|
||||||
|
* 5: 1
|
||||||
|
* 6: -2
|
||||||
|
*
|
||||||
|
* We want to transform it into this:
|
||||||
|
*
|
||||||
|
* x DTS PTS
|
||||||
|
* 0: -1 0
|
||||||
|
* 1: 0 3
|
||||||
|
* 2: 1 1
|
||||||
|
* 3: 2 2
|
||||||
|
* 4: 3 6
|
||||||
|
* 5: 4 4
|
||||||
|
* 6: 5 5
|
||||||
|
*
|
||||||
|
* We do this by bucket sorting x by x+TemporalOffset[x] into mxf->ptses,
|
||||||
|
* then settings mxf->first_dts = -max(TemporalOffset[x]).
|
||||||
|
* The latter makes DTS <= PTS.
|
||||||
|
*/
|
||||||
|
for (i = x = 0; i < nb_sorted_segments; i++) {
|
||||||
|
MXFIndexTableSegment *s = sorted_segments[i];
|
||||||
|
int index_delta = 1;
|
||||||
|
|
||||||
|
if (s->nb_index_entries == 2 * s->index_duration + 1)
|
||||||
|
index_delta = 2; /* Avid index */
|
||||||
|
|
||||||
|
for (j = 0; j < s->nb_index_entries; j += index_delta, x++) {
|
||||||
|
int offset = s->temporal_offset_entries[j] / index_delta;
|
||||||
|
int index = x + offset;
|
||||||
|
|
||||||
|
if (index < 0 || index >= mxf->nb_ptses) {
|
||||||
|
av_log(mxf->fc, AV_LOG_ERROR,
|
||||||
|
"index entry %i + TemporalOffset %i = %i, which is out of bounds\n",
|
||||||
|
x, offset, index);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
mxf->ptses[index] = x;
|
||||||
|
max_temporal_offset = FFMAX(max_temporal_offset, offset);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mxf->first_dts = -max_temporal_offset;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int mxf_parse_structural_metadata(MXFContext *mxf)
|
static int mxf_parse_structural_metadata(MXFContext *mxf)
|
||||||
{
|
{
|
||||||
MXFPackage *material_package = NULL;
|
MXFPackage *material_package = NULL;
|
||||||
|
@ -1435,7 +1528,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
|
||||||
goto fail_and_free;
|
goto fail_and_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = 0;
|
ret = mxf_compute_ptses(mxf, sorted_segments, nb_sorted_segments);
|
||||||
|
|
||||||
fail_and_free:
|
fail_and_free:
|
||||||
av_free(sorted_segments);
|
av_free(sorted_segments);
|
||||||
|
@ -1777,6 +1870,7 @@ static int mxf_read_close(AVFormatContext *s)
|
||||||
av_freep(&mxf->metadata_sets);
|
av_freep(&mxf->metadata_sets);
|
||||||
av_freep(&mxf->aesc);
|
av_freep(&mxf->aesc);
|
||||||
av_freep(&mxf->local_tags);
|
av_freep(&mxf->local_tags);
|
||||||
|
av_freep(&mxf->ptses);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,48 +1,48 @@
|
||||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 6144 size: 24801
|
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 6144 size: 24801
|
||||||
ret: 0 st:-1 flags:0 ts:-1.000000
|
ret: 0 st:-1 flags:0 ts:-1.000000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 6144 size: 24801
|
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 6144 size: 24801
|
||||||
ret: 0 st:-1 flags:1 ts: 1.894167
|
ret: 0 st:-1 flags:1 ts: 1.894167
|
||||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 460800 size: 24712
|
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
|
||||||
ret: 0 st: 0 flags:0 ts: 0.800000
|
ret: 0 st: 0 flags:0 ts: 0.800000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 460800 size: 24712
|
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
|
||||||
ret: 0 st: 0 flags:1 ts:-0.320000
|
ret: 0 st: 0 flags:1 ts:-0.320000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 6144 size: 24801
|
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 6144 size: 24801
|
||||||
ret:-1 st: 1 flags:0 ts: 2.560000
|
ret:-1 st: 1 flags:0 ts: 2.560000
|
||||||
ret: 0 st: 1 flags:1 ts: 1.480000
|
ret: 0 st: 1 flags:1 ts: 1.480000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 460800 size: 24712
|
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
|
||||||
ret: 0 st:-1 flags:0 ts: 0.365002
|
ret: 0 st:-1 flags:0 ts: 0.365002
|
||||||
ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 211968 size: 24787
|
ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211968 size: 24787
|
||||||
ret: 0 st:-1 flags:1 ts:-0.740831
|
ret: 0 st:-1 flags:1 ts:-0.740831
|
||||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 6144 size: 24801
|
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 6144 size: 24801
|
||||||
ret:-1 st: 0 flags:0 ts: 2.160000
|
ret:-1 st: 0 flags:0 ts: 2.160000
|
||||||
ret: 0 st: 0 flags:1 ts: 1.040000
|
ret: 0 st: 0 flags:1 ts: 1.040000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 460800 size: 24712
|
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
|
||||||
ret: 0 st: 1 flags:0 ts:-0.040000
|
ret: 0 st: 1 flags:0 ts:-0.040000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 6144 size: 24801
|
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 6144 size: 24801
|
||||||
ret: 0 st: 1 flags:1 ts: 2.840000
|
ret: 0 st: 1 flags:1 ts: 2.840000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 460800 size: 24712
|
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
|
||||||
ret:-1 st:-1 flags:0 ts: 1.730004
|
ret:-1 st:-1 flags:0 ts: 1.730004
|
||||||
ret: 0 st:-1 flags:1 ts: 0.624171
|
ret: 0 st:-1 flags:1 ts: 0.624171
|
||||||
ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 211968 size: 24787
|
ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211968 size: 24787
|
||||||
ret: 0 st: 0 flags:0 ts:-0.480000
|
ret: 0 st: 0 flags:0 ts:-0.480000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 6144 size: 24801
|
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 6144 size: 24801
|
||||||
ret: 0 st: 0 flags:1 ts: 2.400000
|
ret: 0 st: 0 flags:1 ts: 2.400000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 460800 size: 24712
|
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
|
||||||
ret:-1 st: 1 flags:0 ts: 1.320000
|
ret:-1 st: 1 flags:0 ts: 1.320000
|
||||||
ret: 0 st: 1 flags:1 ts: 0.200000
|
ret: 0 st: 1 flags:1 ts: 0.200000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 6144 size: 24801
|
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 6144 size: 24801
|
||||||
ret: 0 st:-1 flags:0 ts:-0.904994
|
ret: 0 st:-1 flags:0 ts:-0.904994
|
||||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 6144 size: 24801
|
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 6144 size: 24801
|
||||||
ret: 0 st:-1 flags:1 ts: 1.989173
|
ret: 0 st:-1 flags:1 ts: 1.989173
|
||||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 460800 size: 24712
|
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
|
||||||
ret: 0 st: 0 flags:0 ts: 0.880000
|
ret: 0 st: 0 flags:0 ts: 0.880000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 460800 size: 24712
|
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
|
||||||
ret: 0 st: 0 flags:1 ts:-0.240000
|
ret: 0 st: 0 flags:1 ts:-0.240000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 6144 size: 24801
|
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 6144 size: 24801
|
||||||
ret:-1 st: 1 flags:0 ts: 2.680000
|
ret:-1 st: 1 flags:0 ts: 2.680000
|
||||||
ret: 0 st: 1 flags:1 ts: 1.560000
|
ret: 0 st: 1 flags:1 ts: 1.560000
|
||||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 460800 size: 24712
|
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
|
||||||
ret: 0 st:-1 flags:0 ts: 0.460008
|
ret: 0 st:-1 flags:0 ts: 0.460008
|
||||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 460800 size: 24712
|
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
|
||||||
ret: 0 st:-1 flags:1 ts:-0.645825
|
ret: 0 st:-1 flags:1 ts:-0.645825
|
||||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 6144 size: 24801
|
ret: 0 st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos: 6144 size: 24801
|
||||||
|
|
Loading…
Reference in New Issue