virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avformat/mxfenc: support writing subsecond precision timestamps

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2018-12-22 20:02:09 +01:00
parent 02935c2c93
commit 70c86deb8e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mxfenc.c
View File

@ -2332,8 +2332,9 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st,
return !!sc->codec_ul; return !!sc->codec_ul;
} }
static uint64_t mxf_parse_timestamp(time_t timestamp) static uint64_t mxf_parse_timestamp(int64_t timestamp64)
{ {
time_t timestamp = timestamp64 / 1000000;
struct tm tmbuf; struct tm tmbuf;
struct tm *time = gmtime_r(&timestamp, &tmbuf); struct tm *time = gmtime_r(&timestamp, &tmbuf);
if (!time) if (!time)
@ -2343,7 +2344,8 @@ static uint64_t mxf_parse_timestamp(time_t timestamp)
(uint64_t) time->tm_mday << 32 | (uint64_t) time->tm_mday << 32 |
time->tm_hour << 24 | time->tm_hour << 24 |
time->tm_min << 16 | time->tm_min << 16 |
time->tm_sec << 8; time->tm_sec << 8 |
(timestamp64 % 1000000) / 4000;
} }
static void mxf_gen_umid(AVFormatContext *s) static void mxf_gen_umid(AVFormatContext *s)
@ -2580,7 +2582,7 @@ static int mxf_write_header(AVFormatContext *s)
sc->order = AV_RB32(sc->track_essence_element_key+12); sc->order = AV_RB32(sc->track_essence_element_key+12);
} }
if (ff_parse_creation_time_metadata(s, &timestamp, 1) > 0) if (ff_parse_creation_time_metadata(s, &timestamp, 0) > 0)
mxf->timestamp = mxf_parse_timestamp(timestamp); mxf->timestamp = mxf_parse_timestamp(timestamp);
mxf->duration = -1; mxf->duration = -1;