mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
avformat/mxfenc: simplify dnxhd handling and add more flavors
This commit is contained in:
Baptiste Coudurier
parent
bc940cf95c
commit
8c733013af
@ -142,23 +142,10 @@ enum ULIndex {
|
||||
INDEX_DV100_1080_50,
|
||||
INDEX_DV100_720_60,
|
||||
INDEX_DV100_720_50,
|
||||
INDEX_DNXHD_1080p_10bit_HIGH,
|
||||
INDEX_DNXHD_1080p_8bit_MEDIUM,
|
||||
INDEX_DNXHD_1080p_8bit_HIGH,
|
||||
INDEX_DNXHD_1080i_10bit_HIGH,
|
||||
INDEX_DNXHD_1080i_8bit_MEDIUM,
|
||||
INDEX_DNXHD_1080i_8bit_HIGH,
|
||||
INDEX_DNXHD_720p_10bit,
|
||||
INDEX_DNXHD_720p_8bit_HIGH,
|
||||
INDEX_DNXHD_720p_8bit_MEDIUM,
|
||||
INDEX_DNXHD_720p_8bit_LOW,
|
||||
INDEX_DNXHR_LB,
|
||||
INDEX_DNXHR_SQ,
|
||||
INDEX_DNXHR_HQ,
|
||||
INDEX_DNXHR_HQX,
|
||||
INDEX_DNXHR_444,
|
||||
INDEX_DNXHD,
|
||||
INDEX_JPEG2000,
|
||||
INDEX_H264,
|
||||
INDEX_S436M,
|
||||
};
|
||||
|
||||
static const struct {
|
||||
@ -169,7 +156,7 @@ static const struct {
|
||||
{ AV_CODEC_ID_PCM_S24LE, INDEX_AES3 },
|
||||
{ AV_CODEC_ID_PCM_S16LE, INDEX_AES3 },
|
||||
{ AV_CODEC_ID_DVVIDEO, INDEX_DV },
|
||||
{ AV_CODEC_ID_DNXHD, INDEX_DNXHD_1080p_10bit_HIGH },
|
||||
{ AV_CODEC_ID_DNXHD, INDEX_DNXHD },
|
||||
{ AV_CODEC_ID_JPEG2000, INDEX_JPEG2000 },
|
||||
{ AV_CODEC_ID_H264, INDEX_H264 },
|
||||
{ AV_CODEC_ID_NONE }
|
||||
@ -307,81 +294,11 @@ static const MXFContainerEssenceEntry mxf_essence_container_uls[] = {
|
||||
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x18,0x01,0x01,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x08,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHD 1080p 10bit high
|
||||
// DNxHD
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHD 1080p 8bit medium
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x03,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHD 1080p 8bit high
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x04,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHD 1080i 10bit high
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x07,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHD 1080i 8bit medium
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x08,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHD 1080i 8bit high
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x09,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHD 720p 10bit
|
||||
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x10,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHD 720p 8bit high
|
||||
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x11,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHD 720p 8bit medium
|
||||
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x12,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHD 720p 8bit low
|
||||
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x71,0x13,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHR LB - CID 1274
|
||||
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x71,0x28,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHR SQ - CID 1273
|
||||
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x71,0x27,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHR HQ - CID 1272
|
||||
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x71,0x26,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHR HQX - CID 1271
|
||||
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x71,0x25,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// DNxHR 444 - CID 1270
|
||||
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x71,0x24,0x00,0x00 },
|
||||
mxf_write_cdci_desc },
|
||||
// JPEG2000
|
||||
{ { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0c,0x01,0x00 },
|
||||
{ 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x08,0x00 },
|
||||
@ -1363,7 +1280,7 @@ static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID
|
||||
default: f1 = 0; f2 = 0; break;
|
||||
}
|
||||
|
||||
if (!sc->interlaced) {
|
||||
if (!sc->interlaced && f2) {
|
||||
f2 = 0;
|
||||
f1 *= 2;
|
||||
}
|
||||
@ -2028,90 +1945,81 @@ static int mxf_write_partition(AVFormatContext *s, int bodysid,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st,
|
||||
AVPacket *pkt)
|
||||
static const struct {
|
||||
int cid;
|
||||
UID codec_ul;
|
||||
} mxf_dnxhd_codec_uls[] = {
|
||||
{ 1235, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 } }, // 1080p 10bit HIGH
|
||||
{ 1237, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x03,0x00,0x00 } }, // 1080p 8bit MED
|
||||
{ 1238, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x04,0x00,0x00 } }, // 1080p 8bit HIGH
|
||||
{ 1241, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x07,0x00,0x00 } }, // 1080i 10bit HIGH
|
||||
{ 1242, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x08,0x00,0x00 } }, // 1080i 8bit MED
|
||||
{ 1243, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x09,0x00,0x00 } }, // 1080i 8bit HIGH
|
||||
{ 1244, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x0a,0x00,0x00 } }, // 1080i 8bit TR
|
||||
{ 1250, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x10,0x00,0x00 } }, // 720p 10bit
|
||||
{ 1251, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x11,0x00,0x00 } }, // 720p 8bit HIGH
|
||||
{ 1252, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x12,0x00,0x00 } }, // 720p 8bit MED
|
||||
{ 1253, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x13,0x00,0x00 } }, // 720p 8bit LOW
|
||||
{ 1256, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x16,0x00,0x00 } }, // 1080p 10bit 444
|
||||
{ 1258, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x18,0x00,0x00 } }, // 720p 8bit TR
|
||||
{ 1259, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x19,0x00,0x00 } }, // 1080p 8bit TR
|
||||
{ 1260, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x1a,0x00,0x00 } }, // 1080i 8bit TR MBAFF
|
||||
{ 1270, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x24,0x00,0x00 } }, // DNXHR 444
|
||||
{ 1271, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x25,0x00,0x00 } }, // DNXHR HQX
|
||||
{ 1272, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x26,0x00,0x00 } }, // DNXHR HQ
|
||||
{ 1273, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x27,0x00,0x00 } }, // DNXHR SQ
|
||||
{ 1274, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x28,0x00,0x00 } }, // DNXHR LB
|
||||
};
|
||||
|
||||
static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt)
|
||||
{
|
||||
MXFContext *mxf = s->priv_data;
|
||||
MXFStreamContext *sc = st->priv_data;
|
||||
int cid;
|
||||
uint8_t* header_cid;
|
||||
int frame_size = 0;
|
||||
int i, cid, frame_size = 0;
|
||||
|
||||
if (mxf->header_written)
|
||||
return 1;
|
||||
|
||||
if (pkt->size < 43)
|
||||
return -1;
|
||||
return 0;
|
||||
|
||||
header_cid = pkt->data + 0x28;
|
||||
cid = header_cid[0] << 24 | header_cid[1] << 16 | header_cid[2] << 8 | header_cid[3];
|
||||
sc->codec_ul = NULL;
|
||||
cid = AV_RB32(pkt->data + 0x28);
|
||||
for (i = 0; i < FF_ARRAY_ELEMS(mxf_dnxhd_codec_uls); i++) {
|
||||
if (cid == mxf_dnxhd_codec_uls[i].cid) {
|
||||
sc->codec_ul = &mxf_dnxhd_codec_uls[i].codec_ul;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!sc->codec_ul)
|
||||
return 0;
|
||||
|
||||
sc->component_depth = 0;
|
||||
switch (pkt->data[0x21] >> 5) {
|
||||
case 1: sc->component_depth = 8; break;
|
||||
case 2: sc->component_depth = 10; break;
|
||||
case 3: sc->component_depth = 12; break;
|
||||
}
|
||||
if (!sc->component_depth)
|
||||
return 0;
|
||||
|
||||
if ((frame_size = avpriv_dnxhd_get_frame_size(cid)) == DNXHD_VARIABLE) {
|
||||
frame_size = avpriv_dnxhd_get_hr_frame_size(cid, st->codecpar->width, st->codecpar->height);
|
||||
}
|
||||
|
||||
if (frame_size < 0)
|
||||
return -1;
|
||||
if ((sc->interlaced = avpriv_dnxhd_get_interlaced(cid)) < 0)
|
||||
return AVERROR_INVALIDDATA;
|
||||
return 0;
|
||||
|
||||
switch (cid) {
|
||||
case 1235:
|
||||
sc->index = INDEX_DNXHD_1080p_10bit_HIGH;
|
||||
sc->component_depth = 10;
|
||||
break;
|
||||
case 1237:
|
||||
sc->index = INDEX_DNXHD_1080p_8bit_MEDIUM;
|
||||
break;
|
||||
case 1238:
|
||||
sc->index = INDEX_DNXHD_1080p_8bit_HIGH;
|
||||
break;
|
||||
case 1241:
|
||||
sc->index = INDEX_DNXHD_1080i_10bit_HIGH;
|
||||
sc->component_depth = 10;
|
||||
break;
|
||||
case 1242:
|
||||
sc->index = INDEX_DNXHD_1080i_8bit_MEDIUM;
|
||||
break;
|
||||
case 1243:
|
||||
sc->index = INDEX_DNXHD_1080i_8bit_HIGH;
|
||||
break;
|
||||
case 1250:
|
||||
sc->index = INDEX_DNXHD_720p_10bit;
|
||||
sc->component_depth = 10;
|
||||
break;
|
||||
case 1251:
|
||||
sc->index = INDEX_DNXHD_720p_8bit_HIGH;
|
||||
break;
|
||||
case 1252:
|
||||
sc->index = INDEX_DNXHD_720p_8bit_MEDIUM;
|
||||
break;
|
||||
case 1253:
|
||||
sc->index = INDEX_DNXHD_720p_8bit_LOW;
|
||||
break;
|
||||
case 1274:
|
||||
sc->index = INDEX_DNXHR_LB;
|
||||
break;
|
||||
case 1273:
|
||||
sc->index = INDEX_DNXHR_SQ;
|
||||
break;
|
||||
case 1272:
|
||||
sc->index = INDEX_DNXHR_HQ;
|
||||
break;
|
||||
case 1271:
|
||||
sc->index = INDEX_DNXHR_HQX;
|
||||
sc->component_depth = st->codecpar->bits_per_raw_sample;
|
||||
break;
|
||||
case 1270:
|
||||
sc->index = INDEX_DNXHR_444;
|
||||
sc->component_depth = st->codecpar->bits_per_raw_sample;
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
if ((sc->interlaced = avpriv_dnxhd_get_interlaced(cid)) < 0)
|
||||
return 0;
|
||||
|
||||
if (cid >= 1270) { // RI raster
|
||||
av_reduce(&sc->aspect_ratio.num, &sc->aspect_ratio.den,
|
||||
st->codecpar->width, st->codecpar->height,
|
||||
INT_MAX);
|
||||
} else {
|
||||
sc->aspect_ratio = (AVRational){ 16, 9 };
|
||||
}
|
||||
|
||||
sc->codec_ul = &mxf_essence_container_uls[sc->index].codec_ul;
|
||||
sc->aspect_ratio = (AVRational){ 16, 9 };
|
||||
sc->frame_size = pkt->size;
|
||||
|
||||
return 1;
|
||||
@ -2575,7 +2483,7 @@ static int mxf_write_header(AVFormatContext *s)
|
||||
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) {
|
||||
AVDictionaryEntry *e = av_dict_get(st->metadata, "data_type", NULL, 0);
|
||||
if (e && !strcmp(e->value, "vbi_vanc_smpte_436M")) {
|
||||
sc->index = 38;
|
||||
sc->index = INDEX_S436M;
|
||||
} else {
|
||||
av_log(s, AV_LOG_ERROR, "track %d: unsupported data type\n", i);
|
||||
return -1;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user