X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=ffmpeg_capture.cpp;h=5f95da240448a5ec90efd45cd9c80b9b1a4dd2e3;hp=48a395e27610edf725d4386ee557f561eb16cd8f;hb=refs%2Fheads%2Fffmpeg-audio-only;hpb=ad1641ad3ab50ecd17af2e1c2d980f26e6adf0bb diff --git a/ffmpeg_capture.cpp b/ffmpeg_capture.cpp index 48a395e..5f95da2 100644 --- a/ffmpeg_capture.cpp +++ b/ffmpeg_capture.cpp @@ -18,6 +18,7 @@ extern "C" { #include #include #include +#include #include } @@ -31,6 +32,7 @@ extern "C" { #include "ffmpeg_util.h" #include "flags.h" #include "image_input.h" +#include "ref_counted_frame.h" #include "timebase.h" #define FRAME_SIZE (8 << 20) // 8 MB. @@ -206,9 +208,10 @@ YCbCrFormat decode_ycbcr_format(const AVPixFmtDescriptor *desc, const AVFrame *f FFmpegCapture::FFmpegCapture(const string &filename, unsigned width, unsigned height) : filename(filename), width(width), height(height), video_timebase{1, 1} { - // Not really used for anything. description = "Video: " + filename; + last_frame = steady_clock::now(); + avformat_network_init(); // In case someone wants this. } @@ -217,6 +220,7 @@ FFmpegCapture::~FFmpegCapture() if (has_dequeue_callbacks) { dequeue_cleanup_callback(); } + avresample_free(&resampler); } void FFmpegCapture::configure_card() @@ -226,7 +230,8 @@ void FFmpegCapture::configure_card() set_video_frame_allocator(owned_video_frame_allocator.get()); } if (audio_frame_allocator == nullptr) { - owned_audio_frame_allocator.reset(new MallocFrameAllocator(65536, NUM_QUEUED_AUDIO_FRAMES)); + // Audio can come out in pretty large chunks, so increase from the default 1 MB. + owned_audio_frame_allocator.reset(new MallocFrameAllocator(1 << 20, NUM_QUEUED_AUDIO_FRAMES)); set_audio_frame_allocator(owned_audio_frame_allocator.get()); } } @@ -277,13 +282,20 @@ void FFmpegCapture::producer_thread_func() pthread_setname_np(pthread_self(), thread_name); while (!producer_thread_should_quit.should_quit()) { - string pathname = search_for_file(filename); - if (filename.empty()) { - fprintf(stderr, "%s not found, sleeping one second and trying again...\n", filename.c_str()); + string filename_copy; + { + lock_guard lock(filename_mu); + filename_copy = filename; + } + + string pathname = search_for_file(filename_copy); + if (pathname.empty()) { + fprintf(stderr, "%s not found, sleeping one second and trying again...\n", filename_copy.c_str()); send_disconnected_frame(); producer_thread_should_quit.sleep_for(seconds(1)); continue; } + should_interrupt = false; if (!play_video(pathname)) { // Error. fprintf(stderr, "Error when playing %s, sleeping one second and trying again...\n", pathname.c_str()); @@ -309,17 +321,33 @@ void FFmpegCapture::send_disconnected_frame() VideoFormat video_format; video_format.width = width; video_format.height = height; - video_format.stride = width * 4; video_format.frame_rate_nom = 60; video_format.frame_rate_den = 1; video_format.is_connected = false; + if (pixel_format == bmusb::PixelFormat_8BitBGRA) { + video_format.stride = width * 4; + video_frame.len = width * height * 4; + memset(video_frame.data, 0, video_frame.len); + } else { + video_format.stride = width; + current_frame_ycbcr_format.luma_coefficients = YCBCR_REC_709; + current_frame_ycbcr_format.full_range = true; + current_frame_ycbcr_format.num_levels = 256; + current_frame_ycbcr_format.chroma_subsampling_x = 2; + current_frame_ycbcr_format.chroma_subsampling_y = 2; + current_frame_ycbcr_format.cb_x_position = 0.0f; + current_frame_ycbcr_format.cb_y_position = 0.0f; + current_frame_ycbcr_format.cr_x_position = 0.0f; + current_frame_ycbcr_format.cr_y_position = 0.0f; + video_frame.len = width * height * 2; + memset(video_frame.data, 0, width * height); + memset(video_frame.data + width * height, 128, width * height); // Valid for both NV12 and planar. + } - video_frame.len = width * height * 4; - memset(video_frame.data, 0, video_frame.len); - - frame_callback(-1, AVRational{1, TIMEBASE}, timecode++, + frame_callback(-1, AVRational{1, TIMEBASE}, -1, AVRational{1, TIMEBASE}, timecode++, video_frame, /*video_offset=*/0, video_format, FrameAllocator::Frame(), /*audio_offset=*/0, AudioFormat()); + last_frame_was_connected = false; } } @@ -337,7 +365,10 @@ bool FFmpegCapture::play_video(const string &pathname) last_modified = buf.st_mtim; } - auto format_ctx = avformat_open_input_unique(pathname.c_str(), nullptr, nullptr); + AVDictionary *opts = nullptr; + av_dict_set(&opts, "fflags", "nobuffer", 0); + + auto format_ctx = avformat_open_input_unique(pathname.c_str(), nullptr, &opts, AVIOInterruptCB{ &FFmpegCapture::interrupt_cb_thunk, this }); if (format_ctx == nullptr) { fprintf(stderr, "%s: Error opening file\n", pathname.c_str()); return false; @@ -349,51 +380,93 @@ bool FFmpegCapture::play_video(const string &pathname) } int video_stream_index = find_stream_index(format_ctx.get(), AVMEDIA_TYPE_VIDEO); - if (video_stream_index == -1) { - fprintf(stderr, "%s: No video stream found\n", pathname.c_str()); - return false; - } - int audio_stream_index = find_stream_index(format_ctx.get(), AVMEDIA_TYPE_AUDIO); - const AVCodecParameters *codecpar = format_ctx->streams[video_stream_index]->codecpar; - video_timebase = format_ctx->streams[video_stream_index]->time_base; - AVCodecContextWithDeleter codec_ctx = avcodec_alloc_context3_unique(nullptr); - if (avcodec_parameters_to_context(codec_ctx.get(), codecpar) < 0) { - fprintf(stderr, "%s: Cannot fill codec parameters\n", pathname.c_str()); + if (video_stream_index == -1 && audio_stream_index == -1) { + fprintf(stderr, "%s: No audio nor video stream found\n", pathname.c_str()); return false; } - AVCodec *codec = avcodec_find_decoder(codecpar->codec_id); - if (codec == nullptr) { - fprintf(stderr, "%s: Cannot find decoder\n", pathname.c_str()); - return false; + if (video_stream_index == -1) { + fprintf(stderr, "%s: No video stream found, assuming audio-only.\n", pathname.c_str()); } - if (avcodec_open2(codec_ctx.get(), codec, nullptr) < 0) { - fprintf(stderr, "%s: Cannot open decoder\n", pathname.c_str()); - return false; + const bool audio_only_stream = (video_stream_index == -1); + + // Open video decoder, if we have video. + AVCodecContextWithDeleter video_codec_ctx; + if (video_stream_index != -1) { + const AVCodecParameters *video_codecpar = format_ctx->streams[video_stream_index]->codecpar; + AVCodec *video_codec = avcodec_find_decoder(video_codecpar->codec_id); + video_timebase = format_ctx->streams[video_stream_index]->time_base; + video_codec_ctx = avcodec_alloc_context3_unique(nullptr); + if (avcodec_parameters_to_context(video_codec_ctx.get(), video_codecpar) < 0) { + fprintf(stderr, "%s: Cannot fill video codec parameters\n", pathname.c_str()); + return false; + } + if (video_codec == nullptr) { + fprintf(stderr, "%s: Cannot find video decoder\n", pathname.c_str()); + return false; + } + if (avcodec_open2(video_codec_ctx.get(), video_codec, nullptr) < 0) { + fprintf(stderr, "%s: Cannot open video decoder\n", pathname.c_str()); + return false; + } } - unique_ptr codec_ctx_cleanup( - codec_ctx.get(), avcodec_close); + unique_ptr video_codec_ctx_cleanup( + video_codec_ctx.get(), avcodec_close); + + // Open audio decoder, if we have audio. + AVCodecContextWithDeleter audio_codec_ctx; + if (audio_stream_index != -1) { + audio_codec_ctx = avcodec_alloc_context3_unique(nullptr); + const AVCodecParameters *audio_codecpar = format_ctx->streams[audio_stream_index]->codecpar; + audio_timebase = format_ctx->streams[audio_stream_index]->time_base; + if (avcodec_parameters_to_context(audio_codec_ctx.get(), audio_codecpar) < 0) { + fprintf(stderr, "%s: Cannot fill audio codec parameters\n", pathname.c_str()); + return false; + } + AVCodec *audio_codec = avcodec_find_decoder(audio_codecpar->codec_id); + if (audio_codec == nullptr) { + fprintf(stderr, "%s: Cannot find audio decoder\n", pathname.c_str()); + return false; + } + if (avcodec_open2(audio_codec_ctx.get(), audio_codec, nullptr) < 0) { + fprintf(stderr, "%s: Cannot open audio decoder\n", pathname.c_str()); + return false; + } + } + unique_ptr audio_codec_ctx_cleanup( + audio_codec_ctx.get(), avcodec_close); internal_rewind(); // Main loop. + bool first_frame = true; while (!producer_thread_should_quit.should_quit()) { if (process_queued_commands(format_ctx.get(), pathname, last_modified, /*rewound=*/nullptr)) { return true; } + UniqueFrame audio_frame = audio_frame_allocator->alloc_frame(); + AudioFormat audio_format; + int64_t audio_pts; bool error; - AVFrameWithDeleter frame = decode_frame(format_ctx.get(), codec_ctx.get(), pathname, video_stream_index, audio_stream_index, &error); + AVFrameWithDeleter frame = decode_frame(format_ctx.get(), video_codec_ctx.get(), audio_codec_ctx.get(), + pathname, video_stream_index, audio_stream_index, audio_frame.get(), &audio_format, &audio_pts, &error); if (error) { return false; } - if (frame == nullptr) { + if (frame == nullptr && !(audio_only_stream && audio_frame->len > 0)) { // EOF. Loop back to the start if we can. if (av_seek_frame(format_ctx.get(), /*stream_index=*/-1, /*timestamp=*/0, /*flags=*/0) < 0) { fprintf(stderr, "%s: Rewind failed, not looping.\n", pathname.c_str()); return true; } + if (video_codec_ctx != nullptr) { + avcodec_flush_buffers(video_codec_ctx.get()); + } + if (audio_codec_ctx != nullptr) { + avcodec_flush_buffers(audio_codec_ctx.get()); + } // If the file has changed since last time, return to get it reloaded. // Note that depending on how you move the file into place, you might // end up corrupting the one you're already playing, so this path @@ -405,28 +478,93 @@ bool FFmpegCapture::play_video(const string &pathname) continue; } - VideoFormat video_format = construct_video_format(frame.get(), video_timebase); - FrameAllocator::Frame video_frame = make_video_frame(frame.get(), pathname, &error); - if (error) { - return false; + VideoFormat video_format; + UniqueFrame video_frame; + if (!audio_only_stream) { + video_format = construct_video_format(frame.get(), video_timebase); + video_frame = make_video_frame(frame.get(), pathname, &error); + if (error) { + return false; + } } - FrameAllocator::Frame audio_frame; - AudioFormat audio_format; - audio_format.bits_per_sample = 32; - audio_format.num_channels = 8; - - for ( ;; ) { + int64_t frame_pts = audio_only_stream ? audio_pts : frame->pts; + AVRational timebase = audio_only_stream ? audio_timebase : video_timebase; + for ( ;; ) { // Try sending the frame in a loop as long as we get interrupted (then break). if (last_pts == 0 && pts_origin == 0) { - pts_origin = frame->pts; + pts_origin = frame_pts; + } + next_frame_start = compute_frame_start(frame_pts, pts_origin, timebase, start, rate); + if (audio_only_stream) { + audio_frame->received_timestamp = next_frame_start; + } else { + if (first_frame && last_frame_was_connected) { + // If reconnect took more than one second, this is probably a live feed, + // and we should reset the resampler. (Or the rate is really, really low, + // in which case a reset on the first frame is fine anyway.) + if (duration(next_frame_start - last_frame).count() >= 1.0) { + last_frame_was_connected = false; + } + } + video_frame->received_timestamp = next_frame_start; + + // The easiest way to get all the rate conversions etc. right is to move the + // audio PTS into the video PTS timebase and go from there. (We'll get some + // rounding issues, but they should not be a big problem.) + int64_t audio_pts_as_video_pts = av_rescale_q(audio_pts, audio_timebase, video_timebase); + audio_frame->received_timestamp = compute_frame_start(audio_pts_as_video_pts, pts_origin, video_timebase, start, rate); + + if (audio_frame->len != 0) { + // The received timestamps in Nageru are measured after we've just received the frame. + // However, pts (especially audio pts) is at the _beginning_ of the frame. + // If we have locked audio, the distinction doesn't really matter, as pts is + // on a relative scale and a fixed offset is fine. But if we don't, we will have + // a different number of samples each time, which will cause huge audio jitter + // and throw off the resampler. + // + // In a sense, we should have compensated by adding the frame and audio lengths + // to video_frame->received_timestamp and audio_frame->received_timestamp respectively, + // but that would mean extra waiting in sleep_until(). All we need is that they + // are correct relative to each other, though (and to the other frames we send), + // so just align the end of the audio frame, and we're fine. + size_t num_samples = (audio_frame->len * 8) / audio_format.bits_per_sample / audio_format.num_channels; + double offset = double(num_samples) / OUTPUT_FREQUENCY - + double(video_format.frame_rate_den) / video_format.frame_rate_nom; + audio_frame->received_timestamp += duration_cast(duration(offset)); + } + } + + steady_clock::time_point now = steady_clock::now(); + if (duration(now - next_frame_start).count() >= 0.1) { + // If we don't have enough CPU to keep up, or if we have a live stream + // where the initial origin was somehow wrong, we could be behind indefinitely. + // In particular, this will give the audio resampler problems as it tries + // to speed up to reduce the delay, hitting the low end of the buffer every time. + fprintf(stderr, "%s: Playback %.0f ms behind, resetting time scale\n", + pathname.c_str(), + 1e3 * duration(now - next_frame_start).count()); + pts_origin = frame_pts; + start = next_frame_start = now; + timecode += MAX_FPS * 2 + 1; } - next_frame_start = compute_frame_start(frame->pts, pts_origin, video_timebase, start, rate); - video_frame.received_timestamp = next_frame_start; bool finished_wakeup = producer_thread_should_quit.sleep_until(next_frame_start); if (finished_wakeup) { - frame_callback(frame->pts, video_timebase, timecode++, - video_frame, 0, video_format, - audio_frame, 0, audio_format); + if (audio_frame->len > 0) { + assert(audio_pts != -1); + } + if (!last_frame_was_connected) { + // We're recovering from an error (or really slow load, see above). + // Make sure to get the audio resampler reset. (This is a hack; + // ideally, the frame callback should just accept a way to signal + // audio discontinuity.) + timecode += MAX_FPS * 2 + 1; + } + frame_callback(frame_pts, video_timebase, audio_pts, audio_timebase, timecode++, + video_frame.get_and_release(), 0, video_format, + audio_frame.get_and_release(), 0, audio_format); + first_frame = false; + last_frame = steady_clock::now(); + last_frame_was_connected = true; break; } else { if (producer_thread_should_quit.should_quit()) break; @@ -437,7 +575,6 @@ bool FFmpegCapture::play_video(const string &pathname) } // If we just rewound, drop this frame on the floor and be done. if (rewound) { - video_frame_allocator->release_frame(video_frame); break; } // OK, we didn't, so probably a rate change. Recalculate next_frame_start, @@ -451,7 +588,7 @@ bool FFmpegCapture::play_video(const string &pathname) } } } - last_pts = frame->pts; + last_pts = frame_pts; } return true; } @@ -500,14 +637,23 @@ bool FFmpegCapture::process_queued_commands(AVFormatContext *format_ctx, const s return false; } -AVFrameWithDeleter FFmpegCapture::decode_frame(AVFormatContext *format_ctx, AVCodecContext *codec_ctx, const std::string &pathname, int video_stream_index, int audio_stream_index, bool *error) +namespace { + +} // namespace + +AVFrameWithDeleter FFmpegCapture::decode_frame(AVFormatContext *format_ctx, AVCodecContext *video_codec_ctx, AVCodecContext *audio_codec_ctx, + const std::string &pathname, int video_stream_index, int audio_stream_index, + FrameAllocator::Frame *audio_frame, AudioFormat *audio_format, int64_t *audio_pts, bool *error) { *error = false; // Read packets until we have a frame or there are none left. bool frame_finished = false; - AVFrameWithDeleter frame = av_frame_alloc_unique(); + AVFrameWithDeleter audio_avframe = av_frame_alloc_unique(); + AVFrameWithDeleter video_avframe = av_frame_alloc_unique(); bool eof = false; + *audio_pts = -1; + bool has_audio = false; do { AVPacket pkt; unique_ptr pkt_cleanup( @@ -519,36 +665,144 @@ AVFrameWithDeleter FFmpegCapture::decode_frame(AVFormatContext *format_ctx, AVCo if (pkt.stream_index == audio_stream_index && audio_callback != nullptr) { audio_callback(&pkt, format_ctx->streams[audio_stream_index]->time_base); } - if (pkt.stream_index != video_stream_index) { - // Ignore audio for now. - continue; - } - if (avcodec_send_packet(codec_ctx, &pkt) < 0) { - fprintf(stderr, "%s: Cannot send packet to codec.\n", pathname.c_str()); - *error = true; - return AVFrameWithDeleter(nullptr); + if (pkt.stream_index == video_stream_index) { + if (avcodec_send_packet(video_codec_ctx, &pkt) < 0) { + fprintf(stderr, "%s: Cannot send packet to video codec.\n", pathname.c_str()); + *error = true; + return AVFrameWithDeleter(nullptr); + } + } else if (pkt.stream_index == audio_stream_index) { + has_audio = true; + if (avcodec_send_packet(audio_codec_ctx, &pkt) < 0) { + fprintf(stderr, "%s: Cannot send packet to audio codec.\n", pathname.c_str()); + *error = true; + return AVFrameWithDeleter(nullptr); + } } } else { eof = true; // Or error, but ignore that for the time being. } - int err = avcodec_receive_frame(codec_ctx, frame.get()); - if (err == 0) { - frame_finished = true; - break; - } else if (err != AVERROR(EAGAIN)) { - fprintf(stderr, "%s: Cannot receive frame from codec.\n", pathname.c_str()); - *error = true; + // Decode audio, if any. + if (has_audio) { + for ( ;; ) { + int err = avcodec_receive_frame(audio_codec_ctx, audio_avframe.get()); + if (err == 0) { + if (*audio_pts == -1) { + *audio_pts = audio_avframe->pts; + } + convert_audio(audio_avframe.get(), audio_frame, audio_format); + } else if (err == AVERROR(EAGAIN)) { + break; + } else { + fprintf(stderr, "%s: Cannot receive frame from audio codec.\n", pathname.c_str()); + *error = true; + return AVFrameWithDeleter(nullptr); + } + } + } + + if (video_codec_ctx != nullptr) { + // Decode video, if we have a frame. + int err = avcodec_receive_frame(video_codec_ctx, video_avframe.get()); + if (err == 0) { + frame_finished = true; + break; + } else if (err != AVERROR(EAGAIN)) { + fprintf(stderr, "%s: Cannot receive frame from video codec.\n", pathname.c_str()); + *error = true; + return AVFrameWithDeleter(nullptr); + } + } else { return AVFrameWithDeleter(nullptr); } } while (!eof); if (frame_finished) - return frame; + return video_avframe; else return AVFrameWithDeleter(nullptr); } +void FFmpegCapture::convert_audio(const AVFrame *audio_avframe, FrameAllocator::Frame *audio_frame, AudioFormat *audio_format) +{ + // Decide on a format. If there already is one in this audio frame, + // we're pretty much forced to use it. If not, we try to find an exact match. + // If that still doesn't work, we default to 32-bit signed chunked + // (float would be nice, but there's really no way to signal that yet). + AVSampleFormat dst_format; + if (audio_format->bits_per_sample == 0) { + switch (audio_avframe->format) { + case AV_SAMPLE_FMT_S16: + case AV_SAMPLE_FMT_S16P: + audio_format->bits_per_sample = 16; + dst_format = AV_SAMPLE_FMT_S16; + break; + case AV_SAMPLE_FMT_S32: + case AV_SAMPLE_FMT_S32P: + default: + audio_format->bits_per_sample = 32; + dst_format = AV_SAMPLE_FMT_S32; + break; + } + } else if (audio_format->bits_per_sample == 16) { + dst_format = AV_SAMPLE_FMT_S16; + } else if (audio_format->bits_per_sample == 32) { + dst_format = AV_SAMPLE_FMT_S32; + } else { + assert(false); + } + audio_format->num_channels = 2; + + int64_t channel_layout = audio_avframe->channel_layout; + if (channel_layout == 0) { + channel_layout = av_get_default_channel_layout(audio_avframe->channels); + } + + if (resampler == nullptr || + audio_avframe->format != last_src_format || + dst_format != last_dst_format || + channel_layout != last_channel_layout || + av_frame_get_sample_rate(audio_avframe) != last_sample_rate) { + avresample_free(&resampler); + resampler = avresample_alloc_context(); + if (resampler == nullptr) { + fprintf(stderr, "Allocating resampler failed.\n"); + exit(1); + } + + av_opt_set_int(resampler, "in_channel_layout", channel_layout, 0); + av_opt_set_int(resampler, "out_channel_layout", AV_CH_LAYOUT_STEREO_DOWNMIX, 0); + av_opt_set_int(resampler, "in_sample_rate", av_frame_get_sample_rate(audio_avframe), 0); + av_opt_set_int(resampler, "out_sample_rate", OUTPUT_FREQUENCY, 0); + av_opt_set_int(resampler, "in_sample_fmt", audio_avframe->format, 0); + av_opt_set_int(resampler, "out_sample_fmt", dst_format, 0); + + if (avresample_open(resampler) < 0) { + fprintf(stderr, "Could not open resample context.\n"); + exit(1); + } + + last_src_format = AVSampleFormat(audio_avframe->format); + last_dst_format = dst_format; + last_channel_layout = channel_layout; + last_sample_rate = av_frame_get_sample_rate(audio_avframe); + } + + size_t bytes_per_sample = (audio_format->bits_per_sample / 8) * 2; + size_t num_samples_room = (audio_frame->size - audio_frame->len) / bytes_per_sample; + + uint8_t *data = audio_frame->data + audio_frame->len; + int out_samples = avresample_convert(resampler, &data, 0, num_samples_room, + const_cast(audio_avframe->data), audio_avframe->linesize[0], audio_avframe->nb_samples); + if (out_samples < 0) { + fprintf(stderr, "Audio conversion failed.\n"); + exit(1); + } + + audio_frame->len += out_samples * bytes_per_sample; +} + VideoFormat FFmpegCapture::construct_video_format(const AVFrame *frame, AVRational video_timebase) { VideoFormat video_format; @@ -574,12 +828,12 @@ VideoFormat FFmpegCapture::construct_video_format(const AVFrame *frame, AVRation return video_format; } -FrameAllocator::Frame FFmpegCapture::make_video_frame(const AVFrame *frame, const string &pathname, bool *error) +UniqueFrame FFmpegCapture::make_video_frame(const AVFrame *frame, const string &pathname, bool *error) { *error = false; - FrameAllocator::Frame video_frame = video_frame_allocator->alloc_frame(); - if (video_frame.data == nullptr) { + UniqueFrame video_frame(video_frame_allocator->alloc_frame()); + if (video_frame->data == nullptr) { return video_frame; } @@ -605,17 +859,17 @@ FrameAllocator::Frame FFmpegCapture::make_video_frame(const AVFrame *frame, cons uint8_t *pic_data[4] = { nullptr, nullptr, nullptr, nullptr }; int linesizes[4] = { 0, 0, 0, 0 }; if (pixel_format == bmusb::PixelFormat_8BitBGRA) { - pic_data[0] = video_frame.data; + pic_data[0] = video_frame->data; linesizes[0] = width * 4; - video_frame.len = (width * 4) * height; + video_frame->len = (width * 4) * height; } else if (pixel_format == PixelFormat_NV12) { - pic_data[0] = video_frame.data; + pic_data[0] = video_frame->data; linesizes[0] = width; pic_data[1] = pic_data[0] + width * height; linesizes[1] = width; - video_frame.len = (width * 2) * height; + video_frame->len = (width * 2) * height; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(sws_dst_format); current_frame_ycbcr_format = decode_ycbcr_format(desc, frame); @@ -626,7 +880,7 @@ FrameAllocator::Frame FFmpegCapture::make_video_frame(const AVFrame *frame, cons int chroma_width = AV_CEIL_RSHIFT(int(width), desc->log2_chroma_w); int chroma_height = AV_CEIL_RSHIFT(int(height), desc->log2_chroma_h); - pic_data[0] = video_frame.data; + pic_data[0] = video_frame->data; linesizes[0] = width; pic_data[1] = pic_data[0] + width * height; @@ -635,7 +889,7 @@ FrameAllocator::Frame FFmpegCapture::make_video_frame(const AVFrame *frame, cons pic_data[2] = pic_data[1] + chroma_width * chroma_height; linesizes[2] = chroma_width; - video_frame.len = width * height + 2 * chroma_width * chroma_height; + video_frame->len = width * height + 2 * chroma_width * chroma_height; current_frame_ycbcr_format = decode_ycbcr_format(desc, frame); } @@ -643,3 +897,13 @@ FrameAllocator::Frame FFmpegCapture::make_video_frame(const AVFrame *frame, cons return video_frame; } + +int FFmpegCapture::interrupt_cb_thunk(void *unique) +{ + return reinterpret_cast(unique)->interrupt_cb(); +} + +int FFmpegCapture::interrupt_cb() +{ + return should_interrupt.load(); +}