add test for Issue 334, PR 336

moviepy/video/VideoClip.py

@@ -530,6 +530,24 @@ def fl_image(self, image_func, apply_to=[]):
     # C O M P O S I T I N G
 
 
+    def fill_array(self, pre_array, shape=(0, 0)):
+        pre_shape = pre_array.shape
+        dx = shape[0] - pre_shape[0]
+        dy = shape[1] - pre_shape[1]
+        post_array = pre_array
+        if dx < 0:
+            post_array = pre_array[:shape[0]]
+        elif dx > 0:
+            x_1 = [[[1, 1, 1]] * pre_shape[1]] * dx
+            post_array = np.vstack((pre_array, x_1))
+        if dy < 0:
+            post_array = post_array[:, :shape[1]]
+        elif dy > 0:
+            x_1 = [[[1, 1, 1]] * dy] * post_array.shape[0]
+            post_array = np.hstack((post_array, x_1))
+        return post_array
+
+
     def blit_on(self, picture, t):
         """
         Returns the result of the blit of the clip's frame at time `t`
@@ -549,6 +567,9 @@ def blit_on(self, picture, t):
         img = self.get_frame(ct)
         mask = (None if (self.mask is None) else
                 self.mask.get_frame(ct))
+        if mask is not None:
+            if (img.shape[0] != mask.shape[0]) or (img.shape[1] != mask.shape[1]):
+                img = self.fill_array(img, mask.shape)
         hi, wi = img.shape[:2]
 
         # SET POSITION

tests/download_media.py

@@ -25,6 +25,9 @@ def download():
     download_url("https://github.com/earney/moviepy_media/raw/master/tests/images/afterimage.png",
                  "media/afterimage.png")
 
+    download_url("https://github.com/earney/moviepy_media/blob/master/tests/videos/big_buck_bunny_0_30.webm?raw=true",
+                 "media/big_buck_bunny_0_30.webm")
+
     download_url("https://github.com/earney/moviepy_media/raw/master/tests/videos/big_buck_bunny_432_433.webm",
                  "media/big_buck_bunny_432_433.webm")
 

tests/test_issues.py

@@ -29,6 +29,66 @@ def test_issue_285():
     merged_clip = concatenate_videoclips([clip_1, clip_2, clip_3])
     assert merged_clip.duration == 30
 
+
+def test_issue_334():
+    last_move = None
+    last_move1 = None
+
+    lis = [(0.0, 113, 167, 47), (0.32, 138, 159, 47), (0.44, 152, 144, 47), (0.48, 193, 148, 47), (0.6, 193, 148, 47), (0.76, 205, 138, 55), (0.88, 204, 121, 63), (0.92, 190, 31, 127), (1.2, 183, 59, 127), (1.4, 137, 22, 127), (1.52, 137, 22, 127), (1.72, 129, 67, 127), (1.88, 123, 69, 127), (2.04, 131, 123, 63), (2.24, 130, 148, 63), (2.48, 130, 148, 63), (2.8, 138, 180, 63), (3.0, 138, 180, 63), (3.2, 146, 192, 63), (3.28, 105, 91, 151), (3.44, 105, 91, 151), (3.72, 11, 48, 151), (3.96, 5, 78, 151), (4.32, 4, 134, 1), (4.6, 149, 184, 48), (4.8, 145, 188, 48), (5.0, 154, 217, 48), (5.08, 163, 199, 48), (5.2, 163, 199, 48), (5.32, 164, 187, 48), (5.48, 163, 200, 48), (5.76, 163, 200, 48), (5.96, 173, 199, 48), (6.0, 133, 172, 48), (6.04, 128, 165, 48), (6.28, 128, 165, 48), (6.4, 129, 180, 48), (6.52, 133, 166, 48), (6.64, 133, 166, 48), (6.88, 144, 183, 48), (7.0, 153, 174, 48), (7.16, 153, 174, 48), (7.24, 153, 174, 48), (7.28, 253, 65, 104), (7.64, 253, 65, 104), (7.8, 279, 116, 80), (8.0, 290, 105, 80), (8.24, 288, 124, 80), (8.44, 243, 102, 80), (8.56, 243, 102, 80), (8.8, 202, 107, 80), (8.84, 164, 27, 104), (9.0, 164, 27, 104), (9.12, 121, 9, 104), (9.28, 77, 33, 104), (9.32, 52, 23, 104), (9.48, 52, 23, 104), (9.64, 33, 46, 104), (9.8, 93, 49, 104), (9.92, 93, 49, 104), (10.16, 173, 19, 104), (10.2, 226, 173, 48), (10.36, 226, 173, 48), (10.48, 211, 172, 48), (10.64, 208, 162, 48), (10.92, 220, 171, 48)]
+
+    lis1 = [(0.0, 113, 167, 47), (0.32, 138, 159, 47), (0.44, 152, 144, 47), (0.48, 193, 148, 47), (0.6, 193, 148, 47), (0.76, 205, 138, 55), (0.88, 204, 121, 63), (0.92, 190, 31, 127), (1.2, 183, 59, 127), (1.4, 137, 22, 127), (1.52, 137, 22, 127), (1.72, 129, 67, 127), (1.88, 123, 69, 127), (2.04, 131, 123, 63), (2.24, 130, 148, 63), (2.48, 130, 148, 63), (2.8, 138, 180, 63), (3.0, 138, 180, 63), (3.2, 146, 192, 63), (3.28, 105, 91, 151), (3.44, 105, 91, 151), (3.72, 11, 48, 151), (3.96, 5, 78, 151), (4.32, 4, 134, 1), (4.6, 149, 184, 48), (4.8, 145, 188, 48), (5.0, 154, 217, 48), (5.08, 163, 199, 48), (5.2, 163, 199, 48), (5.32, 164, 187, 48), (5.48, 163, 200, 48), (5.76, 163, 200, 48), (5.96, 173, 199, 48), (6.0, 133, 172, 48), (6.04, 128, 165, 48), (6.28, 128, 165, 48), (6.4, 129, 180, 48), (6.52, 133, 166, 48), (6.64, 133, 166, 48), (6.88, 144, 183, 48), (7.0, 153, 174, 48), (7.16, 153, 174, 48), (7.24, 153, 174, 48), (7.28, 253, 65, 104), (7.64, 253, 65, 104), (7.8, 279, 116, 80), (8.0, 290, 105, 80), (8.24, 288, 124, 80), (8.44, 243, 102, 80), (8.56, 243, 102, 80), (8.8, 202, 107, 80), (8.84, 164, 27, 104), (9.0, 164, 27, 104), (9.12, 121, 9, 104), (9.28, 77, 33, 104), (9.32, 52, 23, 104), (9.48, 52, 23, 104), (9.64, 33, 46, 104), (9.8, 93, 49, 104), (9.92, 93, 49, 104), (10.16, 173, 19, 104), (10.2, 226, 173, 48), (10.36, 226, 173, 48), (10.48, 211, 172, 48), (10.64, 208, 162, 48), (10.92, 220, 171, 48)]
+
+
+    def posi(t):
+        global last_move
+        if len(lis) == 0:
+           return (last_move[1], last_move[2])
+        if t >= lis[0][0]:
+           last_move = item = lis.pop(0)
+           return (item[1], item[2])
+        else:
+           if len(lis) > 0:
+              dura = lis[0][0] - last_move[0]
+              now = t - last_move[0]
+              w = (lis[0][1] - last_move[1]) * (now / dura)
+              h = (lis[0][2] - last_move[2]) * (now / dura)
+              # print t, last_move[1] + w, last_move[2] + h
+              return (last_move[1] + w, last_move[2] + h)
+           return (last_move[1], last_move[2])
+
+    def size(t):
+        global last_move1
+        if len(lis1) == 0:
+           return (last_move1[3], last_move1[3] * 1.33)
+        if t >= lis1[0][0]:
+           last_move1 = item = lis1.pop(0)
+           return (item[3], item[3] * 1.33)
+        else:
+           if len(lis) > 0:
+              dura = lis1[0][0] - last_move1[0]
+              now = t - last_move1[0]
+              s = (lis1[0][3] - last_move1[3]) * (now / dura)
+              nsw = last_move1[3] + s
+              nsh = nsw * 1.33
+              # print t, nsw, nsh
+              return (nsw, nsh)
+           return (last_move1[3], last_move1[3] * 1.33)
+
+
+    avatar = VideoFileClip("media/big_buck_bunny_432_433.webm", has_mask=True)
+    avatar.audio=None
+    maskclip = ImageClip("media/afterimage.png", ismask=True, transparent=True)
+    avatar.set_mask(maskclip)  #must set maskclip here..
+
+    avatar = concatenate([avatar]*11)
+
+    tt = VideoFileClip("media/big_buck_bunny_0_30.webm").subclip(0,11)
+    #setting mask here does not work.
+    #final = CompositeVideoClip([tt, avatar.set_position(posi).set_mask(maskclip).resize(size)])
+    final = CompositeVideoClip([tt, avatar.set_position(posi).resize(size)])
+    final.duration = tt.duration
+    final.write_videofile(os.path.join(TMP_DIR, 'issue_334.mp4'), fps=24)
+
 def test_issue_354():
     clip = ImageClip("media/python_logo.png")