// a situation with only one video stream (and possibly one audio stream)
// with known width/height, and we don't need the extra functionality it provides.
avctx.reset(avformat_alloc_context());
- avctx->oformat = av_guess_format("mp4", nullptr, nullptr);
+ avctx->oformat = av_guess_format("nut", nullptr, nullptr);
uint8_t *buf = (uint8_t *)av_malloc(MUX_BUFFER_SIZE);
avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, this, nullptr, nullptr, nullptr);
AVStream *stream = avformat_new_stream(avctx.get(), nullptr);
if (stream == nullptr) {
fprintf(stderr, "avformat_new_stream() failed\n");
- exit(1);
+ abort();
}
- stream->time_base = AVRational{ 1, TIMEBASE };
+
+ // FFmpeg is very picky about having audio at 1/48000 timebase,
+ // no matter what we write. Even though we'd prefer our usual 1/120000,
+ // put the video on the same one, so that we can have locked audio.
+ stream->time_base = AVRational{ 1, OUTPUT_FREQUENCY };
stream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
stream->codecpar->codec_id = AV_CODEC_ID_MJPEG;
stream->codecpar->chroma_location = AVCHROMA_LOC_LEFT;
stream->codecpar->field_order = AV_FIELD_PROGRESSIVE;
}
+ for (unsigned card_idx = 0; card_idx < global_flags.card_to_mjpeg_stream_export.size(); ++card_idx) {
+ AVStream *stream = avformat_new_stream(avctx.get(), nullptr);
+ if (stream == nullptr) {
+ fprintf(stderr, "avformat_new_stream() failed\n");
+ abort();
+ }
+ stream->time_base = AVRational{ 1, OUTPUT_FREQUENCY };
+ stream->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ stream->codecpar->codec_id = AV_CODEC_ID_PCM_S32LE;
+ stream->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
+ stream->codecpar->channels = 2;
+ stream->codecpar->sample_rate = OUTPUT_FREQUENCY;
+ }
AVDictionary *options = NULL;
vector<pair<string, string>> opts = MUX_OPTS;
}
if (avformat_write_header(avctx.get(), &options) < 0) {
fprintf(stderr, "avformat_write_header() failed\n");
- exit(1);
+ abort();
}
// Initialize VA-API.
return va_dpy;
}
-void MJPEGEncoder::upload_frame(int64_t pts, unsigned card_index, RefCountedFrame frame, const bmusb::VideoFormat &video_format, size_t y_offset, size_t cbcr_offset)
+void MJPEGEncoder::upload_frame(int64_t pts, unsigned card_index, RefCountedFrame frame, const bmusb::VideoFormat &video_format, size_t y_offset, size_t cbcr_offset, vector<int32_t> audio)
{
PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)frame->userdata;
if (video_format.width == 0 || video_format.height == 0) {
return;
}
++metric_mjpeg_overrun_submitted;
- frames_to_be_encoded.push(QueuedFrame{ pts, card_index, frame, video_format, y_offset, cbcr_offset });
+ frames_to_be_encoded.push(QueuedFrame{ pts, card_index, frame, video_format, y_offset, cbcr_offset, move(audio) });
any_frames_to_be_encoded.notify_all();
}
-void MJPEGEncoder::finish_frame(RefCountedFrame frame)
-{
- PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)frame->userdata;
-
- if (userdata->data_copy_current_src == PBOFrameAllocator::Userdata::FROM_VA_API) {
- VAResources resources __attribute__((unused)) = move(userdata->va_resources);
- ReleaseVAResources release = move(userdata->va_resources_release);
-
- VAStatus va_status = vaUnmapBuffer(va_dpy->va_dpy, resources.image.buf);
- CHECK_VASTATUS(va_status, "vaUnmapBuffer");
- }
-}
-
int MJPEGEncoder::get_mjpeg_stream_for_card(unsigned card_index)
{
// Only bother doing MJPEG encoding if there are any connected clients
// Will call back in the receiver thread.
encode_jpeg_va(move(qf));
} else {
+ // Write audio before video, since Futatabi expects it.
+ if (qf.audio.size() > 0) {
+ write_audio_packet(qf.pts, qf.card_index, qf.audio);
+ }
+
// Encode synchronously, in the same thread.
vector<uint8_t> jpeg = encode_jpeg_libjpeg(qf);
write_mjpeg_packet(qf.pts, qf.card_index, jpeg.data(), jpeg.size());
pkt.flags = AV_PKT_FLAG_KEY;
AVRational time_base = avctx->streams[pkt.stream_index]->time_base;
pkt.pts = pkt.dts = av_rescale_q(pts, AVRational{ 1, TIMEBASE }, time_base);
+ pkt.duration = 0;
if (av_write_frame(avctx.get(), &pkt) < 0) {
fprintf(stderr, "av_write_frame() failed\n");
- exit(1);
+ abort();
+ }
+}
+
+void MJPEGEncoder::write_audio_packet(int64_t pts, unsigned card_index, const vector<int32_t> &audio)
+{
+ AVPacket pkt;
+ memset(&pkt, 0, sizeof(pkt));
+ pkt.buf = nullptr;
+ pkt.data = reinterpret_cast<uint8_t *>(const_cast<int32_t *>(&audio[0]));
+ pkt.size = audio.size() * sizeof(audio[0]);
+ pkt.stream_index = card_index + global_flags.card_to_mjpeg_stream_export.size();
+ pkt.flags = AV_PKT_FLAG_KEY;
+ AVRational time_base = avctx->streams[pkt.stream_index]->time_base;
+ pkt.pts = pkt.dts = av_rescale_q(pts, AVRational{ 1, TIMEBASE }, time_base);
+ size_t num_stereo_samples = audio.size() / 2;
+ pkt.duration = av_rescale_q(num_stereo_samples, AVRational{ 1, OUTPUT_FREQUENCY }, time_base);
+
+ if (av_write_frame(avctx.get(), &pkt) < 0) {
+ fprintf(stderr, "av_write_frame() failed\n");
+ abort();
}
}
void MJPEGEncoder::release_va_resources(MJPEGEncoder::VAResources resources)
{
lock_guard<mutex> lock(va_resources_mutex);
- if (va_resources_freelist.size() > 10) {
+ if (va_resources_freelist.size() > 50) {
auto it = va_resources_freelist.end();
--it;
va_status = vaDestroySurfaces(va_dpy->va_dpy, &it->surface, 1);
CHECK_VASTATUS(va_status, "vaDestroySurfaces");
+ va_status = vaDestroyImage(va_dpy->va_dpy, it->image.image_id);
+ CHECK_VASTATUS(va_status, "vaDestroyImage");
+
va_resources_freelist.erase(it);
}
VABufferDestroyer destroy_slice_param(va_dpy->va_dpy, slice_param_buffer);
if (userdata->data_copy_current_src == PBOFrameAllocator::Userdata::FROM_VA_API) {
+ // The pixel data is already put into the image by the caller.
va_status = vaUnmapBuffer(va_dpy->va_dpy, resources.image.buf);
CHECK_VASTATUS(va_status, "vaUnmapBuffer");
- // The pixel data is already put into the image by the caller.
} else {
assert(userdata->data_copy_current_src == PBOFrameAllocator::Userdata::FROM_MALLOC);
CHECK_VASTATUS(va_status, "vaUnmapBuffer");
}
+ qf.frame->data_copy = nullptr;
+
// Seemingly vaPutImage() (which triggers a GPU copy) is much nicer to the
// CPU than vaDeriveImage() and copying directly into the GPU's buffers.
// Exactly why is unclear, but it seems to involve L3 cache usage when there
frames_encoding.pop();
}
+ // Write audio before video, since Futatabi expects it.
+ if (qf.audio.size() > 0) {
+ write_audio_packet(qf.pts, qf.card_index, qf.audio);
+ }
+
VAStatus va_status = vaSyncSurface(va_dpy->va_dpy, qf.resources.surface);
CHECK_VASTATUS(va_status, "vaSyncSurface");
projects / nageru / blobdiff