Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit94109fb

Browse files
committed
fixes issues with display driver framework and the sdl display driver
1 parentbb26e49 commit94109fb

File tree

5 files changed

+370
-151
lines changed

5 files changed

+370
-151
lines changed

‎api_drivers/common_api_drivers/display/sdl_display.py‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def __init__(
8181
offset_x=0,
8282
offset_y=0,
8383
color_byte_order=display_driver_framework.BYTE_ORDER_RGB,# NOQA
84-
color_space=lv.COLOR_FORMAT.RGB888,
84+
color_space=lv.COLOR_FORMAT.RGB888,# NOQA
8585
rgb565_byte_swap=False# NOQA
8686
):
8787
super().__init__(
@@ -124,26 +124,26 @@ def __init__(
124124
self._frame_buffer1=frame_buffer1
125125
self._frame_buffer2=frame_buffer2
126126

127-
self._disp_drv=lv.display_create(display_width,display_height)
127+
self._disp_drv=lv.display_create(display_width,display_height)# NOQA
128128

129129
self._disp_drv.set_color_format(color_space)
130130
self._disp_drv.set_driver_data(self)
131131

132132
mapping= {
133-
lv.COLOR_FORMAT.I1:_SDL_PIXELFORMAT_INDEX1MSB,
134-
lv.COLOR_FORMAT.I4:_SDL_PIXELFORMAT_INDEX4MSB,
135-
lv.COLOR_FORMAT.I8:_SDL_PIXELFORMAT_INDEX8,
136-
lv.COLOR_FORMAT.RGB565:_SDL_PIXELFORMAT_RGB565,
137-
lv.COLOR_FORMAT.RGB888:_SDL_PIXELFORMAT_RGB24,
138-
lv.COLOR_FORMAT.ARGB8888:_SDL_PIXELFORMAT_ARGB8888,
139-
lv.COLOR_FORMAT.XRGB8888:_SDL_PIXELFORMAT_RGB888,
140-
lv.COLOR_FORMAT.I420:_SDL_PIXELFORMAT_IYUV,
141-
lv.COLOR_FORMAT.NV21:_SDL_PIXELFORMAT_NV21,
142-
lv.COLOR_FORMAT.NV12:_SDL_PIXELFORMAT_NV12,
143-
lv.COLOR_FORMAT.YUY2:_SDL_PIXELFORMAT_YUY2,
144-
lv.COLOR_FORMAT.UYVY:_SDL_PIXELFORMAT_UYVY,
145-
lv.COLOR_FORMAT.RAW:_SDL_PIXELFORMAT_RGB24,
146-
lv.COLOR_FORMAT.RAW_ALPHA:_SDL_PIXELFORMAT_RGBA8888
133+
lv.COLOR_FORMAT.I1:_SDL_PIXELFORMAT_INDEX1MSB,# NOQA
134+
lv.COLOR_FORMAT.I4:_SDL_PIXELFORMAT_INDEX4MSB,# NOQA
135+
lv.COLOR_FORMAT.I8:_SDL_PIXELFORMAT_INDEX8,# NOQA
136+
lv.COLOR_FORMAT.RGB565:_SDL_PIXELFORMAT_RGB565,# NOQA
137+
lv.COLOR_FORMAT.RGB888:_SDL_PIXELFORMAT_RGB24,# NOQA
138+
lv.COLOR_FORMAT.ARGB8888:_SDL_PIXELFORMAT_ARGB8888,# NOQA
139+
lv.COLOR_FORMAT.XRGB8888:_SDL_PIXELFORMAT_RGB888,# NOQA
140+
lv.COLOR_FORMAT.I420:_SDL_PIXELFORMAT_IYUV,# NOQA
141+
lv.COLOR_FORMAT.NV21:_SDL_PIXELFORMAT_NV21,# NOQA
142+
lv.COLOR_FORMAT.NV12:_SDL_PIXELFORMAT_NV12,# NOQA
143+
lv.COLOR_FORMAT.YUY2:_SDL_PIXELFORMAT_YUY2,# NOQA
144+
lv.COLOR_FORMAT.UYVY:_SDL_PIXELFORMAT_UYVY,# NOQA
145+
lv.COLOR_FORMAT.RAW:_SDL_PIXELFORMAT_RGB24,# NOQA
146+
lv.COLOR_FORMAT.RAW_ALPHA:_SDL_PIXELFORMAT_RGBA8888# NOQA
147147
}
148148

149149
cf=self._cf=mapping.get(color_space,None)
@@ -167,7 +167,7 @@ def __init__(
167167
frame_buffer1,
168168
frame_buffer2,
169169
len(frame_buffer1),
170-
lv.DISPLAY_RENDER_MODE.DIRECT
170+
lv.DISPLAY_RENDER_MODE.DIRECT# NOQA
171171
)
172172

173173
self._ignore_size_chg=False
@@ -178,16 +178,18 @@ def __init__(
178178
data_bus.register_window_callback(self._windows_event_cb)
179179

180180
self._disp_drv.add_event_cb(
181-
self._res_chg_event_cb,lv.EVENT.RESOLUTION_CHANGED,None)
181+
self._res_chg_event_cb,lv.EVENT.RESOLUTION_CHANGED,None)# NOQA
182182
self._disp_drv.add_event_cb(
183-
self._release_disp_cb,lv.EVENT.DELETE,None)
183+
self._release_disp_cb,lv.EVENT.DELETE,None)# NOQA
184184

185185
global_active_event_poll
186186

187187
ifnot_active_event_poll:
188188
_active_event_poll=True
189-
self._timer=lv.timer_create(self._timer_cb,5,None)
190-
self._timer.set_repeat_count(-1)
189+
self._timer=lv.timer_create(self._timer_cb,5,None)# NOQA
190+
self._timer.set_repeat_count(-1)# NOQA
191+
192+
self._displays.append(self)
191193

192194
def_timer_cb(self,_):
193195
self._data_bus.poll_events()
@@ -203,14 +205,14 @@ def _res_chg_event_cb(self, _):
203205

204206
buf_size=int(hor_res*ver_res*bpp)
205207

206-
self._frame_buffer1=self._data_bus.realloc_buffer(buf_size,1)
207-
self._frame_buffer2=self._data_bus.realloc_buffer(buf_size,2)
208+
self._frame_buffer1=self._data_bus.realloc_buffer(buf_size,1)# NOQA
209+
self._frame_buffer2=self._data_bus.realloc_buffer(buf_size,2)# NOQA
208210

209211
self._disp_drv.set_buffers(
210212
self._frame_buffer1,
211213
self._frame_buffer2,
212214
len(self._frame_buffer1),
213-
lv.DISPLAY_RENDER_MODE.DIRECT
215+
lv.DISPLAY_RENDER_MODE.DIRECT# NOQA
214216
)
215217

216218
self._data_bus.set_window_size(
@@ -235,17 +237,17 @@ def _remove_timer(self):
235237
global_active_event_poll
236238

237239
try:
238-
self._timer.pause()
239-
self._timer.delete()
240+
self._timer.pause()# NOQA
241+
self._timer.delete()# NOQA
240242
delself._timer
241243
displays=self.get_displays()
242244

243245
iflen(displays)==1:
244246
_active_event_poll=False
245247
else:
246248
disp=displays[0]
247-
disp._timer=lv.timer_create(disp._timer_cb,5,None)
248-
disp._timer.set_repeat_count(-1)
249+
disp._timer=lv.timer_create(disp._timer_cb,5,None)# NOQA
250+
disp._timer.set_repeat_count(-1)# NOQA
249251
exceptAttributeError:
250252
pass
251253

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp