On 2014-06-06 09:49, Martin Storsjö wrote:
Module: libav Branch: master Commit: e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0cAuthor: Martin Storsjö <mar...@martin.st> Committer: Martin Storsjö <mar...@martin.st> Date: Tue Jun 3 14:48:19 2014 +0300 mov: Export geotag metadata fields The '?xyz' form is used by android devices (and according to apple mailing list archives, also by older iOS devices). The 'loci' field (defined in 3GPP 26.244) is used by recent iOS devices. Even though the loci field can contain an altitude, it was plain 0 in my sample. Just export longitude and latitude, in a string format matching the one used by the '?xyz' metadata field. --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -208,6 +208,44 @@ static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len) +static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len) +{ + char language[4] = { 0 }; + char buf[100]; + uint16_t langcode = 0; + double longitude, latitude, altitude; + const char *key = "location"; + + if (len < 4 + 2 + 1 + 1 + 4 + 4 + 4) + return AVERROR_INVALIDDATA; + + avio_skip(pb, 4); // version+flags + langcode = avio_rb16(pb); + ff_mov_lang_to_iso639(langcode, language); + len -= 6; + + len -= avio_get_str(pb, len, buf, sizeof(buf)); // place name + if (len < 1) + return AVERROR_INVALIDDATA; + avio_skip(pb, 1); // role + len -= 1; + + if (len < 14) + return AVERROR_INVALIDDATA; + longitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16); + latitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16); + altitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16); + + // Try to output in the same format as the ?xyz field + snprintf(buf, sizeof(buf), "%+08.4f%+09.4f/", latitude, longitude); + if (*language && strcmp(language, "und")) { + char key2[16]; + snprintf(key2, sizeof(key2), "%s-%s", key, language); + av_dict_set(&c->fc->metadata, key2, buf, 0); + } + return av_dict_set(&c->fc->metadata, key, buf, 0); +}
libavformat/mov.c:216:33: warning: variable 'altitude' set but not used [-Wunused-but-set-variable]
IIUC you ignore the z coordinate on purpose, so maybe the variable should be set av_unused or reading the z coordinate skipped completely.
Diego _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
