Add scale fit display mode

niqdev / ipcam-view

MJPEG video streaming on Android

https://goo.gl/a2HM8C

MIT License

405 stars 159 forks source link

Add scale fit display mode #174

Closed zaptoopa closed 2 years ago

zaptoopa commented 2 years ago

PR added to issue #163 to scale inputStream in landscape mode; especially for 4:3 cameras

niqdev commented 2 years ago

@zaptoopa that's great! Can you please review the conflicts? Thanks!

zaptoopa commented 2 years ago

Hi @niqdev , done! :)

zaptoopa commented 2 years ago

FYI:

the "Merge github action" commit includes some earlier commits like "More Kotlin (#170)".
@hannesa2 added these Kotlin files. In my case, with Android Studio, there is no coexistence of DisplayMode and AbstractMjpegView for .{class/kt) files, so I get the following error:

Zip file '/home/user/dev/ipcam-view/mjpeg-view/build/intermediates/runtime_library_classes_jar/debug/classes.jar' already contains entry 'com/github/niqdev/mjpeg/AbstractMjpegView.class', cannot overwrite

If only Kotlin files or only the Java class files are existing, everything works fine. Am I right, or am I missing something?

hannesa2 commented 2 years ago

It looks fine on my side

hannesa2 commented 2 years ago

I rebased this pull request and made a new one (I can't push to zaptoopa:feature/displaymode-scale) and I see 3 ! green builds

compared to 2 yellow ones here

Maybe @zaptoopa should rebase too ?

niqdev commented 2 years ago

@zaptoopa thanks for your contribution! I think it got messed up with @hannesa2 refactor, so I'll merge #176 in favour of this. I'll release shortly a new version

niqdev commented 2 years ago

version 2.3.1 should be available shortly

zaptoopa commented 2 years ago

Sounds great