| @@ -73,6 +73,7 @@ typedef struct { · 72 unmodified lines |
| 73 | 73 | const UID *codec_ul; |
| 74 | 74 | int order; ///< interleaving order if dts are equal |
| 75 | 75 | int interlaced; ///< whether picture is interlaced |
| 76 | + int field_dominance; ///< tff=1, bff=2 |
| 76 | 77 | int temporal_reordering; |
| 77 | 78 | AVRational aspect_ratio; ///< display aspect ratio |
| 78 | 79 | int closed_gop; ///< gop is closed, used in mpeg-2 frame parsing |
| @@ -284,6 +285,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = { · 205 unmodified lines |
| 284 | 285 | { 0x3208, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x0B,0x00,0x00,0x00}}, /* Display Height */ |
| 285 | 286 | { 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */ |
| 286 | 287 | { 0x3201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* Picture Essence Coding */ |
| 288 | + { 0x3212, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x03,0x01,0x06,0x00,0x00,0x00}}, /* Field Dominance (Opt) */ |
| 287 | 289 | // CDCI Picture Essence Descriptor |
| 288 | 290 | { 0x3301, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x05,0x03,0x0A,0x00,0x00,0x00}}, /* Component Depth */ |
| 289 | 291 | { 0x3302, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x05,0x00,0x00,0x00}}, /* Horizontal Subsampling */ |
| @@ -789,8 +791,11 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke · 499 unmodified lines |
| 789 | 791 | int stored_height = (st->codec->height+15)/16*16; |
| 790 | 792 | int display_height; |
| 791 | 793 | int f1, f2; |
| 794 | + unsigned desc_size = size+8+8+8+8+8+8+5+16+sc->interlaced*4+12+20; |
| 795 | + if (sc->interlaced && sc->field_dominance) |
| 796 | + desc_size += 5; |
| 792 | 797 | |
| 793 | | − mxf_write_generic_desc(s, st, key, size+8+8+8+8+8+8+5+16+sc->interlaced*4+12+20); |
| 798 | + mxf_write_generic_desc(s, st, key, desc_size); |
| 794 | 799 | |
| 795 | 800 | mxf_write_local_tag(pb, 4, 0x3203); |
| 796 | 801 | avio_wb32(pb, st->codec->width); |
| @@ -852,6 +857,12 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke · 55 unmodified lines |
| 852 | 857 | |
| 853 | 858 | mxf_write_local_tag(pb, 16, 0x3201); |
| 854 | 859 | avio_write(pb, *sc->codec_ul, 16); |
| 860 | + |
| 861 | + if (sc->interlaced && sc->field_dominance) { |
| 862 | + mxf_write_local_tag(pb, 1, 0x3212); |
| 863 | + avio_w8(pb, sc->field_dominance); |
| 864 | + } |
| 865 | + |
| 855 | 866 | } |
| 856 | 867 | |
| 857 | 868 | static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st) |
| @@ -1328,6 +1339,8 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, · 470 unmodified lines |
| 1328 | 1339 | st->codec->level = pkt->data[i+2] >> 4; |
| 1329 | 1340 | } else if (i + 5 < pkt->size && (pkt->data[i+1] & 0xf0) == 0x80) { // pict coding ext |
| 1330 | 1341 | sc->interlaced = !(pkt->data[i+5] & 0x80); // progressive frame |
| 1342 | + if (sc->interlaced) |
| 1343 | + sc->field_dominance = 1 + !(pkt->data[i+4] & 0x80); // top field first |
| 1331 | 1344 | break; |
| 1332 | 1345 | } |
| 1333 | 1346 | } else if (c == 0x1b8) { // gop |