Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed camera stream too big and colorimetry setting #137

Open
wants to merge 338 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
338 commits
Select commit Hold shift + click to select a range
aa0f638
prova arbiter
Gioee Apr 18, 2023
de4b55f
a
Gioee Apr 18, 2023
eaa912a
aa
Gioee Apr 18, 2023
124f259
a
Gioee Apr 18, 2023
823e997
a
Gioee Apr 18, 2023
6ee7364
a
Gioee Apr 18, 2023
7e8d54c
a
Gioee Apr 18, 2023
d466372
a
Gioee Apr 18, 2023
e37244b
a
Gioee Apr 18, 2023
2a2229b
a
Gioee Apr 18, 2023
b259229
a
Gioee Apr 20, 2023
84a8f8f
a
Gioee Apr 20, 2023
bb9c68c
a
Gioee Apr 20, 2023
6430e1a
a
Gioee Apr 20, 2023
9b3f161
Update README.md
Gioee Apr 22, 2023
1363d5c
prova
Gioee Apr 23, 2023
6dce6c8
Merge branch 'develop' of https://github.com/Gioee/astraDash into dev…
Gioee Apr 23, 2023
3271d2c
prova
Gioee Apr 23, 2023
1b2e2d6
pubb
Gioee Apr 23, 2023
b62c777
a
Gioee Apr 23, 2023
0248ecd
a
Gioee Apr 23, 2023
a9cd14b
a
Gioee Apr 23, 2023
37447a2
a
Gioee Apr 23, 2023
63ceab4
a
Gioee Apr 23, 2023
5aaabd5
a
Gioee Apr 23, 2023
8ef3143
a
Gioee Apr 23, 2023
93fab19
a
Gioee Apr 23, 2023
0f37fb8
a
Gioee Apr 23, 2023
5dc25e3
a
Gioee Apr 23, 2023
668eb6d
a
Gioee Apr 23, 2023
45e6ce5
a
Gioee Apr 23, 2023
7bc6ae8
a
Gioee Apr 23, 2023
3741182
Update README.md
Gioee Apr 23, 2023
d94f616
vedem
Gioee Apr 24, 2023
bbe4f13
Merge branch 'develop' of https://github.com/Gioee/astraDash into dev…
Gioee Apr 24, 2023
e4baf45
se va non ci credo
Gioee Apr 24, 2023
dd26a66
prova
Gioee Apr 24, 2023
7fa4a81
prova con this
Gioee Apr 24, 2023
039be9b
provaa
Gioee Apr 24, 2023
02d5267
a
Gioee Apr 24, 2023
7a6d2b8
a
Gioee Apr 24, 2023
53bad9c
a
Gioee Apr 24, 2023
aeadc83
a
Gioee Apr 24, 2023
c2b333e
prova
Gioee Apr 24, 2023
3c93081
dashize
Gioee Apr 24, 2023
0ec3c99
a
Gioee Apr 24, 2023
98e36ba
a
Gioee Apr 24, 2023
fed0fc1
a
Gioee Apr 24, 2023
5735709
a
Gioee Apr 24, 2023
bdb7b7f
a
Gioee Apr 24, 2023
146d460
a
Gioee Apr 24, 2023
b6d6364
a
Gioee Apr 24, 2023
9450665
a
Gioee Apr 24, 2023
6a58e71
a
Gioee Apr 24, 2023
f9e6163
a
Gioee Apr 24, 2023
1752896
a
Gioee Apr 24, 2023
4695fa5
a
Gioee Apr 24, 2023
d95fb4d
a
Gioee Apr 25, 2023
7e43da8
a
Gioee Apr 25, 2023
e6d003e
a
Gioee Apr 25, 2023
be48af0
a
Gioee Apr 25, 2023
28e09be
a
Gioee Apr 25, 2023
0067707
a
Gioee Apr 25, 2023
59e64ee
prova
Gioee Apr 26, 2023
f9ae48b
prova
Gioee Apr 26, 2023
04492c2
prova
Gioee Apr 26, 2023
ad0771e
prova
Gioee Apr 26, 2023
dad6c6e
prova
Gioee Apr 26, 2023
52760b1
a
Gioee Apr 26, 2023
7d162e3
prova
Gioee Apr 26, 2023
9a4da46
a
Gioee Apr 26, 2023
bdf5c0b
a
Gioee Apr 26, 2023
8b02088
prova
Gioee Apr 26, 2023
cc52221
a
Gioee Apr 26, 2023
6295514
prova
Gioee Apr 26, 2023
922fc3c
prova
Gioee Apr 26, 2023
1de19e2
prova
Gioee Apr 26, 2023
a0acb73
a
Gioee Apr 26, 2023
e6cbf35
a
Gioee Apr 26, 2023
a998de7
a
Gioee Apr 26, 2023
3a6564d
a
Gioee Apr 26, 2023
2de59ec
a
Gioee Apr 26, 2023
12029c0
a
Gioee Apr 26, 2023
6b5f01f
a
Gioee Apr 26, 2023
197b3e6
a
Gioee Apr 26, 2023
cae3af1
a
Gioee Apr 26, 2023
49fe159
prova
Gioee Apr 26, 2023
8994c8d
a
Gioee Apr 26, 2023
334a3fe
a
Gioee Apr 26, 2023
8043677
a
Gioee Apr 26, 2023
f70e91d
a
Gioee Apr 26, 2023
ef59eb1
a
Gioee Apr 26, 2023
5636376
latest prod
Gioee Apr 26, 2023
d84fef8
prova
Gioee Apr 27, 2023
98e2880
prova
Gioee Apr 27, 2023
3f38ba7
return
Gioee Apr 27, 2023
eb0fbf6
dovrebbe anda
Gioee Apr 27, 2023
6d77268
a
Gioee Apr 27, 2023
59954aa
prova
Gioee Apr 27, 2023
eaea29e
latest prod
Gioee Apr 27, 2023
b656b5c
fix premuto & aaPage
Gioee Apr 27, 2023
d92b03f
prova
Gioee Apr 27, 2023
94466c3
prova
Gioee Apr 27, 2023
3f1dca5
prova
Gioee Apr 27, 2023
87f0e6b
vediamo se va
Gioee Apr 27, 2023
a865d9f
prova
Gioee Apr 27, 2023
34f1509
prova
Gioee Apr 27, 2023
8e091a1
latest prod
Gioee Apr 27, 2023
07d3ec6
ok<->aa page; next/prev track, ok ggle play/pause
Gioee Apr 28, 2023
b34a282
prova
Gioee Apr 28, 2023
99db572
prod temp antigelo
Gioee Apr 28, 2023
f250cb2
prova
Gioee May 7, 2023
4cb90ca
prod autonomia
Gioee May 7, 2023
fba1019
prova
Gioee May 8, 2023
e969693
come prima
Gioee May 8, 2023
f276251
prova
Gioee May 12, 2023
6629427
prova
Gioee May 12, 2023
4cf1af0
prova
Gioee May 12, 2023
25a16cd
prova
Gioee May 12, 2023
19b5ac5
prova
Gioee May 12, 2023
06a0a81
prova
Gioee May 12, 2023
f0588d0
prova
Gioee May 12, 2023
9c9d7d5
prova
Gioee May 12, 2023
cc9e7e1
prova
Gioee May 12, 2023
6239303
prova
Gioee May 12, 2023
06dd259
prova
Gioee May 13, 2023
bc6ca61
prova
Gioee May 13, 2023
5b8e69f
prova
Gioee May 13, 2023
b966644
update vehicle data from int to double
Gioee May 13, 2023
66ca3d8
update vehicle data from int to double
Gioee May 13, 2023
b4e75a0
prova
Gioee May 13, 2023
3165cab
fix double int err
Gioee May 13, 2023
0832299
fix double int err
Gioee May 13, 2023
56c0d4d
prod
Gioee May 13, 2023
464e7b0
prova
Gioee May 13, 2023
894a652
prova
Gioee May 13, 2023
6f83306
prova
Gioee May 13, 2023
1302815
errore
Gioee May 13, 2023
132e192
prova provissima provona
Gioee May 13, 2023
4c352dd
semiprod
Gioee May 13, 2023
c6755b1
semiprod w/ filter can
Gioee May 13, 2023
6d4038e
Update README.md
Gioee May 13, 2023
e463028
prova bottoni premuto fix lag
Gioee May 13, 2023
b95e703
Merge branch 'develop' of https://github.com/Gioee/astraDash into dev…
Gioee May 13, 2023
5c44099
prova
Gioee May 13, 2023
7f2a93a
prova
Gioee May 13, 2023
4ce8dd3
prova
Gioee May 13, 2023
540bddf
prova
Gioee May 13, 2023
9019828
prova
Gioee May 13, 2023
851a0f9
prova
Gioee May 13, 2023
4721ce2
prova
Gioee May 13, 2023
09d4355
prova
Gioee May 13, 2023
e4a5da6
prova
Gioee May 13, 2023
3562da6
prova
Gioee May 13, 2023
f42cd9a
aggiunto filtro antigelo mscan
Gioee May 13, 2023
bc33782
prova
Gioee May 20, 2023
ea052c0
Merge branch 'develop' of https://github.com/Gioee/astraDash into dev…
Gioee May 20, 2023
294f8d2
prova
Gioee May 20, 2023
7562513
prova
Gioee May 20, 2023
44e4938
prova
Gioee May 20, 2023
9fd6668
prova
Gioee May 20, 2023
77925c6
prova
Gioee May 20, 2023
52ebe62
prova
Gioee May 20, 2023
271c2fb
prova
Gioee May 20, 2023
645ff26
prova
Gioee May 20, 2023
d71905f
prova
Gioee May 20, 2023
e35a7e0
fix teoric
Gioee May 21, 2023
bf0c3fa
prova
Gioee May 21, 2023
b114481
test
Gioee May 21, 2023
b615fce
prova
Gioee May 21, 2023
d962068
prova
Gioee May 22, 2023
ab1ee6c
a
Gioee May 22, 2023
3f67cd6
prova
Gioee May 22, 2023
fa04776
miracolo se va
Gioee May 22, 2023
7d68a54
prova
Gioee May 22, 2023
1778fc0
prova
Gioee May 22, 2023
70a979d
prova
Gioee May 22, 2023
72c29d4
a
Gioee May 22, 2023
144c84a
a
Gioee May 22, 2023
4dad6fc
ok
Gioee May 22, 2023
c80e993
aa
Gioee May 22, 2023
fde9bb1
prova
Gioee May 22, 2023
da70545
proca
Gioee May 22, 2023
b84b7d8
prova
Gioee May 22, 2023
388448e
prova
Gioee May 22, 2023
e6efb1c
prova
Gioee May 22, 2023
75d5231
prova
Gioee May 22, 2023
68db0cb
prova
Gioee Jul 22, 2023
b02ca03
Merge remote-tracking branch 'upstream/develop' into develop
Gioee Jul 23, 2023
6fa010e
last working state 23 may
Gioee Jul 26, 2023
ae0373c
Delete fullscreen_toggler.hpp
Gioee Jul 27, 2023
59b77fe
Delete fullscreen_toggler.cpp
Gioee Jul 27, 2023
fe79628
commit 14 mar install.sh
Gioee Jul 27, 2023
e75c6dc
latest working commit
Gioee Jul 27, 2023
d6aad8f
volume action key fix
Gioee Jul 27, 2023
6226bf3
prova
Gioee Jul 27, 2023
b879c20
prova 2
Gioee Jul 27, 2023
c83c1f0
prova 3
Gioee Jul 27, 2023
737c274
prova 4
Gioee Jul 27, 2023
17cf22e
prova 4
Gioee Jul 27, 2023
cc1833d
prova 5
Gioee Jul 27, 2023
920f28d
prova 3
Gioee Jul 27, 2023
16ab60b
prova 3
Gioee Jul 27, 2023
cda80d0
prova 3
Gioee Jul 27, 2023
8a29825
prova 3
Gioee Jul 27, 2023
db2d08a
prova 3
Gioee Jul 27, 2023
c2a7ecc
prova 3
Gioee Jul 28, 2023
7630e1f
prova 3
Gioee Jul 28, 2023
cffc6d6
prova 3
Gioee Jul 28, 2023
2506b75
prova 3
Gioee Jul 28, 2023
89bf091
prova 3
Gioee Jul 28, 2023
cddecb4
prova 3 funz +lstab
Gioee Jul 28, 2023
3bf44ce
prova 4
Gioee Jul 28, 2023
3c34949
prova 4
Gioee Jul 28, 2023
feeb4e4
prova 4
Gioee Jul 28, 2023
af1aaf3
prova 4
Gioee Jul 28, 2023
ba62ebf
prova
Gioee Jul 28, 2023
b55212a
prova
Gioee Jul 28, 2023
be106f3
last working
Gioee Jul 28, 2023
ae4270e
ADDED LS GAUGES
Gioee Jul 29, 2023
1b25ae6
prova coolant
Gioee Jul 29, 2023
24ffc58
LS manca solo iniezione
Gioee Jul 30, 2023
a84154a
consumo istantaneo secondo
Gioee Jul 30, 2023
64750dc
aggiunto consumo orario e istantaneo
Gioee Jul 31, 2023
c4ed795
tolto exttemp da lscan e fix dimensione can2
Gioee Jul 31, 2023
873da63
manca da finire AC, consumi ogni 100km
Gioee Jul 31, 2023
953b36a
fix left_temp string to int
Gioee Jul 31, 2023
8590b1c
fix ; and t from leftt
Gioee Jul 31, 2023
0f2f81a
aggiunti filtri lscan, uniti filtri su id 0145 can
Gioee Jul 31, 2023
42d66ee
fix benz calc, fix fan number
Gioee Jul 31, 2023
117ff58
show ac on/off, test consumption, test actab
Gioee Aug 1, 2023
0eab281
test switch aq
Gioee Aug 1, 2023
2e14ad6
prova fix ac
Gioee Aug 1, 2023
4120532
prova actab
Gioee Aug 1, 2023
97bcba8
aggiunta switch ac
Gioee Aug 1, 2023
6ef7b9d
prova ac e roba rimasta indietro
Gioee Aug 4, 2023
ce5a7ea
fix writeframe
Gioee Aug 4, 2023
d60c3fa
msleep to usleep
Gioee Aug 4, 2023
0ed54f6
tolto tempbenz di prova
Gioee Aug 4, 2023
db6a216
added qtcpsocket flush
Gioee Aug 4, 2023
dae5f13
added \r\n to writesocket
Gioee Aug 4, 2023
e5b8396
Update test.cpp
Gioee Aug 4, 2023
a3aa0a0
clima dovrebbe essere appost
Gioee Aug 4, 2023
adf04d6
Update test.cpp
Gioee Aug 4, 2023
a452aea
Update test.cpp
Gioee Aug 4, 2023
5f74b38
tolto spam ac
Gioee Aug 5, 2023
537401c
fix comandi
Gioee Aug 5, 2023
8494709
prova
Gioee Aug 5, 2023
a6e5928
Update README.md
Gioee Sep 15, 2023
45177f8
Update README.md
Gioee Sep 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions plugins/brightness/x/x.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@ X::X()

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you'll want to remove your personal changes here

