lör 2018-08-25 klockan 02:00 -0700 skrev j...@wizardofthenet.com:
> > From: Jason Stevens <j...@wizardofthenet.com>
>
> ---
> libavformat/mxfenc.c | 47 ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 47 insertions(+)
>
> diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> index 7f629dbe53..cf58c8b834 100644
> --- a/libavformat/mxfenc.c
> +++ b/libavformat/mxfenc.c
> @@ -146,6 +146,11 @@ enum ULIndex {
> 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_JPEG2000,
> INDEX_H264,
> };
> @@ -345,6 +350,31 @@ static const MXFContainerEssenceEntry
> mxf_essence_container_uls[] = {
> {
> 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,0x0A,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,0x0A,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,0x0A,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,0x0A,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,0x0A,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
> },
> @@ -1998,6 +2028,23 @@ AVPacket *pkt)
> 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 = 10;
> + break;
> + case 1270:
> + sc->index = INDEX_DNXHR_444;
> + sc->component_depth = 10;
> + break;
> default:
> return -1;
> }
Don't have any idea about DNxHR, else the code looks OK enough.
/Tomas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
