FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mxf: use appropriate printf format for gsize

Browse Source
This commit is contained in:
Thijs Vermeir 2012-12-18 16:50:37 +01:00
parent 67bbe5ebaf
commit 35a5100bc3
2 changed files with 65 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
gst/mxf/mxfdemux.c
View File

@ -326,8 +326,8 @@ gst_mxf_demux_pull_range (GstMXFDemux * demux, guint64 offset,
if (G_UNLIKELY (*buffer && gst_buffer_get_size (*buffer) != size)) { if (G_UNLIKELY (*buffer && gst_buffer_get_size (*buffer) != size)) {
GST_WARNING_OBJECT (demux, GST_WARNING_OBJECT (demux,
"partial pull got %u when expecting %u from offset %" G_GUINT64_FORMAT, "partial pull got %" G_GSIZE_FORMAT " when expecting %u from offset %"
gst_buffer_get_size (*buffer), size, offset); G_GUINT64_FORMAT, gst_buffer_get_size (*buffer), size, offset);
gst_buffer_unref (*buffer); gst_buffer_unref (*buffer);
ret = GST_FLOW_EOS; ret = GST_FLOW_EOS;
*buffer = NULL; *buffer = NULL;
@ -397,7 +397,7 @@ gst_mxf_demux_handle_partition_pack (GstMXFDemux * demux, const MXFUL * key,
gboolean ret; gboolean ret;
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Handling partition pack of size %u at offset %" "Handling partition pack of size %" G_GSIZE_FORMAT " at offset %"
G_GUINT64_FORMAT, gst_buffer_get_size (buffer), demux->offset); G_GUINT64_FORMAT, gst_buffer_get_size (buffer), demux->offset);
for (l = demux->partitions; l; l = l->next) { for (l = demux->partitions; l; l = l->next) {
@ -474,7 +474,7 @@ gst_mxf_demux_handle_primer_pack (GstMXFDemux * demux, const MXFUL * key,
gboolean ret; gboolean ret;
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Handling primer pack of size %u at offset %" "Handling primer pack of size %" G_GSIZE_FORMAT " at offset %"
G_GUINT64_FORMAT, gst_buffer_get_size (buffer), demux->offset); G_GUINT64_FORMAT, gst_buffer_get_size (buffer), demux->offset);
if (G_UNLIKELY (!demux->current_partition)) { if (G_UNLIKELY (!demux->current_partition)) {
@ -629,11 +629,11 @@ gst_mxf_demux_choose_package (GstMXFDemux * demux)
for (i = 0; i < demux->preface->content_storage->n_packages; i++) { for (i = 0; i < demux->preface->content_storage->n_packages; i++) {
if (demux->preface->content_storage->packages[i] && if (demux->preface->content_storage->packages[i] &&
MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface-> MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->content_storage->
content_storage->packages[i])) { packages[i])) {
ret = ret =
MXF_METADATA_GENERIC_PACKAGE (demux->preface-> MXF_METADATA_GENERIC_PACKAGE (demux->preface->content_storage->
content_storage->packages[i]); packages[i]);
break; break;
} }
} }
@ -793,8 +793,8 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
essence_container); essence_container);
if (track->parent.type == MXF_METADATA_TRACK_PICTURE_ESSENCE) { if (track->parent.type == MXF_METADATA_TRACK_PICTURE_ESSENCE) {
if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track-> if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->parent.
parent.descriptor[0])) descriptor[0]))
mxf_ul_to_string (&MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR mxf_ul_to_string (&MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR
(track->parent.descriptor[0])->picture_essence_coding, (track->parent.descriptor[0])->picture_essence_coding,
essence_compression); essence_compression);
@ -803,8 +803,8 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
g_strdup_printf ("video/x-mxf-%s-%s", essence_container, g_strdup_printf ("video/x-mxf-%s-%s", essence_container,
essence_compression); essence_compression);
} else if (track->parent.type == MXF_METADATA_TRACK_SOUND_ESSENCE) { } else if (track->parent.type == MXF_METADATA_TRACK_SOUND_ESSENCE) {
if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track-> if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent.
parent.descriptor[0])) descriptor[0]))
mxf_ul_to_string (&MXF_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR mxf_ul_to_string (&MXF_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR
(track->parent.descriptor[0])->sound_essence_compression, (track->parent.descriptor[0])->sound_essence_compression,
essence_compression); essence_compression);
@ -813,8 +813,8 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
g_strdup_printf ("audio/x-mxf-%s-%s", essence_container, g_strdup_printf ("audio/x-mxf-%s-%s", essence_container,
essence_compression); essence_compression);
} else if (track->parent.type == MXF_METADATA_TRACK_DATA_ESSENCE) { } else if (track->parent.type == MXF_METADATA_TRACK_DATA_ESSENCE) {
if (MXF_IS_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR (track-> if (MXF_IS_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR (track->parent.
parent.descriptor[0])) descriptor[0]))
mxf_ul_to_string (&MXF_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR mxf_ul_to_string (&MXF_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR
(track->parent.descriptor[0])->data_essence_coding, (track->parent.descriptor[0])->data_essence_coding,
essence_compression); essence_compression);
@ -1258,7 +1258,7 @@ gst_mxf_demux_handle_metadata (GstMXFDemux * demux, const MXFUL * key,
type = GST_READ_UINT16_BE (key->u + 13); type = GST_READ_UINT16_BE (key->u + 13);
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Handling metadata of size %u at offset %" "Handling metadata of size %" G_GSIZE_FORMAT " at offset %"
G_GUINT64_FORMAT " of type 0x%04x", gst_buffer_get_size (buffer), G_GUINT64_FORMAT " of type 0x%04x", gst_buffer_get_size (buffer),
demux->offset, type); demux->offset, type);
@ -1350,7 +1350,7 @@ gst_mxf_demux_handle_descriptive_metadata (GstMXFDemux * demux,
type = GST_READ_UINT24_BE (key->u + 13); type = GST_READ_UINT24_BE (key->u + 13);
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Handling descriptive metadata of size %u at offset %" "Handling descriptive metadata of size %" G_GSIZE_FORMAT " at offset %"
G_GUINT64_FORMAT " with scheme 0x%02x and type 0x%06x", G_GUINT64_FORMAT " with scheme 0x%02x and type 0x%06x",
gst_buffer_get_size (buffer), demux->offset, scheme, type); gst_buffer_get_size (buffer), demux->offset, scheme, type);
@ -1429,7 +1429,7 @@ gst_mxf_demux_handle_generic_container_system_item (GstMXFDemux * demux,
const MXFUL * key, GstBuffer * buffer) const MXFUL * key, GstBuffer * buffer)
{ {
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Handling generic container system item of size %u" "Handling generic container system item of size %" G_GSIZE_FORMAT
" at offset %" G_GUINT64_FORMAT, gst_buffer_get_size (buffer), " at offset %" G_GUINT64_FORMAT, gst_buffer_get_size (buffer),
demux->offset); demux->offset);
@ -1468,8 +1468,8 @@ gst_mxf_demux_pad_set_component (GstMXFDemux * demux, GstMXFDemuxPad * pad,
pad->current_component_index); pad->current_component_index);
pad->current_component = pad->current_component =
MXF_METADATA_SOURCE_CLIP (sequence-> MXF_METADATA_SOURCE_CLIP (sequence->structural_components[pad->
structural_components[pad->current_component_index]); current_component_index]);
if (pad->current_component == NULL) { if (pad->current_component == NULL) {
GST_ERROR_OBJECT (demux, "No such structural component"); GST_ERROR_OBJECT (demux, "No such structural component");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
@ -1477,8 +1477,8 @@ gst_mxf_demux_pad_set_component (GstMXFDemux * demux, GstMXFDemuxPad * pad,
if (!pad->current_component->source_package if (!pad->current_component->source_package
|| !pad->current_component->source_package->top_level || !pad->current_component->source_package->top_level
|| !MXF_METADATA_GENERIC_PACKAGE (pad-> || !MXF_METADATA_GENERIC_PACKAGE (pad->current_component->
current_component->source_package)->tracks) { source_package)->tracks) {
GST_ERROR_OBJECT (demux, "Invalid component"); GST_ERROR_OBJECT (demux, "Invalid component");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
@ -1593,7 +1593,7 @@ gst_mxf_demux_handle_generic_container_essence_element (GstMXFDemux * demux,
gboolean keyframe = TRUE; gboolean keyframe = TRUE;
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Handling generic container essence element of size %u" "Handling generic container essence element of size %" G_GSIZE_FORMAT
" at offset %" G_GUINT64_FORMAT, gst_buffer_get_size (buffer), " at offset %" G_GUINT64_FORMAT, gst_buffer_get_size (buffer),
demux->offset); demux->offset);
@ -1804,9 +1804,9 @@ gst_mxf_demux_handle_generic_container_essence_element (GstMXFDemux * demux,
pad->position += GST_BUFFER_DURATION (outbuf); pad->position += GST_BUFFER_DURATION (outbuf);
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Pushing buffer of size %u for track %u: timestamp %" GST_TIME_FORMAT "Pushing buffer of size %" G_GSIZE_FORMAT " for track %u: timestamp %"
" duration %" GST_TIME_FORMAT, gst_buffer_get_size (outbuf), GST_TIME_FORMAT " duration %" GST_TIME_FORMAT,
pad->material_track->parent.track_id, gst_buffer_get_size (outbuf), pad->material_track->parent.track_id,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf))); GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)));
@ -1888,7 +1888,7 @@ gst_mxf_demux_handle_random_index_pack (GstMXFDemux * demux, const MXFUL * key,
gboolean ret; gboolean ret;
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Handling random index pack of size %u at offset %" "Handling random index pack of size %" G_GSIZE_FORMAT " at offset %"
G_GUINT64_FORMAT, gst_buffer_get_size (buffer), demux->offset); G_GUINT64_FORMAT, gst_buffer_get_size (buffer), demux->offset);
if (demux->random_index_pack) { if (demux->random_index_pack) {
@ -1960,7 +1960,7 @@ gst_mxf_demux_handle_index_table_segment (GstMXFDemux * demux,
gboolean ret; gboolean ret;
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Handling index table segment of size %u at offset %" "Handling index table segment of size %" G_GSIZE_FORMAT " at offset %"
G_GUINT64_FORMAT, gst_buffer_get_size (buffer), demux->offset); G_GUINT64_FORMAT, gst_buffer_get_size (buffer), demux->offset);
if (!demux->current_partition->primer.mappings) { if (!demux->current_partition->primer.mappings) {
@ -2353,7 +2353,7 @@ gst_mxf_demux_handle_klv_packet (GstMXFDemux * demux, const MXFUL * key,
if (!mxf_is_mxf_packet (key)) { if (!mxf_is_mxf_packet (key)) {
GST_WARNING_OBJECT (demux, GST_WARNING_OBJECT (demux,
"Skipping non-MXF packet of size %u at offset %" "Skipping non-MXF packet of size %" G_GSIZE_FORMAT " at offset %"
G_GUINT64_FORMAT ", key: %s", gst_buffer_get_size (buffer), G_GUINT64_FORMAT ", key: %s", gst_buffer_get_size (buffer),
demux->offset, mxf_ul_to_string (key, key_str)); demux->offset, mxf_ul_to_string (key, key_str));
} else if (mxf_is_partition_pack (key)) { } else if (mxf_is_partition_pack (key)) {
@ -2397,11 +2397,11 @@ gst_mxf_demux_handle_klv_packet (GstMXFDemux * demux, const MXFUL * key,
ret = gst_mxf_demux_handle_index_table_segment (demux, key, buffer); ret = gst_mxf_demux_handle_index_table_segment (demux, key, buffer);
} else if (mxf_is_fill (key)) { } else if (mxf_is_fill (key)) {
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Skipping filler packet of size %u at offset %" "Skipping filler packet of size %" G_GSIZE_FORMAT " at offset %"
G_GUINT64_FORMAT, gst_buffer_get_size (buffer), demux->offset); G_GUINT64_FORMAT, gst_buffer_get_size (buffer), demux->offset);
} else { } else {
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Skipping unknown packet of size %u at offset %" "Skipping unknown packet of size %" G_GSIZE_FORMAT " at offset %"
G_GUINT64_FORMAT ", key: %s", gst_buffer_get_size (buffer), G_GUINT64_FORMAT ", key: %s", gst_buffer_get_size (buffer),
demux->offset, mxf_ul_to_string (key, key_str)); demux->offset, mxf_ul_to_string (key, key_str));
} }
@ -2911,7 +2911,8 @@ gst_mxf_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
demux = GST_MXF_DEMUX (parent); demux = GST_MXF_DEMUX (parent);
GST_LOG_OBJECT (demux, "received buffer of %u bytes at offset %" GST_LOG_OBJECT (demux,
"received buffer of %" G_GSIZE_FORMAT " bytes at offset %"
G_GUINT64_FORMAT, gst_buffer_get_size (inbuf), GST_BUFFER_OFFSET (inbuf)); G_GUINT64_FORMAT, gst_buffer_get_size (inbuf), GST_BUFFER_OFFSET (inbuf));
if (demux->src->len > 0) { if (demux->src->len > 0) {
@ -3101,8 +3102,8 @@ gst_mxf_demux_pad_set_position (GstMXFDemux * demux, GstMXFDemuxPad * p,
for (i = 0; i < p->material_track->parent.sequence->n_structural_components; for (i = 0; i < p->material_track->parent.sequence->n_structural_components;
i++) { i++) {
clip = clip =
MXF_METADATA_SOURCE_CLIP (p->material_track->parent. MXF_METADATA_SOURCE_CLIP (p->material_track->parent.sequence->
sequence->structural_components[i]); structural_components[i]);
if (clip->parent.duration <= 0) if (clip->parent.duration <= 0)
break; break;

52
gst/mxf/mxfmux.c
View File

@ -311,13 +311,13 @@ gst_mxf_mux_event_caps (GstPad * pad, GstCaps * caps)
for (i = 0; i < mux->preface->content_storage->n_packages; i++) { for (i = 0; i < mux->preface->content_storage->n_packages; i++) {
MXFMetadataSourcePackage *package; MXFMetadataSourcePackage *package;
if (!MXF_IS_METADATA_SOURCE_PACKAGE (mux->preface-> if (!MXF_IS_METADATA_SOURCE_PACKAGE (mux->preface->content_storage->
content_storage->packages[i])) packages[i]))
continue; continue;
package = package =
MXF_METADATA_SOURCE_PACKAGE (mux->preface-> MXF_METADATA_SOURCE_PACKAGE (mux->preface->content_storage->
content_storage->packages[i]); packages[i]);
if (!package->descriptor) if (!package->descriptor)
continue; continue;
@ -709,8 +709,8 @@ gst_mxf_mux_create_metadata (GstMXFMux * mux)
if (p->parent.n_tracks == 1) { if (p->parent.n_tracks == 1) {
p->descriptor = (MXFMetadataGenericDescriptor *) cpad->descriptor; p->descriptor = (MXFMetadataGenericDescriptor *) cpad->descriptor;
} else { } else {
MXF_METADATA_MULTIPLE_DESCRIPTOR (p-> MXF_METADATA_MULTIPLE_DESCRIPTOR (p->descriptor)->
descriptor)->sub_descriptors[n] = sub_descriptors[n] =
(MXFMetadataGenericDescriptor *) cpad->descriptor; (MXFMetadataGenericDescriptor *) cpad->descriptor;
} }
@ -935,8 +935,8 @@ gst_mxf_mux_create_metadata (GstMXFMux * mux)
g_new0 (MXFMetadataEssenceContainerData *, 1); g_new0 (MXFMetadataEssenceContainerData *, 1);
cstorage->essence_container_data[0] = (MXFMetadataEssenceContainerData *) cstorage->essence_container_data[0] = (MXFMetadataEssenceContainerData *)
g_object_new (MXF_TYPE_METADATA_ESSENCE_CONTAINER_DATA, NULL); g_object_new (MXF_TYPE_METADATA_ESSENCE_CONTAINER_DATA, NULL);
mxf_uuid_init (&MXF_METADATA_BASE (cstorage->essence_container_data[0])-> mxf_uuid_init (&MXF_METADATA_BASE (cstorage->
instance_uid, mux->metadata); essence_container_data[0])->instance_uid, mux->metadata);
g_hash_table_insert (mux->metadata, g_hash_table_insert (mux->metadata,
&MXF_METADATA_BASE (cstorage->essence_container_data[0])->instance_uid, &MXF_METADATA_BASE (cstorage->essence_container_data[0])->instance_uid,
cstorage->essence_container_data[0]); cstorage->essence_container_data[0]);
@ -1121,9 +1121,9 @@ gst_mxf_mux_handle_buffer (GstMXFMux * mux, GstMXFMuxPad * cpad)
if (buf) { if (buf) {
GST_DEBUG_OBJECT (cpad->collect.pad, GST_DEBUG_OBJECT (cpad->collect.pad,
"Handling buffer of size %u for track %u at position %" G_GINT64_FORMAT, "Handling buffer of size %" G_GSIZE_FORMAT " for track %u at position %"
gst_buffer_get_size (buf), cpad->source_track->parent.track_id, G_GINT64_FORMAT, gst_buffer_get_size (buf),
cpad->pos); cpad->source_track->parent.track_id, cpad->pos);
} else { } else {
flush = TRUE; flush = TRUE;
GST_DEBUG_OBJECT (cpad->collect.pad, GST_DEBUG_OBJECT (cpad->collect.pad,
@ -1164,8 +1164,9 @@ gst_mxf_mux_handle_buffer (GstMXFMux * mux, GstMXFMuxPad * cpad)
gst_buffer_unref (buf); gst_buffer_unref (buf);
GST_DEBUG_OBJECT (cpad->collect.pad, "Pushing buffer of size %u for track %u", GST_DEBUG_OBJECT (cpad->collect.pad,
map.size, cpad->source_track->parent.track_id); "Pushing buffer of size %" G_GSIZE_FORMAT " for track %u", map.size,
cpad->source_track->parent.track_id);
gst_buffer_unmap (packet, &map); gst_buffer_unmap (packet, &map);
if ((ret = gst_mxf_mux_push (mux, packet)) != GST_FLOW_OK) { if ((ret = gst_mxf_mux_push (mux, packet)) != GST_FLOW_OK) {
@ -1258,23 +1259,22 @@ gst_mxf_mux_handle_eos (GstMXFMux * mux)
/* Update durations */ /* Update durations */
cpad->source_track->parent.sequence->duration = cpad->pos; cpad->source_track->parent.sequence->duration = cpad->pos;
MXF_METADATA_SOURCE_CLIP (cpad->source_track->parent. MXF_METADATA_SOURCE_CLIP (cpad->source_track->parent.sequence->
sequence->structural_components[0])->parent.duration = cpad->pos; structural_components[0])->parent.duration = cpad->pos;
for (i = 0; i < mux->preface->content_storage->packages[0]->n_tracks; i++) { for (i = 0; i < mux->preface->content_storage->packages[0]->n_tracks; i++) {
MXFMetadataTimelineTrack *track; MXFMetadataTimelineTrack *track;
if (!MXF_IS_METADATA_TIMELINE_TRACK (mux->preface-> if (!MXF_IS_METADATA_TIMELINE_TRACK (mux->preface->content_storage->
content_storage->packages[0]->tracks[i]) packages[0]->tracks[i])
|| !MXF_IS_METADATA_SOURCE_CLIP (mux->preface-> || !MXF_IS_METADATA_SOURCE_CLIP (mux->preface->content_storage->
content_storage->packages[0]->tracks[i]->sequence-> packages[0]->tracks[i]->sequence->structural_components[0]))
structural_components[0]))
continue; continue;
track = track =
MXF_METADATA_TIMELINE_TRACK (mux->preface-> MXF_METADATA_TIMELINE_TRACK (mux->preface->content_storage->
content_storage->packages[0]->tracks[i]); packages[0]->tracks[i]);
if (MXF_METADATA_SOURCE_CLIP (track->parent. if (MXF_METADATA_SOURCE_CLIP (track->parent.sequence->
sequence->structural_components[0])->source_track_id == structural_components[0])->source_track_id ==
cpad->source_track->parent.track_id) { cpad->source_track->parent.track_id) {
track->parent.sequence->structural_components[0]->duration = cpad->pos; track->parent.sequence->structural_components[0]->duration = cpad->pos;
track->parent.sequence->duration = cpad->pos; track->parent.sequence->duration = cpad->pos;
@ -1285,8 +1285,8 @@ gst_mxf_mux_handle_eos (GstMXFMux * mux)
/* Update timecode track duration */ /* Update timecode track duration */
{ {
MXFMetadataTimelineTrack *track = MXFMetadataTimelineTrack *track =
MXF_METADATA_TIMELINE_TRACK (mux->preface-> MXF_METADATA_TIMELINE_TRACK (mux->preface->content_storage->
content_storage->packages[0]->tracks[0]); packages[0]->tracks[0]);
MXFMetadataSequence *sequence = track->parent.sequence; MXFMetadataSequence *sequence = track->parent.sequence;
MXFMetadataTimecodeComponent *component = MXFMetadataTimecodeComponent *component =
MXF_METADATA_TIMECODE_COMPONENT (sequence->structural_components[0]); MXF_METADATA_TIMECODE_COMPONENT (sequence->structural_components[0]);