bool X::supported()
{
if (this->screen != nullptr) {
// Check that we can execute xrandr
QProcess process(this);
process.start(QString("xrandr --version"));
process.waitForFinished();
return process.exitCode() == 0;
}
return false;
return true;
}

uint8_t X::priority()
Expand All @@ -30,7 +23,7 @@ void X::set(int brightness)
{
if (this->screen != nullptr) {
QProcess process(this);
process.start(QString("xrandr --output %1 --brightness %2").arg(this->screen->name()).arg(brightness / 255.0));
process.start(QString("/home/gioele/RPi-USB-Brightness/64/lite/Raspi_USB_Backlight_nogui -b %1").arg((int)(brightness / 25.5)));
process.waitForFinished();
}
}
17 changes: 14 additions & 3 deletions src/app/pages/camera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -582,10 +582,12 @@ void CameraPage::connect_local_stream()
qDebug() << "camera status: " << this->local_cam->status();

QSize res = this->choose_video_resolution();

qDebug() << "RES=" << res;

DASH_LOG(info) << "[CameraPage] Creating GStreamer pipeline with " << this->config->get_cam_local_device().toStdString();
std::string pipeline = "v4l2src device=" + this->config->get_cam_local_device().toStdString() +
" ! capsfilter caps=\"video/x-raw,width=" + std::to_string(res.width()) + ",height=" + std::to_string(res.height()) + ";image/jpeg,width=" + std::to_string(res.width()) + ",height=" + std::to_string(res.height()) + "\"" +
" ! capsfilter caps=\"video/x-raw,width=" + std::to_string(res.width()) + ",height=" + std::to_string(res.height()) + ",colorimetry=bt601;image/jpeg,width=" + std::to_string(res.width()) + ",height=" + std::to_string(res.height()) + "\"" +
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does that break the pipeline for other cameras? we'll want to add something similar to this->config->get_cam_local_device() (and maybe default it to an empty string?) if that's the case

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Idk if it breaks or if it works. For my camera it works. Someone gotta test this out. But I think it would be perfect to put it in the config like you said.

