OPSonyOpt, /* FATE sample, violates the spec in places */
} MXFOP;
-typedef struct {
+typedef struct MXFPartition {
int closed;
int complete;
MXFPartitionType type;
int pack_length;
} MXFPartition;
-typedef struct {
+typedef struct MXFCryptoContext {
UID uid;
enum MXFMetadataSetType type;
UID source_container_ul;
} MXFCryptoContext;
-typedef struct {
+typedef struct MXFStructuralComponent {
UID uid;
enum MXFMetadataSetType type;
UID source_package_uid;
int source_track_id;
} MXFStructuralComponent;
-typedef struct {
+typedef struct MXFSequence {
UID uid;
enum MXFMetadataSetType type;
UID data_definition_ul;
uint8_t origin;
} MXFSequence;
-typedef struct {
+typedef struct MXFTrack {
UID uid;
enum MXFMetadataSetType type;
MXFSequence *sequence; /* mandatory, and only one */
int64_t original_duration; /* st->duration in SampleRate/EditRate units */
} MXFTrack;
-typedef struct {
+typedef struct MXFDescriptor {
UID uid;
enum MXFMetadataSetType type;
UID essence_container_ul;
enum AVPixelFormat pix_fmt;
} MXFDescriptor;
-typedef struct {
+typedef struct MXFIndexTableSegment {
UID uid;
enum MXFMetadataSetType type;
int edit_unit_byte_count;
int nb_index_entries;
} MXFIndexTableSegment;
-typedef struct {
+typedef struct MXFPackage {
UID uid;
enum MXFMetadataSetType type;
UID package_uid;
UID descriptor_ref;
} MXFPackage;
-typedef struct {
+typedef struct MXFMetadataSet {
UID uid;
enum MXFMetadataSetType type;
} MXFMetadataSet;
/* decoded index table */
-typedef struct {
+typedef struct MXFIndexTable {
int index_sid;
int body_sid;
int nb_ptses; /* number of PTSes or total duration of index */
AVIndexEntry *fake_index; /* used for calling ff_index_search_timestamp() */
} MXFIndexTable;
-typedef struct {
+typedef struct MXFContext {
MXFPartition *partitions;
unsigned partitions_count;
MXFOP op;
/* NOTE: klv_offset is not set (-1) for local keys */
typedef int MXFMetadataReadFunc(void *arg, AVIOContext *pb, int tag, int size, UID uid, int64_t klv_offset);
-typedef struct {
+typedef struct MXFMetadataReadTableEntry {
const UID key;
MXFMetadataReadFunc *read;
int ctx_size;
}
}
- av_dlog(mxf->fc,
+ av_log(mxf->fc, AV_LOG_TRACE,
"PartitionPack: ThisPartition = 0x%"PRIX64
", PreviousPartition = 0x%"PRIX64", "
"FooterPartition = 0x%"PRIX64", IndexSID = %i, BodySID = %i\n",
switch(tag) {
case 0x3F05:
segment->edit_unit_byte_count = avio_rb32(pb);
- av_dlog(NULL, "EditUnitByteCount %d\n", segment->edit_unit_byte_count);
+ av_log(NULL, AV_LOG_TRACE, "EditUnitByteCount %d\n", segment->edit_unit_byte_count);
break;
case 0x3F06:
segment->index_sid = avio_rb32(pb);
- av_dlog(NULL, "IndexSID %d\n", segment->index_sid);
+ av_log(NULL, AV_LOG_TRACE, "IndexSID %d\n", segment->index_sid);
break;
case 0x3F07:
segment->body_sid = avio_rb32(pb);
- av_dlog(NULL, "BodySID %d\n", segment->body_sid);
+ av_log(NULL, AV_LOG_TRACE, "BodySID %d\n", segment->body_sid);
break;
case 0x3F0A:
- av_dlog(NULL, "IndexEntryArray found\n");
+ av_log(NULL, AV_LOG_TRACE, "IndexEntryArray found\n");
return mxf_read_index_entry_array(pb, segment);
case 0x3F0B:
segment->index_edit_rate.num = avio_rb32(pb);
segment->index_edit_rate.den = avio_rb32(pb);
- av_dlog(NULL, "IndexEditRate %d/%d\n", segment->index_edit_rate.num,
+ av_log(NULL, AV_LOG_TRACE, "IndexEditRate %d/%d\n", segment->index_edit_rate.num,
segment->index_edit_rate.den);
break;
case 0x3F0C:
segment->index_start_position = avio_rb64(pb);
- av_dlog(NULL, "IndexStartPosition %"PRId64"\n", segment->index_start_position);
+ av_log(NULL, AV_LOG_TRACE, "IndexStartPosition %"PRId64"\n", segment->index_start_position);
break;
case 0x3F0D:
segment->index_duration = avio_rb64(pb);
- av_dlog(NULL, "IndexDuration %"PRId64"\n", segment->index_duration);
+ av_log(NULL, AV_LOG_TRACE, "IndexDuration %"PRId64"\n", segment->index_duration);
break;
}
return 0;
do {
code = avio_r8(pb);
value = avio_r8(pb);
- av_dlog(NULL, "pixel layout: code %#x\n", code);
+ av_log(NULL, AV_LOG_TRACE, "pixel layout: code %#x\n", code);
if (ofs <= 14) {
layout[ofs++] = code;
if (IS_KLV_KEY(uid, mxf_sony_mpeg4_extradata)) {
av_free(descriptor->extradata);
descriptor->extradata_size = 0;
- descriptor->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
+ descriptor->extradata = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!descriptor->extradata)
return AVERROR(ENOMEM);
descriptor->extradata_size = size;
MXFPackage *temp_package = NULL;
int i, j, k, ret;
- av_dlog(mxf->fc, "metadata sets count %d\n", mxf->metadata_sets_count);
+ av_log(mxf->fc, AV_LOG_TRACE, "metadata sets count %d\n", mxf->metadata_sets_count);
/* TODO: handle multiple material packages (OP3x) */
for (i = 0; i < mxf->packages_count; i++) {
material_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[i], MaterialPackage);
}
}
if (!source_package) {
- av_dlog(mxf->fc, "material track %d: no corresponding source package found\n", material_track->track_id);
+ av_log(mxf->fc, AV_LOG_TRACE, "material track %d: no corresponding source package found\n", material_track->track_id);
break;
}
for (k = 0; k < source_package->tracks_count; k++) {
}
}
if (descriptor->extradata) {
- st->codec->extradata = av_mallocz(descriptor->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ st->codec->extradata = av_mallocz(descriptor->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
if (st->codec->extradata) {
memcpy(st->codec->extradata, descriptor->extradata, descriptor->extradata_size);
st->codec->extradata_size = descriptor->extradata_size;
if (!*str)
return AVERROR(ENOMEM);
if (!strftime(*str, 32, "%Y-%m-%d %H:%M:%S", &time))
- str[0] = '\0';
+ (*str)[0] = '\0';
return 0;
}
uint64_t next = avio_tell(pb) + size;
UID uid = {0};
- av_dlog(mxf->fc, "local tag %#04x size %d\n", tag, size);
+ av_log(mxf->fc, AV_LOG_TRACE, "local tag %#04x size %d\n", tag, size);
if (!size) { /* ignore empty tag, needed for some files with empty UMID tag */
av_log(mxf->fc, AV_LOG_ERROR, "local tag %#04x with 0 size\n", tag);
continue;
int local_tag = AV_RB16(mxf->local_tags+i*18);
if (local_tag == tag) {
memcpy(uid, mxf->local_tags+i*18+2, 16);
- av_dlog(mxf->fc, "local tag %#04x\n", local_tag);
+ av_log(mxf->fc, AV_LOG_TRACE, "local tag %#04x\n", local_tag);
PRINT_KEY(mxf->fc, "uid", uid);
}
}
avio_seek(pb, mxf->run_in + mxf->current_partition->previous_partition, SEEK_SET);
mxf->current_partition = NULL;
- av_dlog(mxf->fc, "seeking to previous partition\n");
+ av_log(mxf->fc, AV_LOG_TRACE, "seeking to previous partition\n");
return 1;
}
: mxf->last_partition;
if (!offset) {
- av_dlog(mxf->fc, "no last partition\n");
+ av_log(mxf->fc, AV_LOG_TRACE, "no last partition\n");
return 0;
}
- av_dlog(mxf->fc, "seeking to last partition\n");
+ av_log(mxf->fc, AV_LOG_TRACE, "seeking to last partition\n");
/* remember where we were so we don't end up seeking further back than this */
mxf->last_forward_tell = avio_tell(pb);
}
PRINT_KEY(s, "read header", klv.key);
- av_dlog(s, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset);
+ av_log(s, AV_LOG_TRACE, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset);
if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key) ||
IS_KLV_KEY(klv.key, mxf_essence_element_key) ||
IS_KLV_KEY(klv.key, mxf_avid_essence_element_key) ||
if ((ret = klv_read_packet(&klv, s->pb)) < 0)
return ret;
PRINT_KEY(s, "read packet", klv.key);
- av_dlog(s, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset);
+ av_log(s, AV_LOG_TRACE, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset);
if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) {
ret = mxf_decrypt_triplet(s, pkt, &klv);
if (ret < 0) {