Remove y4m seek hack that is probably obsolete

FFMS · Apr 29, 2024 · 72b5035 · 72b5035
1 parent 9b7ac32
commit 72b5035
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/src/core/videosource.cpp b/src/core/videosource.cpp
@@ -710,7 +710,7 @@ int FFMS_VideoSource::Seek(int n) {
     }
 
     if (ret < 0 && Frames[n].FilePos >= 0) {
-        ret = av_seek_frame(FormatContext, VideoTrack, Frames[n].FilePos + PosOffset, AVSEEK_FLAG_BYTE);
+        ret = av_seek_frame(FormatContext, VideoTrack, Frames[n].FilePos, AVSEEK_FLAG_BYTE);
         if (ret >= 0)
             SeekByPos = true;
     }
@@ -727,23 +727,6 @@ int FFMS_VideoSource::Seek(int n) {
     return ret;
 }
 
-int FFMS_VideoSource::ReadFrame(AVPacket *pkt) {
-    int ret = av_read_frame(FormatContext, pkt);
-    if (ret >= 0 || ret == AVERROR(EOF)) return ret;
-
-    // Lavf reports the beginning of the actual video data as the packet's
-    // position, but the reader requires the header, so we end up seeking
-    // to the wrong position. Wait until a read actual fails to adjust the
-    // seek targets, so that if this ever gets fixed upstream our workaround
-    // doesn't re-break it.
-    if (strcmp(FormatContext->iformat->name, "yuv4mpegpipe") == 0) {
-        PosOffset = -6;
-        Seek(CurrentFrame);
-        return av_read_frame(FormatContext, pkt);
-    }
-    return ret;
-}
-
 void FFMS_VideoSource::Free() {
     av_freep(&RPUBuffer);
     av_freep(&HDR10PlusBuffer);
@@ -776,12 +759,12 @@ void FFMS_VideoSource::DecodeNextFrame(int64_t &AStartTime, int64_t &Pos) {
         av_packet_ref(Packet, StashedPacket);
         av_packet_unref(StashedPacket);
     } else {
-        ret = ReadFrame(Packet);
+        ret = av_read_frame(FormatContext, Packet);
     }
     while (ret >= 0) {
         if (Packet->stream_index != VideoTrack) {
             av_packet_unref(Packet);
-            ret = ReadFrame(Packet);
+            ret = av_read_frame(FormatContext, Packet);
             continue;
         }
 
@@ -805,7 +788,7 @@ void FFMS_VideoSource::DecodeNextFrame(int64_t &AStartTime, int64_t &Pos) {
             av_packet_ref(Packet, StashedPacket);
             av_packet_unref(StashedPacket);
         } else {
-            ret = ReadFrame(Packet);
+            ret = av_read_frame(FormatContext, Packet);
         }
     }
     if (IsIOError(ret)) {

diff --git a/src/core/videosource.h b/src/core/videosource.h
@@ -117,7 +117,6 @@ struct FFMS_VideoSource {
     AVFormatContext *FormatContext = nullptr;
     int SeekMode;
     bool SeekByPos = false;
-    int PosOffset = 0;
     bool HaveSeenInterlacedFrame = false;
 
     void ReAdjustOutputFormat(AVFrame *Frame);
@@ -127,7 +126,6 @@ struct FFMS_VideoSource {
     void DecodeNextFrame(int64_t &PTS, int64_t &Pos);
     bool SeekTo(int n, int SeekOffset);
     int Seek(int n);
-    int ReadFrame(AVPacket *pkt);
     void Free();
     static void SanityCheckFrameForData(AVFrame *Frame);
 public: