| Message ID | 20200326135700.11167-1-lance.lmwang@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,v1,1/4] avformat/hlsenc: remove the first slash of the relative path line in the master m3u8 file | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
> 2020年3月26日 下午9:56，lance.lmwang@gmail.com 写道： > > From: Limin Wang <lance.lmwang@gmail.com> > > Please testing with the following command: > ./ffmpeg -y -i input.mkv \ > -b:v:0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ > -b:a:0 256k \ > -c:a mp2 -ar 48000 -ac 2 -map 0:v -map 0:a:0\ > -f hls -var_stream_map "v:0,a:0" \ > -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 > > then cat ./tmp/master.m3u8 > before: > #EXTM3U > #EXT-X-VERSION:3 > #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33" > /video.m3u8 > > $ ./ffmpeg -i ./tmp/master.m3u8 -c:v copy -c:a mp2 ./test.mkv > [hls @ 0x7f82f9000000] Skip ('#EXT-X-VERSION:3') > [hls @ 0x7f82f9000000] Opening '/video.m3u8' for reading > [hls @ 0x7f82f9000000] parse_playlist error No such file or directory [/video.m3u8] > ./tmp/master.m3u8: No such file or directory > > after: > #EXTM3U > #EXT-X-VERSION:3 > #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33" > video.m3u8 > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavformat/hlsenc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c > index b4c72b6e54..a0a3a4647b 100644 > --- a/libavformat/hlsenc.c > +++ b/libavformat/hlsenc.c > @@ -1260,7 +1260,7 @@ static const char* get_relative_url(const char *master_url, const char *media_ur > } > } > > - return media_url + base_len; > + return media_url + base_len + 1; > } > > static int64_t get_stream_bit_rate(AVStream *stream) > -- > 2.21.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". LGTM Thanks Steven Liu
> 2020年3月29日 下午4:20，Steven Liu <lq@chinaffmpeg.org> 写道： > > >> 2020年3月26日 下午9:56，lance.lmwang@gmail.com 写道： >> >> From: Limin Wang <lance.lmwang@gmail.com> >> >> Please testing with the following command: >> ./ffmpeg -y -i input.mkv \ >> -b:v:0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ >> -b:a:0 256k \ >> -c:a mp2 -ar 48000 -ac 2 -map 0:v -map 0:a:0\ >> -f hls -var_stream_map "v:0,a:0" \ >> -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 >> >> then cat ./tmp/master.m3u8 >> before: >> #EXTM3U >> #EXT-X-VERSION:3 >> #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33" >> /video.m3u8 >> >> $ ./ffmpeg -i ./tmp/master.m3u8 -c:v copy -c:a mp2 ./test.mkv >> [hls @ 0x7f82f9000000] Skip ('#EXT-X-VERSION:3') >> [hls @ 0x7f82f9000000] Opening '/video.m3u8' for reading >> [hls @ 0x7f82f9000000] parse_playlist error No such file or directory [/video.m3u8] >> ./tmp/master.m3u8: No such file or directory >> >> after: >> #EXTM3U >> #EXT-X-VERSION:3 >> #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33" >> video.m3u8 >> >> Signed-off-by: Limin Wang <lance.lmwang@gmail.com> >> --- >> libavformat/hlsenc.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c >> index b4c72b6e54..a0a3a4647b 100644 >> --- a/libavformat/hlsenc.c >> +++ b/libavformat/hlsenc.c >> @@ -1260,7 +1260,7 @@ static const char* get_relative_url(const char *master_url, const char *media_ur >> } >> } >> >> - return media_url + base_len; >> + return media_url + base_len + 1; >> } >> >> static int64_t get_stream_bit_rate(AVStream *stream) >> -- >> 2.21.0 >> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> To unsubscribe, visit link above, or email >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe”. > > LGTM Pushed > > Thanks > > Steven Liu > Thanks Steven Liu
> 2020年3月29日 下午4:20，Steven Liu <lq@chinaffmpeg.org> 写道： > > >> 2020年3月26日 下午9:56，lance.lmwang@gmail.com 写道： >> >> From: Limin Wang <lance.lmwang@gmail.com> >> >> Please testing with the following command: >> ./ffmpeg -y -i input.mkv \ >> -b:v:0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ >> -b:a:0 256k \ >> -c:a mp2 -ar 48000 -ac 2 -map 0:v -map 0:a:0\ >> -f hls -var_stream_map "v:0,a:0" \ >> -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 >> >> then cat ./tmp/master.m3u8 >> before: >> #EXTM3U >> #EXT-X-VERSION:3 >> #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33" >> /video.m3u8 >> >> $ ./ffmpeg -i ./tmp/master.m3u8 -c:v copy -c:a mp2 ./test.mkv >> [hls @ 0x7f82f9000000] Skip ('#EXT-X-VERSION:3') >> [hls @ 0x7f82f9000000] Opening '/video.m3u8' for reading >> [hls @ 0x7f82f9000000] parse_playlist error No such file or directory [/video.m3u8] >> ./tmp/master.m3u8: No such file or directory >> >> after: >> #EXTM3U >> #EXT-X-VERSION:3 >> #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33" >> video.m3u8 >> >> Signed-off-by: Limin Wang <lance.lmwang@gmail.com> >> --- >> libavformat/hlsenc.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c >> index b4c72b6e54..a0a3a4647b 100644 >> --- a/libavformat/hlsenc.c >> +++ b/libavformat/hlsenc.c >> @@ -1260,7 +1260,7 @@ static const char* get_relative_url(const char *master_url, const char *media_ur >> } >> } >> >> - return media_url + base_len; >> + return media_url + base_len + 1; >> } >> >> static int64_t get_stream_bit_rate(AVStream *stream) >> -- >> 2.21.0 >> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> To unsubscribe, visit link above, or email >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > > LGTM Patchset pushed > > Thanks > > Steven Liu > Thanks Steven Liu
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index b4c72b6e54..a0a3a4647b 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1260,7 +1260,7 @@ static const char* get_relative_url(const char *master_url, const char *media_ur } } - return media_url + base_len; + return media_url + base_len + 1; } static int64_t get_stream_bit_rate(AVStream *stream)