Change from RGBA to BGRA; slightly more Intel GPU-friendly, and Caspar uses that...

[nageru] / ffmpeg_capture.cpp

diff --git a/ffmpeg_capture.cpp b/ffmpeg_capture.cpp
index 464b4cb92d292b8b6bb80f458c92715209f6e902..ab35c5c5ef1c5f18e66f338fa1cad20fef860a9d 100644 (file)
--- a/ffmpeg_capture.cpp
+++ b/ffmpeg_capture.cpp
@@ -28,6 +28,7 @@ extern "C" {
 
 #include "bmusb/bmusb.h"
 #include "ffmpeg_raii.h"
+#include "ffmpeg_util.h"
 #include "flags.h"
 #include "image_input.h"
 
@@ -179,25 +180,14 @@ bool FFmpegCapture::play_video(const string &pathname)
                return false;
        }
 
-       int video_stream_index = -1, audio_stream_index = -1;
-       AVRational video_timebase{ 1, 1 };
-       for (unsigned i = 0; i < format_ctx->nb_streams; ++i) {
-               if (format_ctx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&
-                   video_stream_index == -1) {
-                       video_stream_index = i;
-                       video_timebase = format_ctx->streams[i]->time_base;
-               }
-               if (format_ctx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
-                   audio_stream_index == -1) {
-                       audio_stream_index = i;
-               }
-       }
+       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;
        }
 
        const AVCodecParameters *codecpar = format_ctx->streams[video_stream_index]->codecpar;
+       AVRational 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());
@@ -307,7 +297,7 @@ bool FFmpegCapture::play_video(const string &pathname)
                if (sws_ctx == nullptr || sws_last_width != frame->width || sws_last_height != frame->height) {
                        sws_ctx.reset(
                                sws_getContext(frame->width, frame->height, (AVPixelFormat)frame->format,
-                                       width, height, AV_PIX_FMT_RGBA,
+                                       width, height, AV_PIX_FMT_BGRA,
                                        SWS_BICUBIC, nullptr, nullptr, nullptr));
                        sws_last_width = frame->width;
                        sws_last_height = frame->height;
@@ -323,6 +313,11 @@ bool FFmpegCapture::play_video(const string &pathname)
                video_format.stride = width * 4;
                video_format.frame_rate_nom = video_timebase.den;
                video_format.frame_rate_den = av_frame_get_pkt_duration(frame.get()) * video_timebase.num;
+               if (video_format.frame_rate_nom == 0 || video_format.frame_rate_den == 0) {
+                       // Invalid frame rate.
+                       video_format.frame_rate_nom = 60;
+                       video_format.frame_rate_den = 1;
+               }
                video_format.has_signal = true;
                video_format.is_connected = true;