* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avformat.h"
-#include "common.h"
-
-typedef enum {
- PKT_MAP = 0xbc,
- PKT_MEDIA = 0xbf,
- PKT_EOS = 0xfb,
- PKT_FLT = 0xfc,
- PKT_UMF = 0xfd
-} pkt_type_t;
-typedef enum {
- MAT_NAME = 0x40,
- MAT_FIRST_FIELD = 0x41,
- MAT_LAST_FIELD = 0x42,
- MAT_MARK_IN = 0x43,
- MAT_MARK_OUT = 0x44,
- MAT_SIZE = 0x45
-} mat_tag_t;
-
-typedef enum {
- TRACK_NAME = 0x4c,
- TRACK_AUX = 0x4d,
- TRACK_VER = 0x4e,
- TRACK_MPG_AUX = 0x4f,
- TRACK_FPS = 0x50,
- TRACK_LINES = 0x51,
- TRACK_FPF = 0x52
-} track_tag_t;
+#include "libavutil/common.h"
+#include "avformat.h"
+#include "gxf.h"
typedef struct {
int64_t first_field;
return i;
}
st = av_new_stream(s, id);
+ if (!st)
+ return AVERROR(ENOMEM);
switch (format) {
case 3:
case 4:
st->codec->sample_rate = 48000;
st->codec->bit_rate = 3 * 1 * 48000 * 8;
st->codec->block_align = 3 * 1;
- st->codec->bits_per_sample = 24;
+ st->codec->bits_per_coded_sample = 24;
break;
case 10:
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->sample_rate = 48000;
st->codec->bit_rate = 2 * 1 * 48000 * 8;
st->codec->block_align = 2 * 1;
- st->codec->bits_per_sample = 16;
+ st->codec->bits_per_coded_sample = 16;
break;
case 17:
st->codec->codec_type = CODEC_TYPE_AUDIO;
/**
* \brief filters out interesting tags from material information.
- * \param len lenght of tag section, will be adjusted to contain remaining bytes
+ * \param len length of tag section, will be adjusted to contain remaining bytes
* \param si struct to store collected information into
*/
static void gxf_material_tags(ByteIOContext *pb, int *len, st_info_t *si) {
* \brief read index from FLT packet into stream 0 av_index
*/
static void gxf_read_index(AVFormatContext *s, int pkt_len) {
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVStream *st = s->streams[0];
uint32_t fields_per_map = get_le32(pb);
uint32_t map_cnt = get_le32(pb);
int i;
pkt_len -= 8;
if (map_cnt > 1000) {
- av_log(s, AV_LOG_ERROR, "GXF: too many index entries %u (%x)\n", map_cnt, map_cnt);
+ av_log(s, AV_LOG_ERROR, "too many index entries %u (%x)\n", map_cnt, map_cnt);
map_cnt = 1000;
}
if (pkt_len < 4 * map_cnt) {
- av_log(s, AV_LOG_ERROR, "GXF: invalid index length\n");
+ av_log(s, AV_LOG_ERROR, "invalid index length\n");
url_fskip(pb, pkt_len);
return;
}
}
static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) {
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
pkt_type_t pkt_type;
int map_len;
int len;
st_info_t si;
int i;
if (!parse_packet_header(pb, &pkt_type, &map_len) || pkt_type != PKT_MAP) {
- av_log(s, AV_LOG_ERROR, "GXF: map packet not found\n");
+ av_log(s, AV_LOG_ERROR, "map packet not found\n");
return 0;
}
map_len -= 2;
if (get_byte(pb) != 0x0e0 || get_byte(pb) != 0xff) {
- av_log(s, AV_LOG_ERROR, "GXF: unknown version or invalid map preamble\n");
+ av_log(s, AV_LOG_ERROR, "unknown version or invalid map preamble\n");
return 0;
}
map_len -= 2;
len = get_be16(pb); // length of material data section
if (len > map_len) {
- av_log(s, AV_LOG_ERROR, "GXF: material data longer than map data\n");
+ av_log(s, AV_LOG_ERROR, "material data longer than map data\n");
return 0;
}
map_len -= len;
map_len -= 2;
len = get_be16(pb); // length of track description
if (len > map_len) {
- av_log(s, AV_LOG_ERROR, "GXF: track description longer than map data\n");
+ av_log(s, AV_LOG_ERROR, "track description longer than map data\n");
return 0;
}
map_len -= len;
gxf_track_tags(pb, &track_len, &si);
url_fskip(pb, track_len);
if (!(track_type & 0x80)) {
- av_log(s, AV_LOG_ERROR, "GXF: invalid track type %x\n", track_type);
+ av_log(s, AV_LOG_ERROR, "invalid track type %x\n", track_type);
continue;
}
track_type &= 0x7f;
if ((track_id & 0xc0) != 0xc0) {
- av_log(s, AV_LOG_ERROR, "GXF: invalid track id %x\n", track_id);
+ av_log(s, AV_LOG_ERROR, "invalid track id %x\n", track_id);
continue;
}
track_id &= 0x3f;
st->duration = si.last_field - si.first_field;
}
if (len < 0)
- av_log(s, AV_LOG_ERROR, "GXF: invalid track description length specified\n");
+ av_log(s, AV_LOG_ERROR, "invalid track description length specified\n");
if (map_len)
url_fskip(pb, map_len);
if (!parse_packet_header(pb, &pkt_type, &len)) {
- av_log(s, AV_LOG_ERROR, "GXF: sync lost in header\n");
+ av_log(s, AV_LOG_ERROR, "sync lost in header\n");
return -1;
}
if (pkt_type == PKT_FLT) {
gxf_read_index(s, len);
if (!parse_packet_header(pb, &pkt_type, &len)) {
- av_log(s, AV_LOG_ERROR, "GXF: sync lost in header\n");
+ av_log(s, AV_LOG_ERROR, "sync lost in header\n");
return -1;
}
}
main_timebase.den = fps.num;
}
} else
- av_log(s, AV_LOG_INFO, "GXF: UMF packet too short\n");
+ av_log(s, AV_LOG_INFO, "UMF packet too short\n");
} else
- av_log(s, AV_LOG_INFO, "GXF: UMF packet missing\n");
+ av_log(s, AV_LOG_INFO, "UMF packet missing\n");
url_fskip(pb, len);
if (!main_timebase.num || !main_timebase.den)
main_timebase = (AVRational){1, 50}; // set some arbitrary fallback
int cur_track;
int64_t cur_timestamp = AV_NOPTS_VALUE;
int len;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
pkt_type_t type;
tmp = get_be32(pb);
start:
}
static int gxf_packet(AVFormatContext *s, AVPacket *pkt) {
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
pkt_type_t pkt_type;
int pkt_len;
while (!url_feof(pb)) {
+ AVStream *st;
int track_type, track_id, ret;
- int field_nr;
+ int field_nr, field_info, skip = 0;
+ int stream_index;
if (!parse_packet_header(pb, &pkt_type, &pkt_len)) {
if (!url_feof(pb))
- av_log(s, AV_LOG_ERROR, "GXF: sync lost\n");
+ av_log(s, AV_LOG_ERROR, "sync lost\n");
return -1;
}
if (pkt_type == PKT_FLT) {
continue;
}
if (pkt_len < 16) {
- av_log(s, AV_LOG_ERROR, "GXF: invalid media packet length\n");
+ av_log(s, AV_LOG_ERROR, "invalid media packet length\n");
continue;
}
pkt_len -= 16;
track_type = get_byte(pb);
track_id = get_byte(pb);
+ stream_index = get_sindex(s, track_id, track_type);
+ if (stream_index < 0)
+ return stream_index;
+ st = s->streams[stream_index];
field_nr = get_be32(pb);
- get_be32(pb); // field information
+ field_info = get_be32(pb);
get_be32(pb); // "timeline" field number
get_byte(pb); // flags
get_byte(pb); // reserved
- // NOTE: there is also data length information in the
- // field information, it might be better to take this into account
- // as well.
+ if (st->codec->codec_id == CODEC_ID_PCM_S24LE ||
+ st->codec->codec_id == CODEC_ID_PCM_S16LE) {
+ int first = field_info >> 16;
+ int last = field_info & 0xffff; // last is exclusive
+ int bps = av_get_bits_per_sample(st->codec->codec_id)>>3;
+ if (first <= last && last*bps <= pkt_len) {
+ url_fskip(pb, first*bps);
+ skip = pkt_len - last*bps;
+ pkt_len = (last-first)*bps;
+ } else
+ av_log(s, AV_LOG_ERROR, "invalid first and last sample values\n");
+ }
ret = av_get_packet(pb, pkt, pkt_len);
- pkt->stream_index = get_sindex(s, track_id, track_type);
+ if (skip)
+ url_fskip(pb, skip);
+ pkt->stream_index = stream_index;
pkt->dts = field_nr;
return ret;
}
- return AVERROR_IO;
+ return AVERROR(EIO);
}
static int gxf_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) {
if (idx < st->nb_index_entries - 2)
maxlen = st->index_entries[idx + 2].pos - pos;
maxlen = FFMAX(maxlen, 200 * 1024);
- url_fseek(&s->pb, pos, SEEK_SET);
+ url_fseek(s->pb, pos, SEEK_SET);
found = gxf_resync_media(s, maxlen, -1, timestamp);
if (FFABS(found - timestamp) > 4)
return -1;
static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index,
int64_t *pos, int64_t pos_limit) {
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int64_t res;
url_fseek(pb, *pos, SEEK_SET);
res = gxf_resync_media(s, pos_limit - *pos, -1, -1);
AVInputFormat gxf_demuxer = {
"gxf",
- "GXF format",
+ NULL_IF_CONFIG_SMALL("GXF format"),
0,
gxf_probe,
gxf_header,