diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2012-05-27 14:21:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-27 13:41:58 +0200 |
| commit | 789f8cb03a08ea4346a0405b78287ed88df89bf1 (patch) | |
| tree | 5ce8d50fcf4eb4b108a3efa27506f084763759e9 /libavutil/timecode.c | |
| parent | 3be02afb56f2a485fcdc747b6c2f77ed03adc6e5 (diff) | |
avutil: support 50 and 60 frame rates in timecode api
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timecode.c')
| -rw-r--r-- | libavutil/timecode.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/libavutil/timecode.c b/libavutil/timecode.c index ad3f7faa5c..dcb93cb12e 100644 --- a/libavutil/timecode.c +++ b/libavutil/timecode.c @@ -31,6 +31,7 @@ #include "log.h" #include "error.h" +#ifdef FF_API_OLD_TC_ADJUST_FRAMENUM int av_timecode_adjust_ntsc_framenum(int framenum) { /* only works for NTSC 29.97 */ @@ -39,6 +40,25 @@ int av_timecode_adjust_ntsc_framenum(int framenum) //if (m < 2) m += 2; /* not needed since -2,-1 / 1798 in C returns 0 */ return framenum + 18 * d + 2 * ((m - 2) / 1798); } +#endif + +int av_timecode_adjust_ntsc_framenum2(int framenum, int fps) +{ + /* only works for NTSC 29.97 and 59.94 */ + int drop_frames = 0; + int d = framenum / 17982; + int m = framenum % 17982; + + if (fps == 30) + drop_frames = 2; + else if (fps == 60) + drop_frames = 4; + else + return framenum; + + //if (m < 2) m += 2; /* not needed since -2,-1 / 1798 in C returns 0 */ + return framenum + 9 * drop_frames * d + drop_frames * ((m - 2) / 1798); +} uint32_t av_timecode_get_smpte_from_framenum(const AVTimecode *tc, int framenum) { @@ -48,7 +68,7 @@ uint32_t av_timecode_get_smpte_from_framenum(const AVTimecode *tc, int framenum) framenum += tc->start; if (drop) - framenum = av_timecode_adjust_ntsc_framenum(framenum); + framenum = av_timecode_adjust_ntsc_framenum2(framenum, tc->fps); ff = framenum % fps; ss = framenum / fps % 60; mm = framenum / (fps*60) % 60; @@ -77,7 +97,7 @@ char *av_timecode_make_string(const AVTimecode *tc, char *buf, int framenum) framenum += tc->start; if (drop) - framenum = av_timecode_adjust_ntsc_framenum(framenum); + framenum = av_timecode_adjust_ntsc_framenum2(framenum, fps); if (framenum < 0) { framenum = -framenum; neg = tc->flags & AV_TIMECODE_FLAG_ALLOWNEGATIVE; @@ -139,7 +159,9 @@ static int check_timecode(void *log_ctx, AVTimecode *tc) switch (tc->fps) { case 24: case 25: - case 30: return 0; + case 30: + case 50: + case 60: return 0; default: av_log(log_ctx, AV_LOG_ERROR, "Timecode frame rate not supported\n"); |