" ! decodebin";
init_gstreamer_pipeline(pipeline);
//emit the connected signal before we resize anything, so that videoContainer has had time to resize to the proper dimensions
Expand Down Expand Up @@ -646,7 +648,8 @@ QSize CameraPage::choose_video_resolution()
QSize window_size = this->size();
QCameraImageCapture imageCapture(this->local_cam);
int min_gap = 10000, xgap, ygap;
QSize max_fit;
QSize max_fit, min_fit;
bool first = true;
qDebug() << "camera: " << this->local_cam;

qDebug() << "resolutions: " << imageCapture.supportedResolutions();
Expand All @@ -657,13 +660,21 @@ QSize CameraPage::choose_video_resolution()
min_gap = xgap + ygap;
max_fit = resolution;
}
else{
if(first){
first=false;
min_fit=resolution;
}
}
}
if (max_fit.isValid()) {
qDebug() << "Local cam auto resolution" << max_fit << "to fit in" << window_size;
this->local_cam_settings.setResolution(max_fit);
}
else {
qDebug() << "No suitable resolutions found to fit in" << window_size;
qDebug() << "No suitable resolutions found to fit in" << window_size << ". I'll try with the lowest one " << min_fit;
this->local_cam_settings.setResolution(min_fit);
max_fit=min_fit;
}

if (this->config->get_cam_local_format_override() > 0) {
Expand Down