virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/mxf: set stream frame rates for ST 422 essence containers

Browse Source 
The MXF demuxer does not currently set AVStream::avg_frame_rate and ::r_frame_rate
when J2K essence is wrapped according to SMPTE ST 422.

Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Pierre-Anthony Lemieux 2022-09-06 14:51:44 -07:00 committed by Andreas Rheinhardt
parent f08d529e11
commit 48fa27e77a
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavformat/mxfdec.c
View File

@ -2141,6 +2141,13 @@ finish_decoding_index:
return ret;
}
static int mxf_is_st_422(const UID *essence_container_ul) {
static const uint8_t st_422_essence_container_ul[] = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0c };
return essence_container_ul && mxf_match_uid(*essence_container_ul, st_422_essence_container_ul,
sizeof(st_422_essence_container_ul));
}
static int mxf_is_intra_only(MXFDescriptor *descriptor)
{
return mxf_get_codec_ul(mxf_intra_only_essence_container_uls,
@ -2893,6 +2900,24 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
av_log(mxf->fc, AV_LOG_INFO, "Unknown frame layout type: %d\n", descriptor->frame_layout);
}
if (mxf_is_st_422(essence_container_ul)) {
switch ((*essence_container_ul)[14]) {
case 2: /* Cn: Clip- wrapped Picture Element */
case 3: /* I1: Interlaced Frame, 1 field/KLV */
case 4: /* I2: Interlaced Frame, 2 fields/KLV */
case 6: /* P1: Frame- wrapped Picture Element */
st->avg_frame_rate = source_track->edit_rate;
st->r_frame_rate = st->avg_frame_rate;
break;
case 5: /* F1: Field-wrapped Picture Element */
st->avg_frame_rate = av_mul_q(av_make_q(2, 1), source_track->edit_rate);
st->r_frame_rate = st->avg_frame_rate;
break;
default:
break;
}
}
if (st->codecpar->codec_id == AV_CODEC_ID_PRORES) {
switch (descriptor->essence_codec_ul[14]) {
case 1: st->codecpar->codec_tag = MKTAG('a','p','c','o'); break;