Fix a few Clang warnings.

[nageru] / ffmpeg_capture.cpp

diff --git a/ffmpeg_capture.cpp b/ffmpeg_capture.cpp
index 1a6703eb5c8d36d19984608fca7212254e35ba93..50b4fa45109362d637dfd69c5122725f69e3828d 100644 (file)
--- a/ffmpeg_capture.cpp
+++ b/ffmpeg_capture.cpp
@@ -288,6 +288,7 @@ void FFmpegCapture::producer_thread_func()
                        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());
@@ -313,12 +314,20 @@ 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;
-
-               video_frame.len = width * height * 4;
+               if (pixel_format == bmusb::PixelFormat_8BitBGRA) {
+                       video_format.stride = width * 4;
+                       video_frame.len = width * height * 4;
+               } else {
+                       video_format.stride = width;
+                       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;
+                       video_frame.len = width * height * 2;
+               }
                memset(video_frame.data, 0, video_frame.len);
 
                frame_callback(-1, AVRational{1, TIMEBASE}, -1, AVRational{1, TIMEBASE}, timecode++,
@@ -341,7 +350,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;
@@ -381,8 +393,9 @@ bool FFmpegCapture::play_video(const string &pathname)
                video_codec_ctx.get(), avcodec_close);
 
        // Open audio decoder, if we have audio.
-       AVCodecContextWithDeleter audio_codec_ctx = avcodec_alloc_context3_unique(nullptr);
+       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) {
@@ -425,6 +438,12 @@ bool FFmpegCapture::play_video(const string &pathname)
                                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
@@ -448,6 +467,7 @@ bool FFmpegCapture::play_video(const string &pathname)
                        }
                        next_frame_start = compute_frame_start(frame->pts, pts_origin, video_timebase, start, rate);
                        video_frame->received_timestamp = next_frame_start;
+                       audio_frame->received_timestamp = next_frame_start;
                        bool finished_wakeup = producer_thread_should_quit.sleep_until(next_frame_start);
                        if (finished_wakeup) {
                                if (audio_frame->len > 0) {
@@ -639,10 +659,15 @@ void FFmpegCapture::convert_audio(const AVFrame *audio_avframe, FrameAllocator::
        }
        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 ||
-           av_frame_get_channel_layout(audio_avframe) != last_channel_layout ||
+           channel_layout != last_channel_layout ||
            av_frame_get_sample_rate(audio_avframe) != last_sample_rate) {
                avresample_free(&resampler);
                resampler = avresample_alloc_context();
@@ -651,7 +676,7 @@ void FFmpegCapture::convert_audio(const AVFrame *audio_avframe, FrameAllocator::
                        exit(1);
                }
 
-               av_opt_set_int(resampler, "in_channel_layout",  av_frame_get_channel_layout(audio_avframe), 0);
+               av_opt_set_int(resampler, "in_channel_layout",  channel_layout,                             0);
                av_opt_set_int(resampler, "out_channel_layout", AV_CH_LAYOUT_STEREO,                        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);
@@ -665,7 +690,7 @@ void FFmpegCapture::convert_audio(const AVFrame *audio_avframe, FrameAllocator::
 
                last_src_format = AVSampleFormat(audio_avframe->format);
                last_dst_format = dst_format;
-               last_channel_layout = av_frame_get_channel_layout(audio_avframe);
+               last_channel_layout = channel_layout;
                last_sample_rate = av_frame_get_sample_rate(audio_avframe);
        }
 
@@ -674,7 +699,7 @@ void FFmpegCapture::convert_audio(const AVFrame *audio_avframe, FrameAllocator::
 
        uint8_t *data = audio_frame->data + audio_frame->len;
        int out_samples = avresample_convert(resampler, &data, 0, num_samples_room,
-               audio_avframe->data, audio_avframe->linesize[0], audio_avframe->nb_samples);
+               const_cast<uint8_t **>(audio_avframe->data), audio_avframe->linesize[0], audio_avframe->nb_samples);
        if (out_samples < 0) {
                 fprintf(stderr, "Audio conversion failed.\n");
                 exit(1);
@@ -777,3 +802,13 @@ UniqueFrame FFmpegCapture::make_video_frame(const AVFrame *frame, const string &
 
        return video_frame;
 }
+
+int FFmpegCapture::interrupt_cb_thunk(void *unique)
+{
+       return reinterpret_cast<FFmpegCapture *>(unique)->interrupt_cb();
+}
+
+int FFmpegCapture::interrupt_cb()
+{
+       return should_interrupt.load();
+}