-
Notifications
You must be signed in to change notification settings - Fork 49
/
raspberrypi-userland-1.20191121-64-bit-mmal.patch
1558 lines (1470 loc) · 62.5 KB
/
raspberrypi-userland-1.20191121-64-bit-mmal.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe67fc87..d8ba238f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,13 +8,9 @@ SET(PROJECT_VER_PATCH 0)
SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
SET(PROJECT_APIVER "${PROJECT_VER}")
-if(ARM64)
- set(BUILD_MMAL FALSE)
- set(BUILD_MMAL_APPS FALSE)
-else()
- set(BUILD_MMAL TRUE)
- set(BUILD_MMAL_APPS TRUE)
-endif()
+set(BUILD_MMAL TRUE)
+set(BUILD_MMAL_APPS TRUE)
+
set(vmcs_root ${PROJECT_SOURCE_DIR})
get_filename_component(VIDEOCORE_ROOT . ABSOLUTE)
@@ -78,9 +74,11 @@ if(BUILD_MMAL)
endif()
# VidTex supports Android and Linux
-if(BUILD_MMAL_APPS)
-add_subdirectory(host_applications/android/apps/vidtex)
-endif(BUILD_MMAL_APPS)
+if(NOT ARM64)
+ if(BUILD_MMAL_APPS)
+ add_subdirectory(host_applications/android/apps/vidtex)
+ endif(BUILD_MMAL_APPS)
+endif()
if(NOT ARM64)
add_subdirectory(middleware/openmaxil)
diff --git a/host_applications/linux/CMakeLists.txt b/host_applications/linux/CMakeLists.txt
index 928b6375..4bb1e98f 100644
--- a/host_applications/linux/CMakeLists.txt
+++ b/host_applications/linux/CMakeLists.txt
@@ -4,9 +4,9 @@ add_subdirectory(libs/bcm_host)
add_subdirectory(apps/gencmd)
add_subdirectory(apps/tvservice)
add_subdirectory(apps/vcmailbox)
+add_subdirectory(apps/raspicam)
+add_subdirectory(libs/sm)
if(NOT ARM64)
- add_subdirectory(apps/raspicam)
- add_subdirectory(libs/sm)
add_subdirectory(apps/smem)
endif()
add_subdirectory(libs/debug_sym)
diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt
index f7db21e1..656a9a06 100644
--- a/host_applications/linux/apps/raspicam/CMakeLists.txt
+++ b/host_applications/linux/apps/raspicam/CMakeLists.txt
@@ -29,15 +29,6 @@ execute_process(
)
add_definitions("-DGIT_TAINTED=${GIT_TAINTED}")
-set (GL_SCENE_SOURCES
- gl_scenes/models.c
- gl_scenes/mirror.c
- gl_scenes/yuv.c
- gl_scenes/sobel.c
- gl_scenes/square.c
- gl_scenes/teapot.c
- gl_scenes/vcsm_square.c)
-
set (COMMON_SOURCES
RaspiCamControl.c
RaspiCLI.c
@@ -47,14 +38,28 @@ set (COMMON_SOURCES
RaspiGPS.c
libgps_loader.c)
-add_executable(raspistill ${COMMON_SOURCES} RaspiStill.c RaspiTex.c RaspiTexUtil.c tga.c ${GL_SCENE_SOURCES} )
+if(NOT ARM64)
+ set (EGL_LIBS brcmGLESv2 brcmEGL)
+ set (EGL_SOURCES RaspiTex.c RaspiTexUtil.c tga.c)
+ set (GL_SCENE_SOURCES
+ gl_scenes/models.c
+ gl_scenes/mirror.c
+ gl_scenes/yuv.c
+ gl_scenes/sobel.c
+ gl_scenes/square.c
+ gl_scenes/teapot.c
+ gl_scenes/vcsm_square.c)
+else()
+ set (EGL_SOURCES RaspiTexStub.c)
+endif()
+
+add_executable(raspistill ${COMMON_SOURCES} RaspiStill.c ${EGL_SOURCES} ${GL_SCENE_SOURCES} )
add_executable(raspiyuv ${COMMON_SOURCES} RaspiStillYUV.c)
add_executable(raspivid ${COMMON_SOURCES} RaspiVid.c)
add_executable(raspividyuv ${COMMON_SOURCES} RaspiVidYUV.c)
set (MMAL_LIBS mmal_core mmal_util mmal_vc_client)
-
-target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host brcmGLESv2 brcmEGL m dl)
+target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host ${EGL_LIBS} m dl)
target_link_libraries(raspiyuv ${MMAL_LIBS} vcos bcm_host)
target_link_libraries(raspivid ${MMAL_LIBS} vcos bcm_host)
target_link_libraries(raspividyuv ${MMAL_LIBS} vcos bcm_host)
diff --git a/host_applications/linux/apps/raspicam/RaspiTexStub.c b/host_applications/linux/apps/raspicam/RaspiTexStub.c
new file mode 100644
index 00000000..60820a79
--- /dev/null
+++ b/host_applications/linux/apps/raspicam/RaspiTexStub.c
@@ -0,0 +1,240 @@
+/*
+Copyright (c) 2013, Broadcom Europe Ltd
+Copyright (c) 2013, Tim Gover
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the copyright holder nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "RaspiTex.h"
+#include "RaspiCLI.h"
+#include "interface/vcos/vcos.h"
+#include "interface/mmal/mmal_buffer.h"
+#include "interface/mmal/util/mmal_util.h"
+#include "interface/mmal/util/mmal_util_params.h"
+
+/**
+ * \file RaspiTex.c
+ *
+ * A simple framework for extending a MMAL application to render buffers via
+ * OpenGL.
+ *
+ * MMAL buffers are often in YUV colour space and in either a planar or
+ * tile format which is not supported directly by V3D. Instead of copying
+ * the buffer from the GPU and doing a colour space / pixel format conversion
+ * the GL_OES_EGL_image_external is used. This allows an EGL image to be
+ * created from GPU buffer handle (MMAL opaque buffer handle). The EGL image
+ * may then be used to create a texture (glEGLImageTargetTexture2DOES) and
+ * drawn by either OpenGL ES 1.0 or 2.0 contexts.
+ *
+ * Notes:
+ * 1) GL_OES_EGL_image_external textures always return pixels in RGBA format.
+ * This is also the case when used from a fragment shader.
+ *
+ * 2) The driver implementation creates a new RGB_565 buffer and does the color
+ * space conversion from YUV. This happens in GPU memory using the vector
+ * processor.
+ *
+ * 3) Each EGL external image in use will consume GPU memory for the RGB 565
+ * buffer. In addition, the GL pipeline might require more than one EGL image
+ * to be retained in GPU memory until the drawing commands are flushed.
+ *
+ * Typically 128 MB of GPU memory is sufficient for 720p viewfinder and 720p
+ * GL surface. If both the viewfinder and the GL surface are 1080p then
+ * 256MB of GPU memory is recommended, otherwise, for non-trivial scenes
+ * the system can run out of GPU memory whilst the camera is running.
+ *
+ * 4) It is important to make sure that the MMAL opaque buffer is not returned
+ * to MMAL before the GL driver has completed the asynchronous call to
+ * glEGLImageTargetTexture2DOES. Deferring destruction of the EGL image and
+ * the buffer return to MMAL until after eglSwapBuffers is the recommended.
+ *
+ * See also: http://www.khronos.org/registry/gles/extensions/OES/OES_EGL_image_external.txt
+ */
+
+#define DEFAULT_WIDTH 640
+#define DEFAULT_HEIGHT 480
+
+enum
+{
+ CommandGLScene,
+ CommandGLWin
+};
+
+static COMMAND_LIST cmdline_commands[] =
+{
+ { CommandGLScene, "-glscene", "gs", "GL scene square,teapot,mirror,yuv,sobel,vcsm_square", 1 },
+ { CommandGLWin, "-glwin", "gw", "GL window settings <'x,y,w,h'>", 1 },
+};
+
+static int cmdline_commands_size = sizeof(cmdline_commands) / sizeof(cmdline_commands[0]);
+
+/**
+ * Parse a possible command pair - command and parameter
+ * @param arg1 Command
+ * @param arg2 Parameter (could be NULL)
+ * @return How many parameters were used, 0,1,2
+ */
+int raspitex_parse_cmdline(RASPITEX_STATE *state,
+ const char *arg1, const char *arg2)
+{
+ int command_id, used = 0, num_parameters;
+
+ if (!arg1)
+ return 0;
+
+ command_id = raspicli_get_command_id(cmdline_commands,
+ cmdline_commands_size, arg1, &num_parameters);
+
+ // If invalid command, or we are missing a parameter, drop out
+ if (command_id==-1 || (command_id != -1 && num_parameters > 0 && arg2 == NULL))
+ return 0;
+
+ switch (command_id)
+ {
+ case CommandGLWin: // Allows a GL window to be different to preview-res
+ {
+ int tmp;
+ tmp = sscanf(arg2, "%d,%d,%d,%d",
+ &state->x, &state->y, &state->width, &state->height);
+ if (tmp != 4)
+ {
+ // Default to safe size on parse error
+ state->x = state->y = 0;
+ state->width = DEFAULT_WIDTH;
+ state->height = DEFAULT_HEIGHT;
+ }
+ else
+ {
+ state->gl_win_defined = 1;
+ }
+
+ used = 2;
+ break;
+ }
+
+ case CommandGLScene: // Selects the GL scene
+ {
+ if (strcmp(arg2, "square") == 0)
+ state->scene_id = RASPITEX_SCENE_SQUARE;
+ else if (strcmp(arg2, "teapot") == 0)
+ state->scene_id = RASPITEX_SCENE_TEAPOT;
+ else if (strcmp(arg2, "mirror") == 0)
+ state->scene_id = RASPITEX_SCENE_MIRROR;
+ else if (strcmp(arg2, "yuv") == 0)
+ state->scene_id = RASPITEX_SCENE_YUV;
+ else if (strcmp(arg2, "sobel") == 0)
+ state->scene_id = RASPITEX_SCENE_SOBEL;
+ else if (strcmp(arg2, "vcsm_square") == 0)
+ state->scene_id = RASPITEX_SCENE_VCSM_SQUARE;
+ else
+ fprintf(stderr, "Unknown scene %s", arg2);
+
+ used = 2;
+ break;
+ }
+ }
+ return used;
+}
+
+/**
+ * Display help for command line options
+ */
+void raspitex_display_help()
+{
+ fprintf(stdout, "\nGL parameter commands\n\n");
+ raspicli_display_help(cmdline_commands, cmdline_commands_size);
+}
+
+
+/* Registers a callback on the camera preview port to receive
+ * notifications of new frames.
+ * This must be called before rapitex_start and may not be called again
+ * without calling raspitex_destroy first.
+ *
+ * @param state Pointer to the GL preview state.
+ * @param port Pointer to the camera preview port
+ * @return Zero if successful.
+ */
+int raspitex_configure_preview_port(RASPITEX_STATE *state,
+ MMAL_PORT_T *preview_port)
+{
+ return -1;
+}
+
+/* Initialises GL preview state and creates the dispmanx native window.
+ * @param state Pointer to the GL preview state.
+ * @return Zero if successful.
+ */
+int raspitex_init(RASPITEX_STATE *state)
+{
+ return -1;
+}
+
+/* Destroys the pools of buffers used by the GL renderer.
+ * @param state Pointer to the GL preview state.
+ */
+void raspitex_destroy(RASPITEX_STATE *state)
+{
+}
+
+/* Initialise the GL / window state to sensible defaults.
+ * Also initialise any rendering parameters e.g. the scene
+ *
+ * @param state Pointer to the GL preview state.
+ * @return Zero if successful.
+ */
+void raspitex_set_defaults(RASPITEX_STATE *state)
+{
+}
+
+/* Stops the rendering loop and destroys MMAL resources
+ * @param state Pointer to the GL preview state.
+ */
+void raspitex_stop(RASPITEX_STATE *state)
+{
+}
+
+/**
+ * Starts the worker / GL renderer thread.
+ * @pre raspitex_init was successful
+ * @pre raspitex_configure_preview_port was successful
+ * @param state Pointer to the GL preview state.
+ * @return Zero on success, otherwise, -1 is returned
+ * */
+int raspitex_start(RASPITEX_STATE *state)
+{
+ return -1;
+}
+
+/**
+ * Writes the next GL frame-buffer to a RAW .ppm formatted file
+ * using the specified file-handle.
+ * @param state Pointer to the GL preview state.
+ * @param outpt_file Output file handle for the ppm image.
+ * @return Zero on success.
+ */
+int raspitex_capture(RASPITEX_STATE *state, FILE *output_file)
+{
+ return -1;
+}
diff --git a/host_applications/linux/libs/sm/user-vcsm.c b/host_applications/linux/libs/sm/user-vcsm.c
index daff99cb..6adf0bd5 100644
--- a/host_applications/linux/libs/sm/user-vcsm.c
+++ b/host_applications/linux/libs/sm/user-vcsm.c
@@ -906,7 +906,7 @@ unsigned int vcsm_vc_hdl_from_ptr( void *usr_ptr )
memset( &map, 0, sizeof(map) );
map.pid = getpid();
- map.addr = (unsigned int) usr_ptr;
+ map.addr = (uintptr_t) usr_ptr;
rc = ioctl( vcsm_handle,
VMCS_SM_IOCTL_MAP_VC_HDL_FR_ADDR,
@@ -1163,7 +1163,7 @@ void *vcsm_usr_address( unsigned int handle )
map.handle,
map.addr );
- return (void*)map.addr;
+ return (void*)(uintptr_t)map.addr;
}
}
}
@@ -1211,7 +1211,7 @@ unsigned int vcsm_usr_handle( void *usr_ptr )
memset( &map, 0, sizeof(map) );
map.pid = getpid();
- map.addr = (unsigned int) usr_ptr;
+ map.addr = (uintptr_t) usr_ptr;
rc = ioctl( vcsm_handle,
VMCS_SM_IOCTL_MAP_USR_HDL,
@@ -1360,14 +1360,14 @@ void *vcsm_lock( unsigned int handle )
goto out;
}
- usr_ptr = (void *) lock_unlock.addr;
+ usr_ptr = (void *) (uintptr_t)lock_unlock.addr;
/* If applicable, invalidate the cache now.
*/
if ( usr_ptr && sz.size )
{
cache.handle = sz.handle;
- cache.addr = (unsigned int) usr_ptr;
+ cache.addr = (uintptr_t) usr_ptr;
cache.size = sz.size;
rc = ioctl( vcsm_handle,
@@ -1527,7 +1527,7 @@ void *vcsm_lock_cache( unsigned int handle,
*/
if ( chk.addr && chk.size )
{
- munmap( (void *)chk.addr, chk.size );
+ munmap( (void *)(uintptr_t)chk.addr, chk.size );
vcos_log_trace( "[%s]: [%d]: ioctl unmap hdl: %x",
__func__,
@@ -1608,7 +1608,7 @@ void *vcsm_lock_cache( unsigned int handle,
if ( usr_ptr && cache.size )
{
cache.handle = chk.handle;
- cache.addr = (unsigned int) usr_ptr;
+ cache.addr = (uintptr_t) usr_ptr;
rc = ioctl( vcsm_handle,
VMCS_SM_IOCTL_MEM_INVALID,
@@ -1728,7 +1728,7 @@ int vcsm_unlock_ptr_sp( void *usr_ptr, int cache_no_flush )
/* Retrieve the handle of the memory we want to unlock.
*/
map.pid = getpid();
- map.addr = (unsigned int) usr_ptr;
+ map.addr = (uintptr_t) usr_ptr;
rc = ioctl( vcsm_handle,
VMCS_SM_IOCTL_MAP_USR_HDL,
diff --git a/host_applications/vmcs/test_apps/mmalcam/mmalcam.c b/host_applications/vmcs/test_apps/mmalcam/mmalcam.c
index 294349e6..0b13668f 100644
--- a/host_applications/vmcs/test_apps/mmalcam/mmalcam.c
+++ b/host_applications/vmcs/test_apps/mmalcam/mmalcam.c
@@ -136,7 +136,7 @@ static void *test_mmal_camcorder(void *id)
value = test_mmal_start_camcorder(&stop, behaviour);
LOG_TRACE("Thread terminating, result %d", value);
- return (void *)value;
+ return (void *)(uintptr_t)value;
}
/*****************************************************************************/
diff --git a/interface/mmal/CMakeLists.txt b/interface/mmal/CMakeLists.txt
index 46f149df..8208f7c9 100644
--- a/interface/mmal/CMakeLists.txt
+++ b/interface/mmal/CMakeLists.txt
@@ -11,8 +11,10 @@ add_subdirectory(core)
add_subdirectory(util)
add_subdirectory(vc)
add_subdirectory(components)
-add_subdirectory(openmaxil)
-add_subdirectory(client)
+if(NOT ARM64)
+ add_subdirectory(openmaxil)
+ add_subdirectory(client)
+endif()
target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components)
diff --git a/interface/mmal/components/spdif.c b/interface/mmal/components/spdif.c
index d5747eee..d9cdc349 100644
--- a/interface/mmal/components/spdif.c
+++ b/interface/mmal/components/spdif.c
@@ -189,7 +189,7 @@ static MMAL_BOOL_T spdif_do_processing(MMAL_COMPONENT_T *component)
goto end;
}
- LOG_DEBUG("frame: %lld, size %i", in->pts, in->length);
+ LOG_DEBUG("frame: %" PRId64 ", size %i", in->pts, in->length);
mmal_buffer_header_mem_lock(out);
mmal_buffer_header_mem_lock(in);
in_data = in->data + in->offset;
diff --git a/interface/mmal/core/mmal_port_clock.c b/interface/mmal/core/mmal_port_clock.c
index 1eb7d105..0fd81f78 100644
--- a/interface/mmal/core/mmal_port_clock.c
+++ b/interface/mmal/core/mmal_port_clock.c
@@ -102,7 +102,7 @@ static MMAL_STATUS_T mmal_port_clock_process_buffer(MMAL_PORT_T *port, MMAL_BUFF
if (buffer->length != sizeof(MMAL_CLOCK_EVENT_T))
{
- LOG_ERROR("invalid buffer length %d expected %d",
+ LOG_ERROR("invalid buffer length %d expected %zu",
buffer->length, sizeof(MMAL_CLOCK_EVENT_T));
return MMAL_EINVAL;
}
diff --git a/interface/mmal/vc/mmal_vc_api.c b/interface/mmal/vc/mmal_vc_api.c
index d7625181..7462727a 100644
--- a/interface/mmal/vc/mmal_vc_api.c
+++ b/interface/mmal/vc/mmal_vc_api.c
@@ -85,8 +85,10 @@ typedef struct MMAL_COMPONENT_MODULE_T
MMAL_BOOL_T event_ctx_initialised;
MMAL_VC_CLIENT_BUFFER_CONTEXT_T event_ctx; /**< Used as the ctx for event buffers */
+ uint32_t event_ctx_handle; /**< Used as the ctx for event buffers */
} MMAL_COMPONENT_MODULE_T;
+
/*****************************************************************************
* Local function prototypes
*****************************************************************************/
@@ -148,7 +150,8 @@ static MMAL_STATUS_T mmal_vc_port_requirements_set(MMAL_PORT_T *port)
msg.component_handle = module->component_handle;
msg.action = MMAL_WORKER_PORT_ACTION_SET_REQUIREMENTS;
msg.port_handle = module->port_handle;
- msg.param.enable.port = *port;
+ msg.param.enable.port.buffer_num = port->buffer_num;
+ msg.param.enable.port.buffer_size = port->buffer_size;
status = mmal_vc_sendwait_message(mmal_vc_get_client(), &msg.header, sizeof(msg),
MMAL_WORKER_PORT_ACTION, &reply, &replylen, MMAL_FALSE);
@@ -224,7 +227,7 @@ static MMAL_STATUS_T mmal_vc_port_enable(MMAL_PORT_T *port, MMAL_PORT_BH_CB_T cb
for (i = 0; i < pool->headers_num; i++)
{
drv = mmal_buffer_header_driver_data(pool->header[i]);
- drv->client_context = &port->component->priv->module->event_ctx;
+ drv->client_context = port->component->priv->module->event_ctx_handle;
drv->magic = MMAL_MAGIC;
}
@@ -255,7 +258,8 @@ static MMAL_STATUS_T mmal_vc_port_enable(MMAL_PORT_T *port, MMAL_PORT_BH_CB_T cb
msg.component_handle = module->component_handle;
msg.action = MMAL_WORKER_PORT_ACTION_ENABLE;
msg.port_handle = module->port_handle;
- msg.param.enable.port = *port;
+ msg.param.enable.port.buffer_num = port->buffer_num;
+ msg.param.enable.port.buffer_size = port->buffer_size;
status = mmal_vc_sendwait_message(mmal_vc_get_client(), &msg.header, sizeof(msg),
MMAL_WORKER_PORT_ACTION, &reply, &replylen, MMAL_FALSE);
@@ -368,7 +372,7 @@ static MMAL_STATUS_T mmal_vc_port_flush_sync(MMAL_PORT_T *port)
client_context.magic = MMAL_MAGIC;
client_context.port = port;
- msg->drvbuf.client_context = &client_context;
+ msg->drvbuf.client_context = mmal_vc_allocate_client_context(&client_context);
msg->drvbuf.component_handle = module->component_handle;
msg->drvbuf.port_handle = module->port_handle;
msg->drvbuf.magic = MMAL_MAGIC;
@@ -384,6 +388,7 @@ static MMAL_STATUS_T mmal_vc_port_flush_sync(MMAL_PORT_T *port)
if (status != MMAL_SUCCESS)
LOG_ERROR("failed to disable port - reason %d", status);
+ mmal_vc_release_client_context(&client_context);
return status;
}
@@ -502,7 +507,7 @@ static void mmal_vc_do_callback(MMAL_COMPONENT_T *component)
/* Events generated by this component are handled differently */
if (mmal_buffer_header_driver_data(buffer)->client_context ==
- &component->priv->module->event_ctx)
+ component->priv->module->event_ctx_handle)
{
mmal_port_event_send(port, buffer);
return;
@@ -528,14 +533,16 @@ static void mmal_vc_port_send_callback(mmal_worker_buffer_from_host *msg)
{
MMAL_BUFFER_HEADER_T *buffer;
MMAL_PORT_T *port;
- MMAL_VC_CLIENT_BUFFER_CONTEXT_T *client_context = msg->drvbuf.client_context;
+ MMAL_VC_CLIENT_BUFFER_CONTEXT_T *client_context = mmal_vc_lookup_client_context(msg->drvbuf.client_context);
vcos_assert(client_context);
vcos_assert(client_context->magic == MMAL_MAGIC);
buffer = client_context->buffer;
port = client_context->port;
- vcos_blockpool_free(msg->drvbuf.client_context);
+
+ vcos_blockpool_free(client_context);
+ mmal_vc_release_client_context(client_context);
vcos_assert(port->priv->module->magic == MMAL_MAGIC);
mmal_vc_msg_to_buffer_header(buffer, msg);
@@ -614,7 +621,7 @@ static MMAL_STATUS_T mmal_vc_port_send(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *
client_context->callback_event = NULL;
client_context->port = port;
- msg->drvbuf.client_context = client_context;
+ msg->drvbuf.client_context = mmal_vc_allocate_client_context(client_context);
msg->drvbuf.component_handle = module->component_handle;
msg->drvbuf.port_handle = module->port_handle;
msg->drvbuf.magic = MMAL_MAGIC;
@@ -641,12 +648,14 @@ static MMAL_STATUS_T mmal_vc_port_send(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *
if (!VCOS_BLOCKPOOL_IS_VALID_HANDLE_FORMAT(msg->drvbuf.component_handle, 256))
{
LOG_ERROR("bad component handle 0x%x", msg->drvbuf.component_handle);
+ mmal_vc_release_client_context(client_context);
return MMAL_EINVAL;
}
if (msg->drvbuf.port_handle > 255)
{
LOG_ERROR("bad port handle 0x%x", msg->drvbuf.port_handle);
+ mmal_vc_release_client_context(client_context);
return MMAL_EINVAL;
}
@@ -693,7 +702,8 @@ static MMAL_STATUS_T mmal_vc_port_send(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *
if (status != MMAL_SUCCESS)
{
LOG_INFO("failed %d", status);
- vcos_blockpool_free(msg->drvbuf.client_context);
+ vcos_blockpool_free(client_context);
+ mmal_vc_release_client_context(client_context);
buffer->data = mmal_vc_shm_lock(buffer->data, port->priv->module->zero_copy_workaround);
}
@@ -795,6 +805,7 @@ static MMAL_STATUS_T mmal_vc_component_destroy(MMAL_COMPONENT_T *component)
mmal_ports_free(component->clock, component->clock_num);
mmal_queue_destroy(component->priv->module->callback_queue);
+ mmal_vc_release_client_context(&component->priv->module->event_ctx);
vcos_free(component->priv->module);
component->priv->module = NULL;
@@ -802,8 +813,11 @@ static MMAL_STATUS_T mmal_vc_component_destroy(MMAL_COMPONENT_T *component)
fail:
// no longer require videocore
mmal_vc_release();
+ mmal_vc_release_client_component(component);
mmal_vc_shm_exit();
mmal_vc_deinit();
+ mmal_vc_dump_client_components();
+ mmal_vc_dump_client_contexts();
return status;
}
@@ -928,6 +942,29 @@ MMAL_STATUS_T mmal_vc_get_core_stats(MMAL_CORE_STATISTICS_T *stats,
return status;
}
+static void mmal_vc_copy_es_format_to_vc(MMAL_ES_FORMAT_T *src, MMAL_VC_ES_FORMAT_T *dest)
+{
+ // IPC MMAL_VC_ES_FORMAT_T is not necessarily the same as MMAL_ES_FORMAT_T,
+ // so copy fields individually.
+ dest->type = src->type;
+ dest->encoding = src->encoding;
+ dest->encoding_variant = src->encoding_variant;
+ dest->bitrate = src->bitrate;
+ dest->flags = src->flags;
+ dest->extradata_size = src->extradata_size;
+}
+
+static void mmal_vc_copy_es_format_from_vc(MMAL_VC_ES_FORMAT_T *src, MMAL_ES_FORMAT_T *dest)
+{
+ // IPC MMAL_VC_ES_FORMAT_T is not necessarily the same as MMAL_ES_FORMAT_T,
+ // so copy fields individually.
+ dest->type = src->type;
+ dest->encoding = src->encoding;
+ dest->encoding_variant = src->encoding_variant;
+ dest->bitrate = src->bitrate;
+ dest->flags = src->flags;
+ dest->extradata_size = src->extradata_size;
+}
/** Get port context data. */
static MMAL_STATUS_T mmal_vc_port_info_get(MMAL_PORT_T *port)
@@ -969,9 +1006,9 @@ static MMAL_STATUS_T mmal_vc_port_info_get(MMAL_PORT_T *port)
port->buffer_alignment_min = reply.port.buffer_alignment_min;
port->is_enabled = reply.port.is_enabled;
port->capabilities = reply.port.capabilities;
- reply.format.extradata = port->format->extradata;
- reply.format.es = port->format->es;
- *port->format = reply.format;
+
+ mmal_vc_copy_es_format_from_vc(&reply.format, port->format);
+
*port->format->es = reply.es;
if(port->format->extradata_size)
{
@@ -1001,15 +1038,22 @@ static MMAL_STATUS_T mmal_vc_port_info_set(MMAL_PORT_T *port)
msg.component_handle = module->component_handle;
msg.port_type = port->type;
msg.index = port->index;
- msg.port = *port;
- msg.format = *port->format;
+
+ //Only copy the values that are used into the MMAL_PORT_T of the IPC.
+ msg.port.buffer_num = port->buffer_num;
+ msg.port.buffer_size = port->buffer_size;
+ msg.port.is_enabled = port->is_enabled;
+
+ mmal_vc_copy_es_format_to_vc(port->format, &msg.format);
+
msg.es = *port->format->es;
+
if(msg.format.extradata_size > MMAL_FORMAT_EXTRADATA_MAX_SIZE)
{
vcos_assert(0);
msg.format.extradata_size = MMAL_FORMAT_EXTRADATA_MAX_SIZE;
}
- memcpy(msg.extradata, msg.format.extradata, msg.format.extradata_size);
+ memcpy(msg.extradata, port->format->extradata, msg.format.extradata_size);
LOG_TRACE("set port info (%i:%i)", port->type, port->index);
@@ -1037,9 +1081,9 @@ static MMAL_STATUS_T mmal_vc_port_info_set(MMAL_PORT_T *port)
port->buffer_alignment_min = reply.port.buffer_alignment_min;
port->is_enabled = reply.port.is_enabled;
port->capabilities = reply.port.capabilities;
- reply.format.extradata = port->format->extradata;
- reply.format.es = port->format->es;
- *port->format = reply.format;
+
+ mmal_vc_copy_es_format_from_vc(&reply.format, port->format);
+
*port->format->es = reply.es;
if(port->format->extradata_size)
{
@@ -1115,7 +1159,7 @@ static MMAL_STATUS_T mmal_vc_port_parameter_set(MMAL_PORT_T *port, const MMAL_PA
if(param->size > MMAL_WORKER_PORT_PARAMETER_SET_MAX)
{
- LOG_ERROR("parameter too large (%u > %u)", param->size, MMAL_WORKER_PORT_PARAMETER_SET_MAX);
+ LOG_ERROR("parameter too large (%u > %zu)", param->size, MMAL_WORKER_PORT_PARAMETER_SET_MAX);
return MMAL_ENOSPC;
}
@@ -1174,7 +1218,7 @@ static MMAL_STATUS_T mmal_vc_port_parameter_get(MMAL_PORT_T *port, MMAL_PARAMETE
if(param->size > MMAL_WORKER_PORT_PARAMETER_GET_MAX)
{
- LOG_ERROR("parameter too large (%u > %u) id %u", param->size,
+ LOG_ERROR("parameter too large (%u > %zu) id %u", param->size,
MMAL_WORKER_PORT_PARAMETER_GET_MAX, param->id);
return MMAL_ENOMEM;
}
@@ -1245,7 +1289,7 @@ static uint8_t *mmal_vc_port_payload_alloc(MMAL_PORT_T *port, uint32_t payload_s
{
MMAL_OPAQUE_IMAGE_HANDLE_T h = mmal_vc_opaque_alloc_desc(port->name);
can_deref = MMAL_FALSE;
- ret = (void*)h;
+ ret = (void*)(uintptr_t)h;
if (!ret)
{
LOG_ERROR("%s: failed to allocate %d bytes opaque memory",
@@ -1294,7 +1338,7 @@ static void mmal_vc_port_payload_free(MMAL_PORT_T *port, uint8_t *payload)
if (module->opaque_allocs)
{
module->opaque_allocs--;
- mmal_vc_opaque_release((MMAL_OPAQUE_IMAGE_HANDLE_T)payload);
+ mmal_vc_opaque_release((MMAL_OPAQUE_IMAGE_HANDLE_T)(uintptr_t)payload);
return;
}
@@ -1328,7 +1372,6 @@ static MMAL_STATUS_T mmal_vc_component_create(const char *name, MMAL_COMPONENT_T
return MMAL_EINVAL;
}
- msg.client_component = component;
/* coverity[secure_coding] Length tested above */
strcpy(msg.name, basename);
#ifdef __linux__
@@ -1351,6 +1394,8 @@ static MMAL_STATUS_T mmal_vc_component_create(const char *name, MMAL_COMPONENT_T
return status;
}
+ msg.client_component = mmal_vc_allocate_client_component(component);
+
// claim VC for entire duration of component.
status = mmal_vc_use();
@@ -1371,6 +1416,7 @@ static MMAL_STATUS_T mmal_vc_component_create(const char *name, MMAL_COMPONENT_T
LOG_ERROR("failed to create component '%s' (%i:%s)", name, status,
mmal_status_to_string(status));
mmal_vc_release();
+ mmal_vc_release_client_component(component);
mmal_vc_shm_exit();
mmal_vc_deinit();
return status;
@@ -1391,6 +1437,7 @@ static MMAL_STATUS_T mmal_vc_component_create(const char *name, MMAL_COMPONENT_T
MMAL_WORKER_COMPONENT_DESTROY, &reply, &replylen, MMAL_FALSE);
vcos_assert(destroy_status == MMAL_SUCCESS);
mmal_vc_release();
+ mmal_vc_release_client_component(component);
mmal_vc_shm_exit();
mmal_vc_deinit();
return status;
@@ -1496,6 +1543,7 @@ static MMAL_STATUS_T mmal_vc_component_create(const char *name, MMAL_COMPONENT_T
module->event_ctx_initialised = MMAL_FALSE;
module->event_ctx.magic = MMAL_MAGIC;
module->event_ctx.callback_event = mmal_vc_port_send_event_callback;
+ module->event_ctx_handle = mmal_vc_allocate_client_context(&module->event_ctx);
/* populate component structure */
component->priv->pf_enable = mmal_vc_component_enable;
diff --git a/interface/mmal/vc/mmal_vc_client.c b/interface/mmal/vc/mmal_vc_client.c
index 6339a93a..aa49eab9 100644
--- a/interface/mmal/vc/mmal_vc_client.c
+++ b/interface/mmal/vc/mmal_vc_client.c
@@ -53,6 +53,7 @@ static VCOS_LOG_CAT_T mmal_ipc_log_category;
*/
typedef struct MMAL_WAITER_T
{
+ int index;
VCOS_SEMAPHORE_T sem;
unsigned inuse;
void *dest; /**< Where to write reply */
@@ -82,6 +83,187 @@ struct MMAL_CLIENT_T
MMAL_BOOL_T inited;
};
+/*****************************************************************************
+ * Lookup table functions for client_component handles.
+ * Required as the IPC is strictly 32bit, therefore 64bit userland can not
+ * pass in the required pointers.
+ *****************************************************************************/
+#define MAX_COMPONENT_HANDLES 64
+
+typedef struct
+{
+ int index;
+ unsigned inuse;
+ MMAL_COMPONENT_T *component;
+} MMAL_CLIENT_COMPONENT_T;
+
+typedef struct
+{
+ MMAL_CLIENT_COMPONENT_T components[MAX_COMPONENT_HANDLES];
+ VCOS_MUTEX_T lock;
+} MMAL_CLIENT_COMPONENT_POOL_T;
+
+static MMAL_CLIENT_COMPONENT_POOL_T client_component_pool;
+
+uint32_t mmal_vc_allocate_client_component(MMAL_COMPONENT_T *component)
+{
+ int i;
+
+ vcos_mutex_lock(&client_component_pool.lock);
+ for (i=0; i<MAX_COMPONENT_HANDLES; i++)
+ {
+ if (client_component_pool.components[i].inuse == 0)
+ break;
+ }
+
+ if (vcos_verify(i != MAX_COMPONENT_HANDLES))
+ {
+ client_component_pool.components[i].index = i;
+ client_component_pool.components[i].component = component;
+ client_component_pool.components[i].inuse = 1;
+ }
+ vcos_mutex_unlock(&client_component_pool.lock);
+
+ return i;
+}
+
+static MMAL_COMPONENT_T *lookup_client_component(int index)
+{
+ if (vcos_verify(index < MAX_COMPONENT_HANDLES))
+ {
+ vcos_assert(client_component_pool.components[index].inuse);
+ return client_component_pool.components[index].component;
+ }
+
+ return NULL;
+}
+
+void mmal_vc_release_client_component(MMAL_COMPONENT_T *component)
+{
+ int i;
+
+ vcos_mutex_lock(&client_component_pool.lock);
+ for (i=0; i<MAX_COMPONENT_HANDLES; i++)
+ {
+ if (client_component_pool.components[i].component == component)
+ {
+ client_component_pool.components[i].component = NULL;
+ client_component_pool.components[i].inuse = 0;
+ }
+ }
+ vcos_mutex_unlock(&client_component_pool.lock);
+}
+
+void mmal_vc_dump_client_components(void)
+{
+ int i;
+ int count = 0;
+
+ vcos_mutex_lock(&client_component_pool.lock);
+ for (i=0; i<MAX_COMPONENT_HANDLES; i++)
+ {
+ if (client_component_pool.components[i].inuse)
+ {
+ LOG_ERROR("%s: Entry %d in use for context %p", __func__, i, client_component_pool.components[i].component);
+ count++;
+ }
+ }
+ vcos_mutex_unlock(&client_component_pool.lock);
+ LOG_ERROR("%s: %u entries in use", __func__, count);
+}
+
+#define MAX_CLIENT_CONTEXTS 128
+
+typedef struct
+{
+ int index;
+ unsigned inuse;
+ MMAL_VC_CLIENT_BUFFER_CONTEXT_T *ctx;
+} MMAL_CLIENT_CONTEXT_T;
+
+typedef struct
+{
+ MMAL_CLIENT_CONTEXT_T contexts[MAX_CLIENT_CONTEXTS];
+ VCOS_MUTEX_T lock;
+} MMAL_CLIENT_CONTEXT_POOL_T;
+
+static MMAL_CLIENT_CONTEXT_POOL_T client_context_pool;
+#define CLIENT_CONTEXT_MAGIC 0xFEDC0000
+#define CLIENT_CONTEXT_MAGIC_MASK(a) (a & 0xFFFF)
+#define CLIENT_CONTEXT_MAGIC_CHECK(a) (a & 0xFFFF0000)
+
+uint32_t mmal_vc_allocate_client_context(MMAL_VC_CLIENT_BUFFER_CONTEXT_T *context)
+{
+ int i;
+
+ vcos_mutex_lock(&client_context_pool.lock);
+ for (i=0; i<MAX_CLIENT_CONTEXTS; i++)
+ {
+ if (client_context_pool.contexts[i].inuse == 0)
+ break;
+ }
+
+ if (vcos_verify(i != MAX_CLIENT_CONTEXTS))
+ {
+ client_context_pool.contexts[i].index = i;
+ client_context_pool.contexts[i].ctx = context;
+ client_context_pool.contexts[i].inuse = 1;
+ }
+ vcos_mutex_unlock(&client_context_pool.lock);
+
+ return i | CLIENT_CONTEXT_MAGIC;
+}
+
+MMAL_VC_CLIENT_BUFFER_CONTEXT_T *mmal_vc_lookup_client_context(int index)
+{
+ if (vcos_verify((CLIENT_CONTEXT_MAGIC_CHECK(index) == CLIENT_CONTEXT_MAGIC) &&
+ (CLIENT_CONTEXT_MAGIC_MASK(index) < MAX_CLIENT_CONTEXTS)))
+ {
+ vcos_assert(client_context_pool.contexts[CLIENT_CONTEXT_MAGIC_MASK(index)].inuse);
+ return client_context_pool.contexts[CLIENT_CONTEXT_MAGIC_MASK(index)].ctx;
+ }
+
+ return NULL;
+}
+
+void mmal_vc_release_client_context(MMAL_VC_CLIENT_BUFFER_CONTEXT_T *context)
+{
+ int i;
+
+ vcos_mutex_lock(&client_context_pool.lock);
+ for (i=0; i<MAX_CLIENT_CONTEXTS; i++)
+ {
+ if (client_context_pool.contexts[i].ctx == context)
+ {
+ client_context_pool.contexts[i].ctx = NULL;
+ client_context_pool.contexts[i].inuse = 0;
+ break;
+ }
+ }
+ if (i >= MAX_CLIENT_CONTEXTS)
+ LOG_ERROR("Failed to release context %p - not found", context);
+
+ vcos_mutex_unlock(&client_context_pool.lock);
+}
+
+void mmal_vc_dump_client_contexts(void)
+{
+ int i;
+ int count = 0;
+
+ vcos_mutex_lock(&client_context_pool.lock);
+ for (i=0; i<MAX_CLIENT_CONTEXTS; i++)
+ {
+ if (client_context_pool.contexts[i].inuse)
+ {
+ LOG_ERROR("%s: Entry %d in use for context %p", __func__, i, client_context_pool.contexts[i].ctx);
+ count++;
+ }
+ }
+ vcos_mutex_unlock(&client_context_pool.lock);
+ LOG_ERROR("%s: %u entries in use", __func__, count);
+}
+
/* One client per process/VC connection. Multiple threads may
* be using a single client.
*/
@@ -90,6 +272,8 @@ static MMAL_CLIENT_T client;
static void init_once(void)
{
vcos_mutex_create(&client.lock, VCOS_FUNCTION);
+ vcos_mutex_create(&client_component_pool.lock, VCOS_FUNCTION);
+ vcos_mutex_create(&client_context_pool.lock, VCOS_FUNCTION);
}
/** Create a pool of wait-structures.
@@ -107,6 +291,7 @@ static MMAL_STATUS_T create_waitpool(MMAL_WAITPOOL_T *waitpool)
for (i=0; i<MAX_WAITERS; i++)
{
waitpool->waiters[i].inuse = 0;
+ waitpool->waiters[i].index = i;
status = vcos_semaphore_create(&waitpool->waiters[i].sem,
"mmal waiter", 0);
if (status != VCOS_SUCCESS)