{ "global_sidx", "Write a global sidx index at the start of the file", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_GLOBAL_SIDX}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
{ "write_colr", "Write colr atom (Experimental, may be renamed or changed, do not use from scripts)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_WRITE_COLR}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
{ "write_gama", "Write deprecated gama atom", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_WRITE_GAMA}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
+ { "use_metadata_tags", "Use mdta atom for metadata.", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_USE_MDTA}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
FF_RTP_FLAG_OPTS(MOVMuxContext, rtp_flags),
{ "skip_iods", "Skip writing iods atom.", offsetof(MOVMuxContext, iods_skip), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
{ "iods_audio_profile", "iods audio profile atom.", offsetof(MOVMuxContext, iods_audio_profile), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 255, AV_OPT_FLAG_ENCODING_PARAM},
return size;
}
-static int mov_write_string_metadata(AVFormatContext *s, AVIOContext *pb,
- const char *name, const char *tag,
- int long_style)
+static AVDictionaryEntry *get_metadata_lang(AVFormatContext *s,
+ const char *tag, int *lang)
{
- int l, lang = 0, len, len2;
+ int l, len, len2;
AVDictionaryEntry *t, *t2 = NULL;
char tag2[16];
+ *lang = 0;
+
if (!(t = av_dict_get(s->metadata, tag, NULL, 0)))
- return 0;
+ return NULL;
len = strlen(t->key);
snprintf(tag2, sizeof(tag2), "%s-", tag);
len2 = strlen(t2->key);
if (len2 == len + 4 && !strcmp(t->value, t2->value)
&& (l = ff_mov_iso639_to_lang(&t2->key[len2 - 3], 1)) >= 0) {
- lang = l;
- break;
+ *lang = l;
+ return t;
}
}
+ return t;
+}
+
+static int mov_write_string_metadata(AVFormatContext *s, AVIOContext *pb,
+ const char *name, const char *tag,
+ int long_style)
+{
+ int lang;
+ AVDictionaryEntry *t = get_metadata_lang(s, tag, &lang);
+ if (!t)
+ return 0;
return mov_write_string_tag(pb, name, t->value, lang, long_style);
}
return size;
}
+/* 3GPP TS 26.244 */
+static int mov_write_loci_tag(AVFormatContext *s, AVIOContext *pb)
+{
+ int lang;
+ int64_t pos = avio_tell(pb);
+ double latitude, longitude, altitude;
+ int32_t latitude_fix, longitude_fix, altitude_fix;
+ AVDictionaryEntry *t = get_metadata_lang(s, "location", &lang);
+ const char *ptr, *place = "";
+ char *end;
+ static const char *astronomical_body = "earth";
+ if (!t)
+ return 0;
+
+ ptr = t->value;
+ longitude = strtod(ptr, &end);
+ if (end == ptr) {
+ av_log(s, AV_LOG_WARNING, "malformed location metadata\n");
+ return 0;
+ }
+ ptr = end;
+ latitude = strtod(ptr, &end);
+ if (end == ptr) {
+ av_log(s, AV_LOG_WARNING, "malformed location metadata\n");
+ return 0;
+ }
+ ptr = end;
+ altitude = strtod(ptr, &end);
+ /* If no altitude was present, the default 0 should be fine */
+ if (*end == '/')
+ place = end + 1;
+
+ latitude_fix = (int32_t) ((1 << 16) * latitude);
+ longitude_fix = (int32_t) ((1 << 16) * longitude);
+ altitude_fix = (int32_t) ((1 << 16) * altitude);
+
+ avio_wb32(pb, 0); /* size */
+ ffio_wfourcc(pb, "loci"); /* type */
+ avio_wb32(pb, 0); /* version + flags */
+ avio_wb16(pb, lang);
+ avio_write(pb, place, strlen(place) + 1);
+ avio_w8(pb, 0); /* role of place (0 == shooting location, 1 == real location, 2 == fictional location) */
+ avio_wb32(pb, latitude_fix);
+ avio_wb32(pb, longitude_fix);
+ avio_wb32(pb, altitude_fix);
+ avio_write(pb, astronomical_body, strlen(astronomical_body) + 1);
+ avio_w8(pb, 0); /* additional notes, null terminated string */
+
+ return update_size(pb, pos);
+}
+
/* iTunes track or disc number */
static int mov_write_trkn_tag(AVIOContext *pb, MOVMuxContext *mov,
AVFormatContext *s, int disc)
return update_size(pb, pos);
}
-/* iTunes meta data tag */
+static int mov_write_mdta_hdlr_tag(AVIOContext *pb, MOVMuxContext *mov,
+ AVFormatContext *s)
+{
+ avio_wb32(pb, 33); /* size */
+ ffio_wfourcc(pb, "hdlr");
+ avio_wb32(pb, 0);
+ avio_wb32(pb, 0);
+ ffio_wfourcc(pb, "mdta");
+ avio_wb32(pb, 0);
+ avio_wb32(pb, 0);
+ avio_wb32(pb, 0);
+ avio_w8(pb, 0);
+ return 33;
+}
+
+static int mov_write_mdta_keys_tag(AVIOContext *pb, MOVMuxContext *mov,
+ AVFormatContext *s)
+{
+ AVDictionaryEntry *t = NULL;
+ int64_t pos = avio_tell(pb);
+ int64_t curpos, entry_pos;
+ int count = 0;
+
+ avio_wb32(pb, 0); /* size */
+ ffio_wfourcc(pb, "keys");
+ avio_wb32(pb, 0);
+ entry_pos = avio_tell(pb);
+ avio_wb32(pb, 0); /* entry count */
+
+ while (t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX)) {
+ avio_wb32(pb, strlen(t->key) + 8);
+ ffio_wfourcc(pb, "mdta");
+ avio_write(pb, t->key, strlen(t->key));
+ count += 1;
+ }
+ curpos = avio_tell(pb);
+ avio_seek(pb, entry_pos, SEEK_SET);
+ avio_wb32(pb, count); // rewrite entry count
+ avio_seek(pb, curpos, SEEK_SET);
+
+ return update_size(pb, pos);
+}
+
+static int mov_write_mdta_ilst_tag(AVIOContext *pb, MOVMuxContext *mov,
+ AVFormatContext *s)
+{
+ AVDictionaryEntry *t = NULL;
+ int64_t pos = avio_tell(pb);
+ int count = 1; /* keys are 1-index based */
+
+ avio_wb32(pb, 0); /* size */
+ ffio_wfourcc(pb, "ilst");
+
+ while (t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX)) {
+ int64_t entry_pos = avio_tell(pb);
+ avio_wb32(pb, 0); /* size */
+ avio_wb32(pb, count); /* key */
+ mov_write_string_data_tag(pb, t->value, 0, 1);
+ update_size(pb, entry_pos);
+ count += 1;
+ }
+ return update_size(pb, pos);
+}
+
+/* meta data tags */
static int mov_write_meta_tag(AVIOContext *pb, MOVMuxContext *mov,
AVFormatContext *s)
{
avio_wb32(pb, 0); /* size */
ffio_wfourcc(pb, "meta");
avio_wb32(pb, 0);
- mov_write_itunes_hdlr_tag(pb, mov, s);
- mov_write_ilst_tag(pb, mov, s);
+ if (mov->flags & FF_MOV_FLAG_USE_MDTA) {
+ mov_write_mdta_hdlr_tag(pb, mov, s);
+ mov_write_mdta_keys_tag(pb, mov, s);
+ mov_write_mdta_ilst_tag(pb, mov, s);
+ }
+ else {
+ /* iTunes metadata tag */
+ mov_write_itunes_hdlr_tag(pb, mov, s);
+ mov_write_ilst_tag(pb, mov, s);
+ }
size = update_size(pb, pos);
return size;
}
mov_write_3gp_udta_tag(pb_buf, s, "albm", "album");
mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright");
mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date");
- } else if (mov->mode == MODE_MOV) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
+ mov_write_loci_tag(s, pb_buf);
+ } else if (mov->mode == MODE_MOV && !(mov->flags & FF_MOV_FLAG_USE_MDTA)) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
mov_write_string_metadata(s, pb_buf, "\251ART", "artist", 0);
mov_write_string_metadata(s, pb_buf, "\251nam", "title", 0);
mov_write_string_metadata(s, pb_buf, "\251aut", "author", 0);
} else {
/* iTunes meta data */
mov_write_meta_tag(pb_buf, mov, s);
+ mov_write_loci_tag(s, pb_buf);
}
if (s->nb_chapters && !(mov->flags & FF_MOV_FLAG_DISABLE_CHPL))
for (i = 0; i < s->nb_streams; i++) {
MOVTrack *track = &mov->tracks[i];
if (!track->end_reliable) {
- AVPacket *next = ff_interleaved_peek(s, i);
+ int64_t ts_offset;
+ const AVPacket *next = ff_interleaved_peek(s, i, &ts_offset);
if (next) {
- track->track_duration = next->dts - track->start_dts;
+ track->track_duration = next->dts - track->start_dts + ts_offset;
if (next->pts != AV_NOPTS_VALUE)
track->end_pts = next->pts;
else
track->end_pts = next->dts;
+ track->end_pts += ts_offset;
}
}
}
projects / ffmpeg / blobdiff