Skip to content

Commit

Permalink
Merge pull request #3 from vermavinay982/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
vermavinay982 authored Aug 28, 2021
2 parents be3fad4 + 885a097 commit 16cb84b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ and based on the list - the precedence is decided for stacking the video togethe
from vigenpy.video import stack_video

videos = ['archery.mp4','cycling.mp4']
stack_video(videos, axis=0)
stack_video(videos, axis=0, write_path='mixed.mp4')
```

## Advanced Way to Use
```python
from vigenpy.video import stack_video

path1 = '../../../archery.mp4'
path2 = '../../../cars.mp4'

Expand Down
16 changes: 15 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name='vigenpy',
version='0.2.2',
version='0.2.4',
description=short_desc,
license='MIT',
long_description=long_desc,
Expand All @@ -29,5 +29,19 @@
'vigenpy',
'vigenpy/video',
],
keywords = ['vigenpy','video gen','video','generator','computer vision', 'image processing'], # Keywords that define your package best
install_requires=requirements,
classifiers=[
'Development Status :: 5 - Production/Stable', # Chose either "3 - Alpha", "4 - Beta" or "5 - Production/Stable" as the current state of your package
'Intended Audience :: Developers', # Define that your audience are developers
'Topic :: Software Development :: Build Tools',
'License :: OSI Approved :: MIT License', # Again, pick a license
'Programming Language :: Python :: 3', # Specify which python versions that you want to support
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],

)
10 changes: 6 additions & 4 deletions vigenpy/video/stack_video.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,19 @@ def stack_video(
wait_key = cv2.waitKey(1)

if ord('q')== wait_key or ord('Q')== wait_key:
cv2.destroyAllWindows()
break

if writer_fps is None:
writer_fps = fps

if write_path:
video_name = write_video(frame_list, write_path, output_shape, writer_fps=writer_fps)
print("Video written sucessfully at :",video_name)

return video_name
print("Video written sucessfully at :",video_name)
return video_name

if display:
cv2.destroyAllWindows()
return None

if __name__ == '__main__':

Expand Down

0 comments on commit 16cb84b

Please sign in to comment.