From 72b995ad79ba4e59347e6d6b2b95aa4a2e548bd3 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Fri, 7 Feb 2014 13:17:03 +1000 Subject: [PATCH] Add meta-data mappings for GPS and camera make and model to camerabin. This enables writing gps positioning information to captured images. Change-Id: I663f7b94b5e6040865358df1ae45d67b73c54f92 Reviewed-by: Yoann Lopes --- src/plugins/gstreamer/camerabin/camerabinmetadata.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp index 4dd4c750..b265fc2a 100644 --- a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp @@ -152,13 +152,20 @@ static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] = #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 30) // Photos - { QMediaMetaData::CameraManufacturer, 0, QVariant::String }, - { QMediaMetaData::CameraModel, 0, QVariant::String }, + { QMediaMetaData::CameraManufacturer, GST_TAG_DEVICE_MANUFACTURER, QVariant::String }, + { QMediaMetaData::CameraModel, GST_TAG_DEVICE_MODEL, QVariant::String }, //{ QMediaMetaData::Event, 0, QVariant::String }, //{ QMediaMetaData::Subject, 0, QVariant::String }, { QMediaMetaData::Orientation, GST_TAG_IMAGE_ORIENTATION, QVariant::String }, + // GPS + { QMediaMetaData::GPSLatitude, GST_TAG_GEO_LOCATION_LATITUDE, QVariant::Double }, + { QMediaMetaData::GPSLongitude, GST_TAG_GEO_LOCATION_LONGITUDE, QVariant::Double }, + { QMediaMetaData::GPSAltitude, GST_TAG_GEO_LOCATION_ELEVATION, QVariant::Double }, + { QMediaMetaData::GPSTrack, GST_TAG_GEO_LOCATION_MOVEMENT_DIRECTION, QVariant::Double }, + { QMediaMetaData::GPSSpeed, GST_TAG_GEO_LOCATION_MOVEMENT_SPEED, QVariant::Double }, + { QMediaMetaData::GPSImgDirection, GST_TAG_GEO_LOCATION_CAPTURE_DIRECTION, QVariant::Double } #endif };