Move some common FFmpeg utilities out into a shared file, instead of having them...

[nageru] / ffmpeg_capture.cpp

diff --git a/ffmpeg_capture.cpp b/ffmpeg_capture.cpp
index e03382cec5418c8732bff8f0ecbc0d8346cb0544..6e672d9d837e1ec6145dda12abc4dcd27eb22b1a 100644 (file)
--- a/ffmpeg_capture.cpp
+++ b/ffmpeg_capture.cpp
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 extern "C" {
@@ -27,6 +28,7 @@ extern "C" {
 
 #include "bmusb/bmusb.h"
 #include "ffmpeg_raii.h"
+#include "ffmpeg_util.h"
 #include "flags.h"
 #include "image_input.h"
 
@@ -44,6 +46,19 @@ steady_clock::time_point compute_frame_start(int64_t frame_pts, int64_t pts_orig
        return origin + duration_cast<steady_clock::duration>(pts / rate);
 }
 
+bool changed_since(const std::string &pathname, const timespec &ts)
+{
+       if (ts.tv_sec < 0) {
+               return false;
+       }
+       struct stat buf;
+       if (stat(pathname.c_str(), &buf) != 0) {
+               fprintf(stderr, "%s: Couldn't check for new version, leaving the old in place.\n", pathname.c_str());
+               return false;
+       }
+       return (buf.st_mtim.tv_sec != ts.tv_sec || buf.st_mtim.tv_nsec != ts.tv_nsec);
+}
+
 }  // namespace
 
 FFmpegCapture::FFmpegCapture(const string &filename, unsigned width, unsigned height)
@@ -142,6 +157,18 @@ void FFmpegCapture::producer_thread_func()
 
 bool FFmpegCapture::play_video(const string &pathname)
 {
+       // Note: Call before open, not after; otherwise, there's a race.
+       // (There is now, too, but it tips the correct way. We could use fstat()
+       // if we had the file descriptor.)
+       timespec last_modified;
+       struct stat buf;
+       if (stat(pathname.c_str(), &buf) != 0) {
+               // Probably some sort of protocol, so can't stat.
+               last_modified.tv_sec = -1;
+       } else {
+               last_modified = buf.st_mtim;
+       }
+
        auto format_ctx = avformat_open_input_unique(pathname.c_str(), nullptr, nullptr);
        if (format_ctx == nullptr) {
                fprintf(stderr, "%s: Error opening file\n", pathname.c_str());
@@ -153,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());
@@ -209,6 +225,13 @@ bool FFmpegCapture::play_video(const string &pathname)
                                if (av_seek_frame(format_ctx.get(), /*stream_index=*/-1, /*timestamp=*/0, /*flags=*/0) < 0) {
                                        fprintf(stderr, "%s: Rewind failed, stopping play.\n", pathname.c_str());
                                }
+                               // 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
+                               // might not trigger.
+                               if (changed_since(pathname, last_modified)) {
+                                       return true;
+                               }
                                internal_rewind();
                                break;
 
@@ -260,6 +283,13 @@ bool FFmpegCapture::play_video(const string &pathname)
                                fprintf(stderr, "%s: Rewind failed, not looping.\n", pathname.c_str());
                                return true;
                        }
+                       // 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
+                       // might not trigger.
+                       if (changed_since(pathname, last_modified)) {
+                               return true;
+                       }
                        internal_rewind();
                        continue;
                }