Skip to content

Commit

Permalink
SRT Data, Hide sensitive OSD info, small fixes (#11)
Browse files Browse the repository at this point in the history
* SRT file support (experimental)
* Fix progresss bar
* Implement hardware encoding for ffmpeg (experimental)
* Optionally hide sensitive OSD elements 
* Improved performance for PNG generation (up to 10times faster)
  • Loading branch information
kirek007 authored Jan 19, 2023
1 parent ccd9f2e commit 93810c8
Show file tree
Hide file tree
Showing 8 changed files with 440 additions and 139 deletions.
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"python.linting.flake8Enabled": true,
"python.linting.enabled": true
}
55 changes: 42 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,45 @@
![image](https://user-images.githubusercontent.com/1878027/210377476-0ca2a14e-71d7-40d8-add5-3d5d6f00a006.png)

# Tool for generating OSD for Walksnail DVR

# Ack
Software is provided as is and it is open sourced so contributions are welcome!
That's easy, drag and drop files into UI, click Generate.
Then import generated sequence into and video editing software and adjust framerate to 60fps if needed.

Feel free to create a ticket in case something is not working.
# How to run

# Release
### Windows
Nothing to do, Go to [Release page](https://github.com/kirek007/ws-osd-py/releases)

Go to [Release page](https://github.com/kirek007/ws-osd-py/releases)
### Linux / MacOS

# Requirements
Disclamer: I've tried my best to make it work on all systems, but it's only tested on Windows. So it might not work as expected
on other systems.

If you want to render osd into file directly in app you need ffmpeg to be installed in you system.
**Only works with Python 3.10 due to issues with wxPython and python-opencv libs**

For Windows: Nothing to do, incuded in release.
For Linux: `sudo apt install ffmpeg `
For MacOs `brew install ffmpeg`
Install ffmpeg:

# Tool for generating OSD for Walksnail DVR
For Linux:
```bash
sudo apt install ffmpeg
```

That's easy, drag and drop files into UI, click Generate.
Then import generated sequence into and video editing software and adjust framerate to 60fps if needed.
For MacOs:
```bash
brew install ffmpeg
```

Then clone respotiory and run app

```bash
git clone https://github.com/kirek007/ws-osd-py.git
cd ws-osd-py
make run
```

# Usage tutorial

https://www.youtube.com/watch?v=we3F4rIXTqU

# Fonts
You can get fancy fonts from [Sneaky_FPV](https://sites.google.com/view/sneaky-fpv/home?pli=1), or get [default walksnails fonts](https://drive.google.com/file/d/1c3CRgXYQaM3Tt4ukLSIvoogScQZs9w49/view)
Expand All @@ -32,3 +50,14 @@ Here are some results:
https://www.youtube.com/watch?v=fHHXh9k-SGg

https://www.youtube.com/watch?v=2u7wiJBIdCg

# Ack
Software is provided as is and it is open sourced so contributions are welcome!

Feel free to create a ticket in case something is not working.


## Coffee needed
If you like tool, you can buy me a coffee so keep working more overnights :)

<a href="https://www.buymeacoffee.com/kirek" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 108 !important;" ></a>
Binary file added font.ttf
Binary file not shown.
3 changes: 2 additions & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ release: venv
$(VENV)/pyinstaller --onefile .\osd_gui.py -n ws_osd_gen

.PHONY: run
run: venv
run: venv show-venv
$(VENV)/python -c 'import sys; valid=(sys.version_info > (3,9) and sys.version_info < (3,11)); sys.exit(0) if valid else sys.exit(1)' || (echo "Python 3.10 is required"; exit 1)
$(VENV)/python osd_gui.py

Loading

0 comments on commit 93810c8

Please sign in to comment.