breeze/media-server
1
0
Fork 0
mirror of https://github.com/ireader/media-server.git synced 2026-01-12 00:18:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

change: remove hls media codec limit, enable H.265/opus...

Browse Source
This commit is contained in:
ireader
2023-03-18 10:20:29 +08:00
parent 1ec7f5aabe
commit 8928fa5219
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libhls/include/hls-media.h
View File

@@ -26,6 +26,12 @@ hls_media_t* hls_media_create(int64_t duration, hls_media_handler handler, void*
void hls_media_destroy(hls_media_t* hls);
/// Add TS PMT stream
/// @param[in] avtype audio/video type (mpeg-ps.h STREAM_VIDEO_XXX/STREAM_AUDIO_XXX)
/// @param[in] extra [optional] media extra info data
/// @return >=0-ok, <0-error
int hls_media_add_stream(hls_media_t* hls, int avtype, const void* extra, size_t bytes);
/// @param[in] avtype audio/video type (mpeg-ps.h STREAM_VIDEO_XXX/STREAM_AUDIO_XXX)
/// @param[in] data h264/h265 nalu with startcode(0x00000001), aac with adts
/// @param[in] bytes data length in byte, NULL-force new segment

30
libhls/source/hls-media.c
View File

@@ -2,6 +2,7 @@
#include "hls-param.h"
#include "mpeg-ts.h"
#include "mpeg-ps.h"
#include "mpeg-util.h"
#include <stdlib.h>
#include <string.h>
#include <assert.h>
@@ -91,8 +92,10 @@ struct hls_media_t* hls_media_create(int64_t duration, hls_media_handler handler
return NULL;
}
hls->audio = mpeg_ts_add_stream(hls->ts, PSI_STREAM_AAC, NULL, 0);
hls->video = mpeg_ts_add_stream(hls->ts, PSI_STREAM_H264, NULL, 0);
//hls->audio = mpeg_ts_add_stream(hls->ts, PSI_STREAM_AAC, NULL, 0);
//hls->video = mpeg_ts_add_stream(hls->ts, PSI_STREAM_H264, NULL, 0);
hls->audio = -1;
hls->video = -1;
hls->maxsize = N_TS_FILESIZE;
hls->dts = hls->pts = PTS_NO_VALUE;
@@ -117,14 +120,32 @@ void hls_media_destroy(struct hls_media_t* hls)
free(hls);
}
int hls_media_add_stream(hls_media_t* hls, int avtype, const void* extra, size_t bytes)
{
if (mpeg_stream_type_audio(avtype))
{
if(-1 == hls->audio)
hls->audio = mpeg_ts_add_stream(hls->ts, avtype, extra, bytes);
return hls->audio;
}
else
{
if(-1 == hls->video)
hls->video = mpeg_ts_add_stream(hls->ts, avtype, extra, bytes);
return hls->video;
}
}
int hls_media_input(struct hls_media_t* hls, int avtype, const void* data, size_t bytes, int64_t pts, int64_t dts, int flags)
{
int r;
int stream;
int segment;
int force_new_segment;
int64_t duration;
assert(dts < hls->dts_last + hls->duration || PTS_NO_VALUE == hls->dts_last);
stream = hls_media_add_stream(hls, avtype, NULL, 0);
// PTS/DTS rewind
force_new_segment = 0;
@@ -169,10 +190,9 @@ int hls_media_input(struct hls_media_t* hls, int avtype, const void* data, size_
hls->audio_only_flag = 1;
}
assert(PSI_STREAM_H264 == avtype || PSI_STREAM_AAC == avtype);
if (hls->audio_only_flag && PSI_STREAM_H264 == avtype)
if (hls->audio_only_flag && mpeg_stream_type_video(avtype))
hls->audio_only_flag = 0; // clear audio only flag
hls->dts_last = dts;
return mpeg_ts_write(hls->ts, PSI_STREAM_H264 == avtype ? hls->video : hls->audio, HLS_FLAGS_KEYFRAME & flags ? 1 : 0, pts * 90, dts * 90, data, bytes);
return mpeg_ts_write(hls->ts, stream, HLS_FLAGS_KEYFRAME & flags ? 1 : 0, pts * 90, dts * 90, data, bytes);
}