This allows for wider compatibility with older devices, such as those running iOS 3. The only difference between HLS version 2 and version 3 is that version 3 supports non-integer EXTINF values, and as such, we can default to version 2 if we're using whole-integer EXTINFs anyways, when `-hls_flags round_durations` is set. As this code seems to otherwise consistently use the lowest compatible version, this seems to fit in properly with existing behavior. Testing confirms with that this patch, HLS output can work all the way back to iOS 3.
Unified · Split
| @@ -1060,6 +1060,8 @@ and remove the @code{#EXT-X-ENDLIST} from the old segment list. · 1059 unmodified lines | |||
| 1060 | @item round_durations | 1060 | @item round_durations |
| 1061 | Round the duration info in the playlist file segment info to integer | 1061 | Round the duration info in the playlist file segment info to integer |
| 1062 | values, instead of using floating point. | 1062 | values, instead of using floating point. |
| 1063 | If there are no other features requiring higher HLS versions be used, | ||
| 1064 | then this will allow ffmpeg to output a HLS version 2 m3u8. | ||
| 1063 | 1065 | ||
| 1064 | @item discont_start | 1066 | @item discont_start |
| 1065 | Add the @code{#EXT-X-DISCONTINUITY} tag to the playlist, before the | 1067 | Add the @code{#EXT-X-DISCONTINUITY} tag to the playlist, before the |
| @@ -1550,7 +1550,11 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) · 1549 unmodified lines | |||
| 1550 | double *prog_date_time_p = (hls->flags & HLS_PROGRAM_DATE_TIME) ? &prog_date_time : NULL; | 1550 | double *prog_date_time_p = (hls->flags & HLS_PROGRAM_DATE_TIME) ? &prog_date_time : NULL; |
| 1551 | int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); | 1551 | int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); |
| 1552 | 1552 | ||
| 1553 | hls->version = 3; | 1553 | hls->version = 2; |
| 1554 | if (!(hls->flags & HLS_ROUND_DURATIONS)) { | ||
| 1555 | hls->version = 3; | ||
| 1556 | } | ||
| 1557 | |||
| 1554 | if (byterange_mode) { | 1558 | if (byterange_mode) { |
| 1555 | hls->version = 4; | 1559 | hls->version = 4; |
| 1556 | sequence = 0; | 1560 | sequence = 0; |