Silence warnings and set avisynth clip level field order

vapoursynth · Apr 2, 2024 · 31ce21e · 31ce21e
1 parent 04da097
commit 31ce21e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/src/audiosource.cpp b/src/audiosource.cpp
@@ -1078,7 +1078,7 @@ bool BestAudioSource::WriteAudioTrackIndex(const std::string &CachePath) {
         for (auto &Iter : Dict)
             Iter.second = PV++;
 
-        WriteInt(F, Dict.size());
+        WriteInt(F, static_cast<int>(Dict.size()));
         WriteInt64(F, PTSPredictor);
 
         for (const auto &Iter : Dict)

diff --git a/src/avisynth.cpp b/src/avisynth.cpp
@@ -131,7 +131,9 @@ class AvisynthVideoSource : public IClip {
                 throw BestSourceException("Unsupported output bitdepth");
             }
 
-            // FIXME, set TFF flag too?
+            if (VP.FieldBased)
+                VI.image_type |= VideoInfo::IT_FIELDBASED;
+            VI.image_type |= VP.TFF ? VideoInfo::IT_TFF : VideoInfo::IT_BFF;
 
             VI.width = VP.Width;
             VI.height = VP.Height;
@@ -281,11 +283,11 @@ class AvisynthVideoSource : public IClip {
         }
 
         if (Src->DolbyVisionRPU && Src->DolbyVisionRPUSize > 0) {
-            Env->propSetData(Props, "DolbyVisionRPU", reinterpret_cast<const char *>(Src->DolbyVisionRPU), Src->DolbyVisionRPUSize, 0);
+            Env->propSetData(Props, "DolbyVisionRPU", reinterpret_cast<const char *>(Src->DolbyVisionRPU), static_cast<int>(Src->DolbyVisionRPUSize), 0);
         }
 
         if (Src->HDR10Plus && Src->HDR10PlusSize > 0) {
-            Env->propSetData(Props, "HDR10Plus", reinterpret_cast<const char *>(Src->HDR10Plus), Src->HDR10PlusSize, 0);
+            Env->propSetData(Props, "HDR10Plus", reinterpret_cast<const char *>(Src->HDR10Plus), static_cast<int>(Src->HDR10PlusSize), 0);
         }
 
         Env->propSetInt(Props, "FlipVertical", VP.FlipVerical, 0);

diff --git a/src/tracklist.cpp b/src/tracklist.cpp
@@ -84,7 +84,7 @@ BestTrackList::~BestTrackList() {
 }
 
 int BestTrackList::GetNumTracks() const {
-    return TrackList.size();
+    return static_cast<int>(TrackList.size());
 }
 
 const BestTrackList::TrackInfo &BestTrackList::GetTrackInfo(int Track) const {

diff --git a/src/vapoursynth.cpp b/src/vapoursynth.cpp
@@ -423,11 +423,11 @@ static void VS_CC GetTrackInfo(const VSMap *In, VSMap *Out, void *, VSCore *core
         for (int i = 0; i < TrackList->GetNumTracks(); i++) {
             auto TI = TrackList->GetTrackInfo(i);
             vsapi->mapSetInt(Out, "tracktype", TI.MediaType, maAppend);
-            vsapi->mapSetData(Out, "tracktypestr", TI.MediaTypeString.c_str(), TI.MediaTypeString.size(), dtUtf8, maAppend);
+            vsapi->mapSetData(Out, "tracktypestr", TI.MediaTypeString.c_str(), -1, dtUtf8, maAppend);
             vsapi->mapSetInt(Out, "codec", TI.Codec, maAppend);
-            vsapi->mapSetData(Out, "codecstr", TI.CodecString.c_str(), TI.CodecString.size(), dtUtf8, maAppend);
+            vsapi->mapSetData(Out, "codecstr", TI.CodecString.c_str(), -1, dtUtf8, maAppend);
             vsapi->mapSetInt(Out, "disposition", TI.Disposition, maAppend);
-            vsapi->mapSetData(Out, "dispositionstr", TI.DispositionString.c_str(), TI.DispositionString.size(), dtUtf8, maAppend);
+            vsapi->mapSetData(Out, "dispositionstr", TI.DispositionString.c_str(), -1, dtUtf8, maAppend);
         }
     } catch (BestSourceException &e) {
         vsapi->mapSetError(Out, (std::string("TrackInfo: ") + e.what()).c_str());

diff --git a/src/videosource.cpp b/src/videosource.cpp
@@ -282,6 +282,8 @@ void LWVideoDecoder::GetVideoProperties(VideoProperties &VP) {
     if (!PropFrame)
         return;
 
+    VP.FieldBased = !!(PropFrame->flags & AV_FRAME_FLAG_INTERLACED);
+    VP.TFF = !!(PropFrame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST);
     VP.Width = CodecContext->width;
     VP.Height = CodecContext->height;
     VP.VF.Set(av_pix_fmt_desc_get(static_cast<AVPixelFormat>(PropFrame->format)));
@@ -1343,7 +1345,7 @@ bool BestVideoSource::WriteVideoTrackIndex(const std::string &CachePath) {
         for (auto &Iter : Dict)
             Iter.second = PV++;
 
-        WriteInt(F, Dict.size());
+        WriteInt(F, static_cast<int>(Dict.size()));
         WriteInt64(F, PTSPredictor);
 
         for (const auto &Iter : Dict)

diff --git a/src/videosource.h b/src/videosource.h
@@ -64,6 +64,9 @@ struct VideoProperties {
     int Width;
     int Height;
 
+    bool FieldBased;
+    bool TFF;
+
     /* Stereo 3D */
     int Stereo3DType;
     int Stereo3DFlags;