har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/hlsenc: Add CHANNELS to EXT-X-MEDIA for Audio

Browse Source 
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Dave Johansen 2023-10-26 19:43:59 -06:00 committed by Steven Liu
parent 9bcbe04aa0
commit 39878fc504
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/dashenc.c
View File

@ -1284,7 +1284,8 @@ static int write_manifest(AVFormatContext *s, int final)
continue; continue;
get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i); get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i);
ff_hls_write_audio_rendition(c->m3u8_out, audio_group, ff_hls_write_audio_rendition(c->m3u8_out, audio_group,
playlist_file, NULL, i, is_default); playlist_file, NULL, i, is_default,
s->streams[i]->codecpar->ch_layout.nb_channels);
max_audio_bitrate = FFMAX(st->codecpar->bit_rate + max_audio_bitrate = FFMAX(st->codecpar->bit_rate +
os->muxer_overhead, max_audio_bitrate); os->muxer_overhead, max_audio_bitrate);
if (!av_strnstr(audio_codec_str, os->codec_str, sizeof(audio_codec_str))) { if (!av_strnstr(audio_codec_str, os->codec_str, sizeof(audio_codec_str))) {

8
libavformat/hlsenc.c
View File

@ -1386,6 +1386,7 @@ static int create_master_playlist(AVFormatContext *s,
int is_file_proto = proto && !strcmp(proto, "file"); int is_file_proto = proto && !strcmp(proto, "file");
int use_temp_file = is_file_proto && ((hls->flags & HLS_TEMP_FILE) || hls->master_publish_rate); int use_temp_file = is_file_proto && ((hls->flags & HLS_TEMP_FILE) || hls->master_publish_rate);
char temp_filename[MAX_URL_SIZE]; char temp_filename[MAX_URL_SIZE];
int nb_channels;
input_vs->m3u8_created = 1; input_vs->m3u8_created = 1;
if (!hls->master_m3u8_created) { if (!hls->master_m3u8_created) {
@ -1434,8 +1435,13 @@ static int create_master_playlist(AVFormatContext *s,
av_log(s, AV_LOG_ERROR, "Unable to find relative URL\n"); av_log(s, AV_LOG_ERROR, "Unable to find relative URL\n");
goto fail; goto fail;
} }
nb_channels = 0;
for (j = 0; j < vs->nb_streams; j++)
if (vs->streams[j]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
if (vs->streams[j]->codecpar->ch_layout.nb_channels > nb_channels)
nb_channels = vs->streams[j]->codecpar->ch_layout.nb_channels;
ff_hls_write_audio_rendition(hls->m3u8_out, vs->agroup, m3u8_rel_name, vs->language, i, hls->has_default_key ? vs->is_default : 1); ff_hls_write_audio_rendition(hls->m3u8_out, vs->agroup, m3u8_rel_name, vs->language, i, hls->has_default_key ? vs->is_default : 1, nb_channels);
} }
/* For variant streams with video add #EXT-X-STREAM-INF tag with attributes*/ /* For variant streams with video add #EXT-X-STREAM-INF tag with attributes*/

5
libavformat/hlsplaylist.c
View File

@ -39,7 +39,7 @@ void ff_hls_write_playlist_version(AVIOContext *out, int version)
void ff_hls_write_audio_rendition(AVIOContext *out, const char *agroup, void ff_hls_write_audio_rendition(AVIOContext *out, const char *agroup,
const char *filename, const char *language, const char *filename, const char *language,
int name_id, int is_default) int name_id, int is_default, int nb_channels)
{ {
if (!out || !agroup || !filename) if (!out || !agroup || !filename)
return; return;
@ -49,6 +49,9 @@ void ff_hls_write_audio_rendition(AVIOContext *out, const char *agroup,
if (language) { if (language) {
avio_printf(out, "LANGUAGE=\"%s\",", language); avio_printf(out, "LANGUAGE=\"%s\",", language);
} }
if (nb_channels) {
avio_printf(out, "CHANNELS=\"%d\",", nb_channels);
}
avio_printf(out, "URI=\"%s\"\n", filename); avio_printf(out, "URI=\"%s\"\n", filename);
} }

2
libavformat/hlsplaylist.h
View File

@ -38,7 +38,7 @@ typedef enum {
void ff_hls_write_playlist_version(AVIOContext *out, int version); void ff_hls_write_playlist_version(AVIOContext *out, int version);
void ff_hls_write_audio_rendition(AVIOContext *out, const char *agroup, void ff_hls_write_audio_rendition(AVIOContext *out, const char *agroup,
const char *filename, const char *language, const char *filename, const char *language,
int name_id, int is_default); int name_id, int is_default, int nb_channels);
void ff_hls_write_subtitle_rendition(AVIOContext *out, const char *sgroup, void ff_hls_write_subtitle_rendition(AVIOContext *out, const char *sgroup,
const char *filename, const char *language, const char *filename, const char *language,
int name_id, int is_default); int name_id, int is_default);