mirror of https://git.ffmpeg.org/ffmpeg.git
lavf/mxfdec: support segmented frame layout as separate fields layout
According to S377M, segmented frame layout is identical to separate field layout except that the two fields are taken from a single scan of the incoming image, ie: they are coincident in time. Thus the resulting frame is progressive. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
2480da12a4
commit
f6518e51b8
|
@ -2002,10 +2002,6 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
|
||||||
st->codec->width = descriptor->width;
|
st->codec->width = descriptor->width;
|
||||||
st->codec->height = descriptor->height; /* Field height, not frame height */
|
st->codec->height = descriptor->height; /* Field height, not frame height */
|
||||||
switch (descriptor->frame_layout) {
|
switch (descriptor->frame_layout) {
|
||||||
case SegmentedFrame:
|
|
||||||
/* This one is a weird layout I don't fully understand. */
|
|
||||||
av_log(mxf->fc, AV_LOG_INFO, "SegmentedFrame layout isn't currently supported\n");
|
|
||||||
break;
|
|
||||||
case FullFrame:
|
case FullFrame:
|
||||||
st->codec->field_order = AV_FIELD_PROGRESSIVE;
|
st->codec->field_order = AV_FIELD_PROGRESSIVE;
|
||||||
break;
|
break;
|
||||||
|
@ -2017,6 +2013,8 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
|
||||||
It's also for compatibility with the old behavior. */
|
It's also for compatibility with the old behavior. */
|
||||||
case MixedFields:
|
case MixedFields:
|
||||||
break;
|
break;
|
||||||
|
case SegmentedFrame:
|
||||||
|
st->codec->field_order = AV_FIELD_PROGRESSIVE;
|
||||||
case SeparateFields:
|
case SeparateFields:
|
||||||
switch (descriptor->field_dominance) {
|
switch (descriptor->field_dominance) {
|
||||||
case MXF_TFF:
|
case MXF_TFF:
|
||||||
|
|
Loading…
Reference in New Issue