fix Media.clip

rectalogic · Dec 23, 2023 · 221890d · 221890d
1 parent 9fc4e40
commit 221890d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,9 +54,9 @@ jobs:
       with:
         submodules: true
     - name: Build/test mediaFX
-      run: DOCKER_OPTS="-e MEDIAFX_TEST=" TARGET=opengl builders/Linux/docker-run.sh /mediafx/builders/Linux/mediafx-build.sh
+      run: DOCKER_OPTS="-e MEDIAFX_TEST=" TARGET=opengl builders/Linux/docker-run.sh
     - name: Build/test mediaFX vulkan
-      run: DOCKER_OPTS="-e MEDIAFX_TEST=" TARGET=vulkan builders/Linux/docker-run.sh /mediafx/builders/Linux/mediafx-build.sh
+      run: DOCKER_OPTS="-e MEDIAFX_TEST=" TARGET=vulkan builders/Linux/docker-run.sh
     - name: Upload Failed Artifacts
       if: failure()
       uses: actions/upload-artifact@v3

diff --git a/builders/Linux/Dockerfile b/builders/Linux/Dockerfile
@@ -62,3 +62,4 @@ COPY entrypoint.sh /entrypoint.sh
 
 USER mediafx
 ENTRYPOINT ["/usr/bin/xvfb-run", "--server-args", "-screen 0 640x480x24 -nolisten unix", "--error-file", "/dev/stderr", "/entrypoint.sh"]
+CMD ["/mediafx/builders/Linux/mediafx-build.sh"]
diff --git a/src/mediafx/media.cpp b/src/mediafx/media.cpp
@@ -57,6 +57,7 @@ void MediaAttached::setClip(MediaClip* clip)
                 }
             }
         }
+        m_clip = clip;
         emit clipChanged();
     }
 }
diff --git a/tests/qml/video-ad-insertion.qml b/tests/qml/video-ad-insertion.qml
@@ -24,13 +24,15 @@ Item {
         source: Qt.resolvedUrl("../../build/assets/red-320x180-15fps-8s.nut")
 
         Component.onCompleted: {
+            // End encoding when main videoClip finishes
             videoClip.clipEnded.connect(MediaFX.finishEncoding);
         }
     }
     MediaClip {
         id: adClip
 
         source: Qt.resolvedUrl("../../build/assets/blue-320x180-30fps-3s.nut")
+        // Switch back to default state when ad ends - main videoClip playing
         onClipEnded: videoOutput.state = ""
     }
     VideoOutput {
@@ -40,6 +42,7 @@ Item {
         states: [
             State {
                 name: "ad"
+                // 4 sec into the main video, switch to playing the ad
                 when: (videoClip.clipCurrentTime.contains(4000))
                 PropertyChanges {
                     target: videoOutput
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,3 +62,4 @@ COPY entrypoint.sh /entrypoint.sh

		USER mediafx
		ENTRYPOINT ["/usr/bin/xvfb-run", "--server-args", "-screen 0 640x480x24 -nolisten unix", "--error-file", "/dev/stderr", "/entrypoint.sh"]
		CMD ["/mediafx/builders/Linux/mediafx-build.sh"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ void MediaAttached::setClip(MediaClip* clip) @@
                     }
                 }
             }
+            m_clip = clip;
             emit clipChanged();
         }
     }