Specify the server address when opening an rtp:// URL in rtsp.c, so

[ffmpeg] / libavformat / mxf.c

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index d8809043df4cd96a2ca0c32b9497babf57435ceb..cb227ac244711dc75a3f0a5287ee62ef840721d5 100644 (file)
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -47,6 +47,7 @@
 
 #include "avformat.h"
 #include "aes.h"
+#include "bytestream.h"
 
 typedef uint8_t UID[16];
 
@@ -60,18 +61,17 @@ enum MXFMetadataSetType {
     MultipleDescriptor,
     Descriptor,
     Track,
-    EssenceContainerData,
     CryptoContext,
 };
 
-typedef struct MXFCryptoContext {
+typedef struct {
     UID uid;
     enum MXFMetadataSetType type;
     UID context_uid;
     UID source_container_ul;
 } MXFCryptoContext;
 
-typedef struct MXFStructuralComponent {
+typedef struct {
     UID uid;
     enum MXFMetadataSetType type;
     UID source_package_uid;
@@ -81,7 +81,7 @@ typedef struct MXFStructuralComponent {
     int source_track_id;
 } MXFStructuralComponent;
 
-typedef struct MXFSequence {
+typedef struct {
     UID uid;
     enum MXFMetadataSetType type;
     UID data_definition_ul;
@@ -90,7 +90,7 @@ typedef struct MXFSequence {
     int64_t duration;
 } MXFSequence;
 
-typedef struct MXFTrack {
+typedef struct {
     UID uid;
     enum MXFMetadataSetType type;
     MXFSequence *sequence; /* mandatory, and only one */
@@ -100,7 +100,7 @@ typedef struct MXFTrack {
     AVRational edit_rate;
 } MXFTrack;
 
-typedef struct MXFDescriptor {
+typedef struct {
     UID uid;
     enum MXFMetadataSetType type;
     UID essence_container_ul;
@@ -118,7 +118,7 @@ typedef struct MXFDescriptor {
     int extradata_size;
 } MXFDescriptor;
 
-typedef struct MXFPackage {
+typedef struct {
     UID uid;
     enum MXFMetadataSetType type;
     UID package_uid;
@@ -128,18 +128,12 @@ typedef struct MXFPackage {
     UID descriptor_ref;
 } MXFPackage;
 
-typedef struct MXFEssenceContainerData {
-    UID uid;
-    enum MXFMetadataSetType type;
-    UID linked_package_uid;
-} MXFEssenceContainerData;
-
 typedef struct {
     UID uid;
     enum MXFMetadataSetType type;
 } MXFMetadataSet;
 
-typedef struct MXFContext {
+typedef struct {
     UID *packages_refs;
     int packages_count;
     MXFMetadataSet **metadata_sets;
@@ -148,7 +142,7 @@ typedef struct MXFContext {
     struct AVAES *aesc;
 } MXFContext;
 
-typedef struct KLVPacket {
+typedef struct {
     UID key;
     offset_t offset;
     uint64_t length;
@@ -159,18 +153,18 @@ enum MXFWrappingScheme {
     Clip,
 };
 
-typedef struct MXFCodecUL {
+typedef struct {
     UID uid;
     enum CodecID id;
     enum MXFWrappingScheme wrapping;
 } MXFCodecUL;
 
-typedef struct MXFDataDefinitionUL {
+typedef struct {
     UID uid;
     enum CodecType type;
 } MXFDataDefinitionUL;
 
-typedef struct MXFMetadataReadTableEntry {
+typedef struct {
     const UID key;
     int (*read)();
     int ctx_size;
@@ -248,6 +242,7 @@ static int mxf_get_d10_aes3_packet(ByteIOContext *pb, AVStream *st, AVPacket *pk
 {
     uint8_t buffer[61444];
     uint8_t *buf_ptr, *end_ptr, *data_ptr;
+    int i;
 
     if (length > 61444) /* worst case PAL 1920 samples 8 channels */
         return -1;
@@ -256,17 +251,15 @@ static int mxf_get_d10_aes3_packet(ByteIOContext *pb, AVStream *st, AVPacket *pk
     data_ptr = pkt->data;
     end_ptr = buffer + length;
     buf_ptr = buffer + 4; /* skip SMPTE 331M header */
-    for (; buf_ptr < end_ptr; buf_ptr += 4) {
-        if (st->codec->bits_per_sample == 24) {
-            data_ptr[0] = (buf_ptr[2] >> 4) | ((buf_ptr[3] & 0x0f) << 4);
-            data_ptr[1] = (buf_ptr[1] >> 4) | ((buf_ptr[2] & 0x0f) << 4);
-            data_ptr[2] = (buf_ptr[0] >> 4) | ((buf_ptr[1] & 0x0f) << 4);
-            data_ptr += 3;
-        } else {
-            data_ptr[0] = (buf_ptr[2] >> 4) | ((buf_ptr[3] & 0x0f) << 4);
-            data_ptr[1] = (buf_ptr[1] >> 4) | ((buf_ptr[2] & 0x0f) << 4);
-            data_ptr += 2;
+    for (; buf_ptr < end_ptr; ) {
+        for (i = 0; i < st->codec->channels; i++) {
+            uint32_t sample = bytestream_get_le32(&buf_ptr);
+            if (st->codec->bits_per_sample == 24)
+                bytestream_put_le24(&data_ptr, (sample >> 4) & 0xffffff);
+            else
+                bytestream_put_le16(&data_ptr, (sample >> 12) & 0xffff);
         }
+        buf_ptr += 32 - st->codec->channels*4; // always 8 channels stored SMPTE 331M
     }
     pkt->size = data_ptr - pkt->data;
     return 0;
@@ -368,7 +361,7 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
         } else
             url_fskip(&s->pb, klv.length);
     }
-    return AVERROR_IO;
+    return AVERROR(EIO);
 }
 
 static int mxf_add_metadata_set(MXFContext *mxf, void *metadata_set)
@@ -600,6 +593,9 @@ static const MXFCodecUL mxf_codec_uls[] = {
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x05 }, CODEC_ID_MPEG2VIDEO, Frame }, /* D-10 30Mbps PAL */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x03 }, CODEC_ID_MPEG2VIDEO, Frame }, /* D-10 40Mbps PAL */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01 }, CODEC_ID_MPEG2VIDEO, Frame }, /* D-10 50Mbps PAL */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x06 }, CODEC_ID_MPEG2VIDEO, Frame }, /* D-10 30Mbps NTSC */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x04 }, CODEC_ID_MPEG2VIDEO, Frame }, /* D-10 40Mbps NTSC */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x02 }, CODEC_ID_MPEG2VIDEO, Frame }, /* D-10 50Mbps NTSC */
 
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x02,0x00 }, CODEC_ID_MPEG2VIDEO, Frame }, /* 422P@ML I-Frame */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x02,0x03,0x00 }, CODEC_ID_MPEG2VIDEO, Frame }, /* 422P@ML Long GoP */
@@ -643,9 +639,12 @@ static const MXFCodecUL mxf_sound_essence_container_uls[] = {
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x40,0x01 },        CODEC_ID_MP2, Frame }, /* MPEG-ES Frame wrapped, 0x40 ??? stream id */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0xc0,0x01 },        CODEC_ID_MP2, Frame }, /* MPEG-ES Frame wrapped, 0xc0 MPA stream id */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0xc0,0x02 },        CODEC_ID_MP2,  Clip }, /* MPEG-ES Clip wrapped, 0xc0 MPA stream id */
-    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x05,0x01 },  CODEC_ID_PCM_S16BE, Frame }, /* D-10 Mapping 30Mbps PAL Extended Template */
-    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x03,0x01 },  CODEC_ID_PCM_S16BE, Frame }, /* D-10 Mapping 40Mbps PAL Extended Template */
-    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 },  CODEC_ID_PCM_S16BE, Frame }, /* D-10 Mapping 50Mbps PAL Extended Template */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x05,0x01 },  CODEC_ID_PCM_S16LE, Frame }, /* D-10 Mapping 30Mbps PAL Extended Template */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x03,0x01 },  CODEC_ID_PCM_S16LE, Frame }, /* D-10 Mapping 40Mbps PAL Extended Template */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 },  CODEC_ID_PCM_S16LE, Frame }, /* D-10 Mapping 50Mbps PAL Extended Template */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x06,0x01 },  CODEC_ID_PCM_S16LE, Frame }, /* D-10 Mapping 30Mbps NTSC Extended Template */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x04,0x01 },  CODEC_ID_PCM_S16LE, Frame }, /* D-10 Mapping 40Mbps NTSC Extended Template */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x02,0x01 },  CODEC_ID_PCM_S16LE, Frame }, /* D-10 Mapping 50Mbps NTSC Extended Template */
     { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },       CODEC_ID_NONE, Frame },
 };
 
@@ -865,8 +864,6 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
                     st->codec->codec_id = CODEC_ID_PCM_S24BE;
                 else if (descriptor->bits_per_sample == 32)
                     st->codec->codec_id = CODEC_ID_PCM_S32BE;
-                if (descriptor->essence_container_ul[13] == 0x01) /* D-10 Mapping */
-                    st->codec->channels = 8; /* force channels to 8 */
             } else if (st->codec->codec_id == CODEC_ID_MP2) {
                 st->need_parsing = AVSTREAM_PARSE_FULL;
             }