avformat/mov: fix timecode with rounded down tmcd nb_frames

Regression since 8dd5bb728038f21d17ec789e21d65fe8f3f364a6. Fixes ticket #5978.

Marton Balint committed 4 years ago

Commit 0a58fdf1 parent 5ccd8f41 file · +10 −3Browse files

Unified · Split

     int64_t cur_pos = avio_tell(sc->pb);
     int64_t value;
     AVRational tc_rate = st->avg_frame_rate;
+    int tmcd_nb_frames = sc->tmcd_nb_frames;
     int rounded_tc_rate;
     if (!sti->nb_index_entries)
         return -1;
-    if (!tc_rate.num || !tc_rate.den || !sc->tmcd_nb_frames)
+    if (!tc_rate.num || !tc_rate.den || !tmcd_nb_frames)
         return -1;
     avio_seek(sc->pb, sti->index_entries->pos, SEEK_SET);
      * format). */
     /* 60 fps content have tmcd_nb_frames set to 30 but tc_rate set to 60, so
-     * we multiply the frame number with the quotient. */
+     * we multiply the frame number with the quotient.
+     * See tickets #9492, #9710. */
     rounded_tc_rate = (tc_rate.num + tc_rate.den / 2) / tc_rate.den;
-    value = av_rescale(value, rounded_tc_rate, sc->tmcd_nb_frames);
+    /* Work around files where tmcd_nb_frames is rounded down from frame rate
+     * instead of up. See ticket #5978. */
+    if (tmcd_nb_frames == tc_rate.num / tc_rate.den &&
+        s->strict_std_compliance < FF_COMPLIANCE_STRICT)
+        tmcd_nb_frames = rounded_tc_rate;
+    value = av_rescale(value, rounded_tc_rate, tmcd_nb_frames);
     parse_timecode_in_framenum_format(s, st, value, flags);

Keyboard shortcuts