Skip to content

start of audio support #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
matteius wants to merge 1 commit into from
Closed

start of audio support #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion include/video/hls_writer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@ typedef struct hls_writer_t {
int initialized;
time_t last_cleanup_time;

// Stream indexes in output context
int video_stream_idx;
int audio_stream_idx;

// Per-stream DTS tracking
stream_dts_info_t dts_tracker;
stream_dts_info_t video_dts_tracker;
stream_dts_info_t audio_dts_tracker;
} hls_writer_t;

/**
Expand Down
22 changes: 17 additions & 5 deletions include/video/mp4_writer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,29 @@
// Forward declaration of the MP4 writer structure
typedef struct mp4_writer mp4_writer_t;

// Forward declaration for the timestamp tracking structure
typedef struct {
int64_t first_dts;
int64_t first_pts;
int64_t last_dts;
AVRational time_base;
int initialized;
} mp4_timestamp_info_t;

// Full definition of the MP4 writer structure
struct mp4_writer {
char output_path[MAX_PATH_LENGTH];
char stream_name[MAX_STREAM_NAME];
AVFormatContext *output_ctx;

// Stream indexes in output context
int video_stream_idx;
int has_audio;
int64_t first_dts;
int64_t first_pts;
int64_t last_dts;
AVRational time_base;
int audio_stream_idx;

// Per-stream timestamp tracking
mp4_timestamp_info_t video_ts_info;
mp4_timestamp_info_t audio_ts_info;

int is_initialized;
time_t creation_time;
};
Expand Down
3 changes: 3 additions & 0 deletions include/video/stream_protocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ int open_input_stream(AVFormatContext **input_ctx, const char *url, int protocol
// Find video stream index in the input context
int find_video_stream_index(AVFormatContext *input_ctx);

// Find audio stream index in the input context
int find_audio_stream_index(AVFormatContext *input_ctx);

#endif // STREAM_PROTOCOL_H
1 change: 1 addition & 0 deletions include/video/stream_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ typedef struct {
pthread_t thread;
AVFormatContext *input_ctx;
int video_stream_idx;
int audio_stream_idx; // Added audio stream index
int dedicated; // Flag to indicate if this is a dedicated stream reader

// Callback function for packet processing
Expand Down
83 changes: 63 additions & 20 deletions src/video/hls_writer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,14 @@ int hls_writer_initialize(hls_writer_t *writer, const AVStream *input_stream) {
return -1;
}

// Determine if this is a video or audio stream
enum AVMediaType codec_type = input_stream->codecpar->codec_type;

if (codec_type != AVMEDIA_TYPE_VIDEO && codec_type != AVMEDIA_TYPE_AUDIO) {
log_warn("Unsupported stream type for HLS: %d", codec_type);
return -1;
}

// Create output stream
AVStream *out_stream = avformat_new_stream(writer->output_ctx, NULL);
if (!out_stream) {
Expand All @@ -343,29 +351,46 @@ int hls_writer_initialize(hls_writer_t *writer, const AVStream *input_stream) {

// Set stream time base
out_stream->time_base = input_stream->time_base;

// Store the stream index based on type
if (codec_type == AVMEDIA_TYPE_VIDEO) {
writer->video_stream_idx = out_stream->index;
writer->video_dts_tracker.time_base = input_stream->time_base;
writer->video_dts_tracker.initialized = 0;
log_info("Added video stream to HLS output at index %d", writer->video_stream_idx);
} else if (codec_type == AVMEDIA_TYPE_AUDIO) {
writer->audio_stream_idx = out_stream->index;
writer->audio_dts_tracker.time_base = input_stream->time_base;
writer->audio_dts_tracker.initialized = 0;
log_info("Added audio stream to HLS output at index %d", writer->audio_stream_idx);
}

// SIMPLIFIED APPROACH: Let FFmpeg handle manifest file creation
// Just use basic options for reliability
AVDictionary *options = NULL;
// If this is the first stream, write the header
if (!writer->initialized) {
// SIMPLIFIED APPROACH: Let FFmpeg handle manifest file creation
// Just use basic options for reliability
AVDictionary *options = NULL;

// Write the header
ret = avformat_write_header(writer->output_ctx, &options);
if (ret < 0) {
char error_buf[AV_ERROR_MAX_STRING_SIZE] = {0};
av_strerror(ret, error_buf, AV_ERROR_MAX_STRING_SIZE);
log_error("Failed to write HLS header: %s", error_buf);
av_dict_free(&options);
return ret;
}
// Write the header
ret = avformat_write_header(writer->output_ctx, &options);
if (ret < 0) {
char error_buf[AV_ERROR_MAX_STRING_SIZE] = {0};
av_strerror(ret, error_buf, AV_ERROR_MAX_STRING_SIZE);
log_error("Failed to write HLS header: %s", error_buf);
av_dict_free(&options);
return ret;
}

av_dict_free(&options);
av_dict_free(&options);

// SIMPLIFIED APPROACH: Let FFmpeg handle manifest file creation completely
// Remove the fallback mechanism as it might interfere with FFmpeg's own manifest creation
log_info("Letting FFmpeg handle manifest file creation for stream %s", writer->stream_name);
// SIMPLIFIED APPROACH: Let FFmpeg handle manifest file creation completely
// Remove the fallback mechanism as it might interfere with FFmpeg's own manifest creation
log_info("Letting FFmpeg handle manifest file creation for stream %s", writer->stream_name);

writer->initialized = 1;
log_info("Initialized HLS writer for stream %s", writer->stream_name);
writer->initialized = 1;
log_info("Initialized HLS writer for stream %s", writer->stream_name);
}

return 0;
}

Expand Down Expand Up @@ -502,15 +527,33 @@ int hls_writer_write_packet(hls_writer_t *writer, const AVPacket *pkt, const AVS
return -1;
}

// Determine if this is a video or audio packet and use the appropriate DTS tracker
enum AVMediaType codec_type = input_stream->codecpar->codec_type;
stream_dts_info_t *dts_tracker;

if (codec_type == AVMEDIA_TYPE_VIDEO) {
dts_tracker = &writer->video_dts_tracker;
out_pkt.stream_index = writer->video_stream_idx;
log_debug("Processing video packet for HLS stream %s", writer->stream_name);
} else if (codec_type == AVMEDIA_TYPE_AUDIO) {
dts_tracker = &writer->audio_dts_tracker;
out_pkt.stream_index = writer->audio_stream_idx;
log_debug("Processing audio packet for HLS stream %s", writer->stream_name);
} else {
log_warn("Unsupported packet type for HLS: %d", codec_type);
av_packet_unref(&out_pkt);
return -1;
}

// Initialize DTS tracker for this stream if needed
stream_dts_info_t *dts_tracker = &writer->dts_tracker;
if (!dts_tracker->initialized) {
dts_tracker->first_dts = pkt->dts != AV_NOPTS_VALUE ? pkt->dts : pkt->pts;
dts_tracker->last_dts = dts_tracker->first_dts;
dts_tracker->time_base = input_stream->time_base;
dts_tracker->initialized = 1;

log_debug("Initialized DTS tracker for HLS stream %s: first_dts=%lld, time_base=%d/%d",
log_debug("Initialized DTS tracker for HLS %s stream %s: first_dts=%lld, time_base=%d/%d",
codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio",
writer->stream_name,
(long long)dts_tracker->first_dts,
dts_tracker->time_base.num,
Expand Down
Loading