FFmpeg

Commit Graph

Author	SHA1	Message	Date
Andreas Rheinhardt	636631d9db	Remove unnecessary libavutil/(avutil\|common\|internal).h inclusions Some of these were made possible by moving several common macros to libavutil/macros.h. While just at it, also improve the other headers a bit. Reviewed-by: Martin Storsjö <martin@martin.st> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>	3 years ago
Andreas Rheinhardt	6c70f89813	avformat/hlsenc, hlsplaylist: Cosmetics Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>	5 years ago
Andreas Rheinhardt	c6e73ad2b7	avformat/hlsplaylist: Add const where appropriate Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>	5 years ago
Limin Wang	cd8c5e89ba	avformat: add subtitle support in master playlist m3u8 Test with the following command for the webvtt subtitle: $ ./ffmpeg -y -i input_with_subtitle.mkv \ -b✌️0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ -b🅰️0 256k \ -c:s webvtt -c:a mp2 -ar 48000 -ac 2 -map 0:v -map 0🅰️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>	5 years ago
Limin Wang	75aea52a10	lavf/hlsenc: refine the get_relative_url function to avoid extra malloc for relation path Reviewed-by: Steven Liu <lq@chinaffmpeg.org> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>	5 years ago
Steven Liu	fa7a6dbd76	avformat/hlsenc: add EXT-X-I-FRAMES-ONLY tag support Signed-off-by: Steven Liu <lq@chinaffmpeg.org>	6 years ago
Steven Liu	1e03d60054	avformat/hlsenc: add var_stream_map LANGUAGE field string parameter 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>	6 years ago
Vishwanath Dixit	1948b76a1b	avformat/hlsenc: closed caption tags in the master playlist	7 years ago
Karthick Jeyapal	0afa171f25	avformat/hlsenc: Add CODECS attribute to master playlist	7 years ago
Karthick Jeyapal	8fd2bdd072	avformat/hlsplaylist: Audio rendition's name and defaultness made configurable Reviewed-by: Steven Liu <lq@chinaffmpeg.org>	7 years ago
Karthick Jeyapal	9e25fe4204	avformat/hlsenc: Modularized audio rendition playlist write to allow reuse Reviewed-by: Steven Liu <lq@chinaffmpeg.org>	7 years ago
Vishwanath Dixit	d02289c386	avformat/hlsenc:addition of #EXT-X-MEDIA tag and AUDIO attribute Signed-off-by: Steven Liu <lq@chinaffmpeg.org>	7 years ago
Karthick J	93a0e47876	avformat/hlsenc: set EXT-X-TARGETDURATION use lrint(EXTINF)	7 years ago
Steven Liu	071f47649c	avformat/hlsplaylist: add int type of API ff_hls_write_file_entry Signed-off-by: Steven Liu <lq@chinaffmpeg.org>	7 years ago
Karthick J	3684b5e56a	avformat/hlsenc: Refactored 'get_int_from_double' function to allow reuse	7 years ago
James Almer	91127355f5	avformat/hlsplaylist: add missing header includes Fixes checkheaders. Signed-off-by: James Almer <jamrial@gmail.com>	7 years ago
James Almer	85b84e1243	avformat/hlsplaylist: fix header include guard Fixes fate-source Signed-off-by: James Almer <jamrial@gmail.com>	7 years ago
Karthick J	da49cdf640	avformat/hlsenc: Modularized playlist creation to allow reuse	7 years ago

18 Commits (c926140558c60786dc577b121df6b3c6b430bd98)