Browse Source

correstion diverses

rep 5 years ago
parent
commit
5ce0a89bb6
1 changed files with 9 additions and 33 deletions
  1. 9
    33
      video2d.py

+ 9
- 33
video2d.py View File

@@ -1,7 +1,6 @@
1 1
 #!/usr/bin/python
2 2
 # coding: utf-8
3 3
 
4
-<<<<<<< HEAD
5 4
 '''
6 5
 ffmpeg -i drone.mp4 -vf fps=30 ./drone/img%03d.jpg
7 6
 '''
@@ -9,10 +8,6 @@ ffmpeg -i drone.mp4 -vf fps=30 ./drone/img%03d.jpg
9 8
 import sys 		# sys.argv[]
10 9
 import Image 	# Image.open()
11 10
 import os 		# os.getcwd
12
-=======
13
-import sys
14
-import Image
15
->>>>>>> adc56b0f751a338bfe5c843061889df049d4390b
16 11
 
17 12
 '''
18 13
 im1 = Image.open(str(sys.argv[1]))
@@ -35,13 +30,12 @@ for x in range(1,allongement+1):
35 30
     print('%03.1i' % x)
36 31
 '''
37 32
 
38
-<<<<<<< HEAD
39 33
 script = os.getcwd()
40 34
 print script
41 35
 
42 36
 index = 1
43
-allongement = 10	#4818
44
-im1 = Image.open("./captain/img001.jpg")
37
+allongement = 16	#4818
38
+im1 = Image.open("./capt/img001.jpg")
45 39
 im2 = Image.new("RGBA",(im1.size[0]*allongement, im1.size[1]*allongement))
46 40
 largeur = im1.size[0]
47 41
 hauteur = im1.size[1]
@@ -51,37 +45,22 @@ positiony = 0
51 45
 for x in range(0,allongement):	
52 46
 	positionx = 0
53 47
 
54
-	for y in range(1,11):
48
+	for y in range(1,17):
55 49
 		z = x*10 + y
56
-		im1 = Image.open("./captain/img%03.1i.jpg" % z)
57
-		print "z="+str(z)
50
+		im1 = Image.open("./capt/img%03.1i.jpg" % z)
51
+		#print "z="+str(z)
58 52
 		im2.paste(im1, (positionx,positiony))
59 53
 		#print position
60 54
 		#print("./drone/img%03.1i.jpg" % x)
61 55
 		positionx = positionx + largeur
62
-		print "px"+str(positionx)
56
+		#print "px"+str(positionx)
63 57
 	positiony = positiony + hauteur
64
-	print "py"+str(positiony)
58
+	#print "py"+str(positiony)
65 59
 	#scriptpy = str(sys.argv[1])
66 60
 	#script = scriptpy[:-3]
67 61
 
68 62
 im2.save(script+"/"+str(x)+".2.png",'PNG', quality=100)
69 63
 
70
-
71
-
72
-
73
-
74
-
75
-
76
-
77
-
78
-
79
-
80
-
81
-
82
-
83
-
84
-
85 64
 '''
86 65
 1145  ffmpeg -i noir...png.mp4 noir...png.enscribe.norm.wav -c:a copy -c:v copy noir..HQ..mp4
87 66
  1146  ffmpeg -i noir...png.mp4 -i noir...png.enscribe.norm.wav -c:a copy -c:v copy noir..HQ..mp4
@@ -123,14 +102,12 @@ im2.save(script+"/"+str(x)+".2.png",'PNG', quality=100)
123 102
  1975  ffmpeg -i drone.mp4 
124 103
  2006  history | grep ffmpeg
125 104
  2009  history | grep ffmpeg
126
-
127 105
 '''
128
-=======
129 106
 
107
+'''
130 108
 index = 1
131 109
 allongement = 300      #4818
132 110
 
133
-
134 111
 im1 = Image.open("./drone/img001.jpg")
135 112
 im2 = Image.new("RGBA",(im1.size[0]*allongement, im1.size[1]))
136 113
 
@@ -149,5 +126,4 @@ for x in range(0,allongement/10):
149 126
 	scriptpy = str(sys.argv[1])
150 127
 	script = scriptpy[:-3]
151 128
 	im2.save(script+"_"+str(x)+".png",'PNG', quality=100)
152
-
153
->>>>>>> adc56b0f751a338bfe5c843061889df049d4390b
129
+'''

Loading…
Cancel
Save