#include <libavutil/samplefmt.h>
}
+#include <vector>
+
#include "httpd.h"
#include "defs.h"
using namespace std;
-HTTPD::HTTPD(const char *output_filename, int width, int height)
+HTTPD::HTTPD(int width, int height)
: width(width), height(height)
{
- AVFormatContext *avctx = avformat_alloc_context();
- avctx->oformat = av_guess_format(NULL, output_filename, NULL);
- strcpy(avctx->filename, output_filename);
- if (avio_open2(&avctx->pb, output_filename, AVIO_FLAG_WRITE, &avctx->interrupt_callback, NULL) < 0) {
- fprintf(stderr, "%s: avio_open2() failed\n", output_filename);
- exit(1);
- }
-
- file_mux.reset(new Mux(avctx, width, height));
}
void HTTPD::start(int port)
MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL_INTERNALLY | MHD_USE_DUAL_STACK,
port,
nullptr, nullptr,
- &answer_to_connection_thunk, this, MHD_OPTION_END);
+ &answer_to_connection_thunk, this,
+ MHD_OPTION_NOTIFY_COMPLETED, &request_completed_thunk, this,
+ MHD_OPTION_END);
}
void HTTPD::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts)
{
+ unique_lock<mutex> lock(streams_mutex);
for (Stream *stream : streams) {
stream->add_packet(pkt, pts, dts);
}
- file_mux->add_packet(pkt, pts, dts);
+ if (file_mux) {
+ file_mux->add_packet(pkt, pts, dts);
+ }
+}
+
+void HTTPD::open_output_file(const string &filename)
+{
+ AVFormatContext *avctx = avformat_alloc_context();
+ avctx->oformat = av_guess_format(NULL, filename.c_str(), NULL);
+ assert(filename.size() < sizeof(avctx->filename) - 1);
+ strcpy(avctx->filename, filename.c_str());
+
+ string url = "file:" + filename;
+ int ret = avio_open2(&avctx->pb, url.c_str(), AVIO_FLAG_WRITE, &avctx->interrupt_callback, NULL);
+ if (ret < 0) {
+ char tmp[AV_ERROR_MAX_STRING_SIZE];
+ fprintf(stderr, "%s: avio_open2() failed: %s\n", filename.c_str(), av_make_error_string(tmp, sizeof(tmp), ret));
+ exit(1);
+ }
+
+ file_mux.reset(new Mux(avctx, width, height));
+}
+
+void HTTPD::close_output_file()
+{
+ file_mux.reset();
}
int HTTPD::answer_to_connection_thunk(void *cls, MHD_Connection *connection,
const char *version, const char *upload_data,
size_t *upload_data_size, void **con_cls)
{
- printf("url %s\n", url);
- AVOutputFormat *oformat = av_guess_format("mpegts", nullptr, nullptr);
+ AVOutputFormat *oformat = av_guess_format(STREAM_MUX_NAME, nullptr, nullptr);
assert(oformat != nullptr);
HTTPD::Stream *stream = new HTTPD::Stream(oformat, width, height);
- streams.push_back(stream);
+ {
+ unique_lock<mutex> lock(streams_mutex);
+ streams.insert(stream);
+ }
+ *con_cls = stream;
+
+ // Does not strictly have to be equal to MUX_BUFFER_SIZE.
MHD_Response *response = MHD_create_response_from_callback(
- (size_t)-1, 1048576, &HTTPD::Stream::reader_callback_thunk, stream, &HTTPD::free_stream);
+ (size_t)-1, MUX_BUFFER_SIZE, &HTTPD::Stream::reader_callback_thunk, stream, &HTTPD::free_stream);
int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
//MHD_destroy_response(response);
void HTTPD::free_stream(void *cls)
{
+ // FIXME: When is this actually called, if ever?
+ // Also, shouldn't we remove it from streams?
HTTPD::Stream *stream = (HTTPD::Stream *)cls;
delete stream;
}
+void HTTPD::request_completed_thunk(void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe)
+{
+ HTTPD *httpd = (HTTPD *)cls;
+ return httpd->request_completed(connection, con_cls, toe);
+}
+
+void HTTPD::request_completed(struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe)
+{
+ if (con_cls == nullptr) {
+ // Request was never set up.
+ return;
+ }
+ HTTPD::Stream *stream = (HTTPD::Stream *)*con_cls;
+ {
+ unique_lock<mutex> lock(streams_mutex);
+ delete stream;
+ streams.erase(stream);
+ }
+}
+
HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height)
: avctx(avctx)
{
exit(1);
}
avstream_video->time_base = AVRational{1, TIMEBASE};
+ avstream_video->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ avstream_video->codec->codec_id = AV_CODEC_ID_H264;
avstream_video->codec->width = width;
avstream_video->codec->height = height;
avstream_video->codec->time_base = AVRational{1, TIMEBASE};
avstream_video->codec->color_range = AVCOL_RANGE_MPEG; // Full vs. limited range (output_ycbcr_format.full_range).
avstream_video->codec->chroma_sample_location = AVCHROMA_LOC_LEFT; // Chroma sample location. See chroma_offset_0[] in Mixer::subsample_chroma().
avstream_video->codec->field_order = AV_FIELD_PROGRESSIVE;
+ if (avctx->oformat->flags & AVFMT_GLOBALHEADER) {
+ avstream_video->codec->flags = AV_CODEC_FLAG_GLOBAL_HEADER;
+ }
AVCodec *codec_audio = avcodec_find_encoder(AUDIO_OUTPUT_CODEC);
avstream_audio = avformat_new_stream(avctx, codec_audio);
avstream_audio->codec->channels = 2;
avstream_audio->codec->channel_layout = AV_CH_LAYOUT_STEREO;
avstream_audio->codec->time_base = AVRational{1, TIMEBASE};
+ if (avctx->oformat->flags & AVFMT_GLOBALHEADER) {
+ avstream_audio->codec->flags = AV_CODEC_FLAG_GLOBAL_HEADER;
+ }
- if (avformat_write_header(avctx, NULL) < 0) {
+ AVDictionary *options = NULL;
+ vector<pair<string, string>> opts = MUX_OPTS;
+ for (pair<string, string> opt : opts) {
+ av_dict_set(&options, opt.first.c_str(), opt.second.c_str(), 0);
+ }
+ if (avformat_write_header(avctx, &options) < 0) {
fprintf(stderr, "avformat_write_header() failed\n");
exit(1);
}
HTTPD::Mux::~Mux()
{
av_write_trailer(avctx);
+ av_free(avctx->pb->buffer);
+ av_free(avctx->pb);
avformat_free_context(avctx);
}
void HTTPD::Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts)
{
+ if (!seen_keyframe && !(pkt.stream_index == 0 && (pkt.flags & AV_PKT_FLAG_KEY))) {
+ // Wait until we see the first (video) key frame.
+ return;
+ }
+ seen_keyframe = true;
+
AVPacket pkt_copy;
av_copy_packet(&pkt_copy, &pkt);
if (pkt.stream_index == 0) {
fprintf(stderr, "av_interleaved_write_frame() failed\n");
exit(1);
}
+
+ av_packet_unref(&pkt_copy);
}
HTTPD::Stream::Stream(AVOutputFormat *oformat, int width, int height)
{
AVFormatContext *avctx = avformat_alloc_context();
avctx->oformat = oformat;
- uint8_t *buf = (uint8_t *)av_malloc(1048576);
- avctx->pb = avio_alloc_context(buf, 1048576, 1, this, nullptr, &HTTPD::Stream::write_packet_thunk, nullptr);
+ uint8_t *buf = (uint8_t *)av_malloc(MUX_BUFFER_SIZE);
+ avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, this, nullptr, &HTTPD::Stream::write_packet_thunk, nullptr);
avctx->flags = AVFMT_FLAG_CUSTOM_IO;
mux.reset(new Mux(avctx, width, height));
projects / nageru / blobdiff