| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | avformat/hlsenc, hlsplaylist: Cosmetics | Andreas Rheinhardt | 2020-05-28 | 1 | -4/+5 |
| | | | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | ||||
| * | avformat/hlsplaylist: Add const where appropriate | Andreas Rheinhardt | 2020-05-28 | 1 | -10/+13 |
| | | | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | ||||
| * | avformat: add subtitle support in master playlist m3u8 | Limin Wang | 2020-04-08 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Test with the following command for the webvtt subtitle: $ ./ffmpeg -y -i input_with_subtitle.mkv \ -b:v:0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ -b:a:0 256k \ -c:s webvtt -c:a mp2 -ar 48000 -ac 2 -map 0:v -map 0:a:0 -map 0:s:0 \ -f hls -var_stream_map "v:0,a:0,s:0,sgroup:subtitle" \ -master_pl_name master.m3u8 -t 300 -hls_time 10 -hls_init_time 4 -hls_list_size \ 10 -master_pl_publish_rate 10 -hls_flags \ delete_segments+discont_start+split_by_time ./tmp/video.m3u8 Check the master m3u8: $ cat tmp/master.m3u8 #EXTM3U #EXT-X-VERSION:3 #EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subtitle",NAME="subtitle_0",DEFAULT=YES,URI="video_vtt.m3u8" #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33",SUBTITLES="subtitle" video.m3u8 Check the result by convert to mkv: $ ./ffmpeg -strict experimental -i ./tmp/master.m3u8 -c:v copy -c:a mp2 -c:s srt ./test.mkv Signed-off-by: Limin Wang <lance.lmwang@gmail.com> | ||||
| * | lavf/hlsenc: refine the get_relative_url function to avoid extra malloc for ↵ | Limin Wang | 2019-09-02 | 1 | -2/+2 |
| | | | | | | | | relation path Reviewed-by: Steven Liu <lq@chinaffmpeg.org> Signed-off-by: Limin Wang <lance.lmwang@gmail.com> | ||||
| * | avformat/hlsenc: add EXT-X-I-FRAMES-ONLY tag support | Steven Liu | 2019-06-14 | 1 | -2/+3 |
| | | | | | Signed-off-by: Steven Liu <lq@chinaffmpeg.org> | ||||
| * | avformat/hlsenc: add var_stream_map LANGUAGE field string parameter | Steven Liu | 2019-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | use a:0,agroup:aud_low,default:Yes,language:CHN a:1,agroup:aud_low,language:ENG a:2,agroup:aud_high,default:YesYes,language:CHN a:3,agroup:aud_high,language:ENG v:0,agroup:aud_low v:1,agroup:aud_high create master m3u8 list. result: EXTM3U EXT-X-VERSION:3 EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="group_aud_low",NAME="audio_0",DEFAULT=YES,LANGUAGE="CHN",URI="out_0.m3u8" EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="group_aud_low",NAME="audio_1",DEFAULT=NO,LANGUAGE="ENG",URI="out_1.m3u8" EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="group_aud_high",NAME="audio_2",DEFAULT=YES,LANGUAGE="CHN",URI="out_2.m3u8" EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="group_aud_high",NAME="audio_3",DEFAULT=NO,LANGUAGE="ENG",URI="out_3.m3u8" EXT-X-STREAM-INF:BANDWIDTH=1170400,RESOLUTION=640x480,CODECS="avc1.64001e,mp4a.40.2",AUDIO="group_aud_low" out_4.m3u8 EXT-X-STREAM-INF:BANDWIDTH=3440800,RESOLUTION=640x480,CODECS="avc1.64001e,mp4a.40.2",AUDIO="group_aud_high" out_5.m3u8 Signed-off-by: Steven Liu <lq@chinaffmpeg.org> | ||||
| * | avformat/hlsenc: closed caption tags in the master playlist | Vishwanath Dixit | 2018-01-24 | 1 | -1/+1 |
| | | |||||
| * | avformat/hlsenc: Add CODECS attribute to master playlist | Karthick Jeyapal | 2018-01-19 | 1 | -1/+2 |
| | | |||||
| * | avformat/hlsplaylist: Audio rendition's name and defaultness made configurable | Karthick Jeyapal | 2017-12-29 | 1 | -1/+2 |
| | | | | | Reviewed-by: Steven Liu <lq@chinaffmpeg.org> | ||||
| * | avformat/hlsenc: Modularized audio rendition playlist write to allow reuse | Karthick Jeyapal | 2017-12-29 | 1 | -0/+1 |
| | | | | | Reviewed-by: Steven Liu <lq@chinaffmpeg.org> | ||||
| * | avformat/hlsenc:addition of #EXT-X-MEDIA tag and AUDIO attribute | Vishwanath Dixit | 2017-12-23 | 1 | -1/+1 |
| | | | | | Signed-off-by: Steven Liu <lq@chinaffmpeg.org> | ||||
| * | avformat/hlsenc: set EXT-X-TARGETDURATION use lrint(EXTINF) | Karthick J | 2017-12-22 | 1 | -5/+0 |
| | | |||||
| * | avformat/hlsplaylist: add int type of API ff_hls_write_file_entry | Steven Liu | 2017-12-04 | 1 | -1/+1 |
| | | | | | Signed-off-by: Steven Liu <lq@chinaffmpeg.org> | ||||
| * | avformat/hlsenc: Refactored 'get_int_from_double' function to allow reuse | Karthick J | 2017-11-30 | 1 | -0/+5 |
| | | |||||
| * | avformat/hlsplaylist: add missing header includes | James Almer | 2017-11-29 | 1 | -0/+4 |
| | | | | | | | Fixes checkheaders. Signed-off-by: James Almer <jamrial@gmail.com> | ||||
| * | avformat/hlsplaylist: fix header include guard | James Almer | 2017-11-29 | 1 | -2/+2 |
| | | | | | | | Fixes fate-source Signed-off-by: James Almer <jamrial@gmail.com> | ||||
| * | avformat/hlsenc: Modularized playlist creation to allow reuse | Karthick J | 2017-11-29 | 1 | -0/+51 |
 |
index : delta/ffmpeg.git | |
| git.ffmpeg.org: ffmpeg.git |
| summaryrefslogtreecommitdiff |