Add vision_source_v4l2_enumerate_devices 72/278772/4
authorKwanghoon Son <k.son@samsung.com>
Tue, 26 Jul 2022 04:40:53 +0000 (00:40 -0400)
committerKwanghoon Son <k.son@samsung.com>
Tue, 26 Jul 2022 07:03:23 +0000 (03:03 -0400)
[Version] : 0.0.2
[Issue type] New function

Add v4l2 backend enumerate function

Change-Id: Ie2755684e6db584abc5e00f0279e6580c70caf44
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
.clang-format [new file with mode: 0644]
packaging/vision-source-v4l2.spec
src/vision_source_v4l2.c
src/vision_source_v4l2_private.h
test/test_vision_source_v4l2.cpp

diff --git a/.clang-format b/.clang-format
new file mode 100644 (file)
index 0000000..f50fddb
--- /dev/null
@@ -0,0 +1,445 @@
+---
+# Tizen SE C++ Coding Rule
+
+Language:        Cpp
+
+#########################################
+# Turn off build breakable
+FixNamespaceComments: false
+ReflowComments:  false
+SortIncludes:    false # can break build; turning off
+SortUsingDeclarations: false # can break build; turning off
+
+
+# Enterprise guide
+# M08
+UseTab:          Always
+TabWidth:        4
+IndentWidth: 4
+
+# M09
+IndentCaseLabels: false
+
+# R02
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+
+# M10
+SpaceBeforeParens: ControlStatements
+
+
+BreakBeforeBraces: Custom
+BraceWrapping:
+  # M14
+  AfterFunction:   true
+
+  # M15
+  AfterControlStatement: false
+  BeforeCatch:     false
+  BeforeElse:      false
+
+  # M16
+  AfterEnum:       true
+  AfterStruct:     true
+  AfterUnion:      true
+
+  # by inquiry
+  AfterClass:      true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterExternBlock: true
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+
+# from pptx
+ColumnLimit:     80
+
+# M11
+SpaceAfterCStyleCast: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeRangeBasedForLoopColon: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+
+# M12
+SpaceInEmptyParentheses: false
+
+# by inquiry
+SpaceAfterTemplateKeyword: false
+SpaceBeforeCpp11BracedList: true
+
+################################################################################
+## Other from Linux Kernel Style From https://github.com/torvalds/linux/blob/master/.clang-format
+Standard: Cpp03
+AccessModifierOffset: -4
+AlignEscapedNewlines: Left
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: None
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: BeforeComma
+BreakStringLiterals: false
+ConstructorInitializerIndentWidth: 8
+ContinuationIndentWidth: 8
+Cpp11BracedListStyle: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+NamespaceIndentation: Inner
+PenaltyBreakAssignment: 10
+PenaltyBreakBeforeFirstCallParameter: 30
+PenaltyBreakComment: 10
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakString: 10
+PenaltyExcessCharacter: 100
+SpacesInAngles:  false
+SpacesInContainerLiterals: false
+
+ForEachMacros:
+  - 'apei_estatus_for_each_section'
+  - 'ata_for_each_dev'
+  - 'ata_for_each_link'
+  - '__ata_qc_for_each'
+  - 'ata_qc_for_each'
+  - 'ata_qc_for_each_raw'
+  - 'ata_qc_for_each_with_internal'
+  - 'ax25_for_each'
+  - 'ax25_uid_for_each'
+  - 'bio_for_each_integrity_vec'
+  - '__bio_for_each_segment'
+  - 'bio_for_each_segment'
+  - 'bio_for_each_segment_all'
+  - 'bio_list_for_each'
+  - 'bip_for_each_vec'
+  - 'blkg_for_each_descendant_post'
+  - 'blkg_for_each_descendant_pre'
+  - 'blk_queue_for_each_rl'
+  - 'bond_for_each_slave'
+  - 'bond_for_each_slave_rcu'
+  - 'bpf_for_each_spilled_reg'
+  - 'btree_for_each_safe128'
+  - 'btree_for_each_safe32'
+  - 'btree_for_each_safe64'
+  - 'btree_for_each_safel'
+  - 'card_for_each_dev'
+  - 'cgroup_taskset_for_each'
+  - 'cgroup_taskset_for_each_leader'
+  - 'cpufreq_for_each_entry'
+  - 'cpufreq_for_each_entry_idx'
+  - 'cpufreq_for_each_valid_entry'
+  - 'cpufreq_for_each_valid_entry_idx'
+  - 'css_for_each_child'
+  - 'css_for_each_descendant_post'
+  - 'css_for_each_descendant_pre'
+  - 'device_for_each_child_node'
+  - 'drm_atomic_crtc_for_each_plane'
+  - 'drm_atomic_crtc_state_for_each_plane'
+  - 'drm_atomic_crtc_state_for_each_plane_state'
+  - 'drm_atomic_for_each_plane_damage'
+  - 'drm_connector_for_each_possible_encoder'
+  - 'drm_for_each_connector_iter'
+  - 'drm_for_each_crtc'
+  - 'drm_for_each_encoder'
+  - 'drm_for_each_encoder_mask'
+  - 'drm_for_each_fb'
+  - 'drm_for_each_legacy_plane'
+  - 'drm_for_each_plane'
+  - 'drm_for_each_plane_mask'
+  - 'drm_mm_for_each_hole'
+  - 'drm_mm_for_each_node'
+  - 'drm_mm_for_each_node_in_range'
+  - 'drm_mm_for_each_node_safe'
+  - 'for_each_active_drhd_unit'
+  - 'for_each_active_iommu'
+  - 'for_each_available_child_of_node'
+  - 'for_each_bio'
+  - 'for_each_board_func_rsrc'
+  - 'for_each_bvec'
+  - 'for_each_card_components'
+  - 'for_each_card_links'
+  - 'for_each_card_links_safe'
+  - 'for_each_card_prelinks'
+  - 'for_each_card_rtds'
+  - 'for_each_card_rtds_safe'
+  - 'for_each_cgroup_storage_type'
+  - 'for_each_child_of_node'
+  - 'for_each_clear_bit'
+  - 'for_each_clear_bit_from'
+  - 'for_each_cmsghdr'
+  - 'for_each_compatible_node'
+  - 'for_each_component_dais'
+  - 'for_each_component_dais_safe'
+  - 'for_each_comp_order'
+  - 'for_each_console'
+  - 'for_each_cpu'
+  - 'for_each_cpu_and'
+  - 'for_each_cpu_not'
+  - 'for_each_cpu_wrap'
+  - 'for_each_dev_addr'
+  - 'for_each_dma_cap_mask'
+  - 'for_each_dpcm_be'
+  - 'for_each_dpcm_be_rollback'
+  - 'for_each_dpcm_be_safe'
+  - 'for_each_dpcm_fe'
+  - 'for_each_drhd_unit'
+  - 'for_each_dss_dev'
+  - 'for_each_efi_memory_desc'
+  - 'for_each_efi_memory_desc_in_map'
+  - 'for_each_endpoint_of_node'
+  - 'for_each_evictable_lru'
+  - 'for_each_fib6_node_rt_rcu'
+  - 'for_each_fib6_walker_rt'
+  - 'for_each_free_mem_range'
+  - 'for_each_free_mem_range_reverse'
+  - 'for_each_func_rsrc'
+  - 'for_each_hstate'
+  - 'for_each_if'
+  - 'for_each_iommu'
+  - 'for_each_ip_tunnel_rcu'
+  - 'for_each_irq_nr'
+  - 'for_each_link_codecs'
+  - 'for_each_lru'
+  - 'for_each_matching_node'
+  - 'for_each_matching_node_and_match'
+  - 'for_each_memblock'
+  - 'for_each_memblock_type'
+  - 'for_each_memcg_cache_index'
+  - 'for_each_mem_pfn_range'
+  - 'for_each_mem_range'
+  - 'for_each_mem_range_rev'
+  - 'for_each_migratetype_order'
+  - 'for_each_msi_entry'
+  - 'for_each_msi_entry_safe'
+  - 'for_each_net'
+  - 'for_each_netdev'
+  - 'for_each_netdev_continue'
+  - 'for_each_netdev_continue_rcu'
+  - 'for_each_netdev_feature'
+  - 'for_each_netdev_in_bond_rcu'
+  - 'for_each_netdev_rcu'
+  - 'for_each_netdev_reverse'
+  - 'for_each_netdev_safe'
+  - 'for_each_net_rcu'
+  - 'for_each_new_connector_in_state'
+  - 'for_each_new_crtc_in_state'
+  - 'for_each_new_plane_in_state'
+  - 'for_each_new_private_obj_in_state'
+  - 'for_each_node'
+  - 'for_each_node_by_name'
+  - 'for_each_node_by_type'
+  - 'for_each_node_mask'
+  - 'for_each_node_state'
+  - 'for_each_node_with_cpus'
+  - 'for_each_node_with_property'
+  - 'for_each_of_allnodes'
+  - 'for_each_of_allnodes_from'
+  - 'for_each_of_cpu_node'
+  - 'for_each_of_pci_range'
+  - 'for_each_old_connector_in_state'
+  - 'for_each_old_crtc_in_state'
+  - 'for_each_oldnew_connector_in_state'
+  - 'for_each_oldnew_crtc_in_state'
+  - 'for_each_oldnew_plane_in_state'
+  - 'for_each_oldnew_plane_in_state_reverse'
+  - 'for_each_oldnew_private_obj_in_state'
+  - 'for_each_old_plane_in_state'
+  - 'for_each_old_private_obj_in_state'
+  - 'for_each_online_cpu'
+  - 'for_each_online_node'
+  - 'for_each_online_pgdat'
+  - 'for_each_pci_bridge'
+  - 'for_each_pci_dev'
+  - 'for_each_pci_msi_entry'
+  - 'for_each_populated_zone'
+  - 'for_each_possible_cpu'
+  - 'for_each_present_cpu'
+  - 'for_each_prime_number'
+  - 'for_each_prime_number_from'
+  - 'for_each_process'
+  - 'for_each_process_thread'
+  - 'for_each_property_of_node'
+  - 'for_each_registered_fb'
+  - 'for_each_reserved_mem_region'
+  - 'for_each_rtd_codec_dai'
+  - 'for_each_rtd_codec_dai_rollback'
+  - 'for_each_rtdcom'
+  - 'for_each_rtdcom_safe'
+  - 'for_each_set_bit'
+  - 'for_each_set_bit_from'
+  - 'for_each_sg'
+  - 'for_each_sg_page'
+  - 'for_each_sibling_event'
+  - '__for_each_thread'
+  - 'for_each_thread'
+  - 'for_each_zone'
+  - 'for_each_zone_zonelist'
+  - 'for_each_zone_zonelist_nodemask'
+  - 'fwnode_for_each_available_child_node'
+  - 'fwnode_for_each_child_node'
+  - 'fwnode_graph_for_each_endpoint'
+  - 'gadget_for_each_ep'
+  - 'hash_for_each'
+  - 'hash_for_each_possible'
+  - 'hash_for_each_possible_rcu'
+  - 'hash_for_each_possible_rcu_notrace'
+  - 'hash_for_each_possible_safe'
+  - 'hash_for_each_rcu'
+  - 'hash_for_each_safe'
+  - 'hctx_for_each_ctx'
+  - 'hlist_bl_for_each_entry'
+  - 'hlist_bl_for_each_entry_rcu'
+  - 'hlist_bl_for_each_entry_safe'
+  - 'hlist_for_each'
+  - 'hlist_for_each_entry'
+  - 'hlist_for_each_entry_continue'
+  - 'hlist_for_each_entry_continue_rcu'
+  - 'hlist_for_each_entry_continue_rcu_bh'
+  - 'hlist_for_each_entry_from'
+  - 'hlist_for_each_entry_from_rcu'
+  - 'hlist_for_each_entry_rcu'
+  - 'hlist_for_each_entry_rcu_bh'
+  - 'hlist_for_each_entry_rcu_notrace'
+  - 'hlist_for_each_entry_safe'
+  - '__hlist_for_each_rcu'
+  - 'hlist_for_each_safe'
+  - 'hlist_nulls_for_each_entry'
+  - 'hlist_nulls_for_each_entry_from'
+  - 'hlist_nulls_for_each_entry_rcu'
+  - 'hlist_nulls_for_each_entry_safe'
+  - 'i3c_bus_for_each_i2cdev'
+  - 'i3c_bus_for_each_i3cdev'
+  - 'ide_host_for_each_port'
+  - 'ide_port_for_each_dev'
+  - 'ide_port_for_each_present_dev'
+  - 'idr_for_each_entry'
+  - 'idr_for_each_entry_continue'
+  - 'idr_for_each_entry_ul'
+  - 'inet_bind_bucket_for_each'
+  - 'inet_lhash2_for_each_icsk_rcu'
+  - 'iov_for_each'
+  - 'key_for_each'
+  - 'key_for_each_safe'
+  - 'klp_for_each_func'
+  - 'klp_for_each_object'
+  - 'kvm_for_each_memslot'
+  - 'kvm_for_each_vcpu'
+  - 'list_for_each'
+  - 'list_for_each_codec'
+  - 'list_for_each_codec_safe'
+  - 'list_for_each_entry'
+  - 'list_for_each_entry_continue'
+  - 'list_for_each_entry_continue_rcu'
+  - 'list_for_each_entry_continue_reverse'
+  - 'list_for_each_entry_from'
+  - 'list_for_each_entry_from_rcu'
+  - 'list_for_each_entry_from_reverse'
+  - 'list_for_each_entry_lockless'
+  - 'list_for_each_entry_rcu'
+  - 'list_for_each_entry_reverse'
+  - 'list_for_each_entry_safe'
+  - 'list_for_each_entry_safe_continue'
+  - 'list_for_each_entry_safe_from'
+  - 'list_for_each_entry_safe_reverse'
+  - 'list_for_each_prev'
+  - 'list_for_each_prev_safe'
+  - 'list_for_each_safe'
+  - 'llist_for_each'
+  - 'llist_for_each_entry'
+  - 'llist_for_each_entry_safe'
+  - 'llist_for_each_safe'
+  - 'media_device_for_each_entity'
+  - 'media_device_for_each_intf'
+  - 'media_device_for_each_link'
+  - 'media_device_for_each_pad'
+  - 'nanddev_io_for_each_page'
+  - 'netdev_for_each_lower_dev'
+  - 'netdev_for_each_lower_private'
+  - 'netdev_for_each_lower_private_rcu'
+  - 'netdev_for_each_mc_addr'
+  - 'netdev_for_each_uc_addr'
+  - 'netdev_for_each_upper_dev_rcu'
+  - 'netdev_hw_addr_list_for_each'
+  - 'nft_rule_for_each_expr'
+  - 'nla_for_each_attr'
+  - 'nla_for_each_nested'
+  - 'nlmsg_for_each_attr'
+  - 'nlmsg_for_each_msg'
+  - 'nr_neigh_for_each'
+  - 'nr_neigh_for_each_safe'
+  - 'nr_node_for_each'
+  - 'nr_node_for_each_safe'
+  - 'of_for_each_phandle'
+  - 'of_property_for_each_string'
+  - 'of_property_for_each_u32'
+  - 'pci_bus_for_each_resource'
+  - 'ping_portaddr_for_each_entry'
+  - 'plist_for_each'
+  - 'plist_for_each_continue'
+  - 'plist_for_each_entry'
+  - 'plist_for_each_entry_continue'
+  - 'plist_for_each_entry_safe'
+  - 'plist_for_each_safe'
+  - 'pnp_for_each_card'
+  - 'pnp_for_each_dev'
+  - 'protocol_for_each_card'
+  - 'protocol_for_each_dev'
+  - 'queue_for_each_hw_ctx'
+  - 'radix_tree_for_each_slot'
+  - 'radix_tree_for_each_tagged'
+  - 'rbtree_postorder_for_each_entry_safe'
+  - 'resource_list_for_each_entry'
+  - 'resource_list_for_each_entry_safe'
+  - 'rhl_for_each_entry_rcu'
+  - 'rhl_for_each_rcu'
+  - 'rht_for_each'
+  - 'rht_for_each_continue'
+  - 'rht_for_each_entry'
+  - 'rht_for_each_entry_continue'
+  - 'rht_for_each_entry_rcu'
+  - 'rht_for_each_entry_rcu_continue'
+  - 'rht_for_each_entry_safe'
+  - 'rht_for_each_rcu'
+  - 'rht_for_each_rcu_continue'
+  - '__rq_for_each_bio'
+  - 'rq_for_each_segment'
+  - 'scsi_for_each_prot_sg'
+  - 'scsi_for_each_sg'
+  - 'sctp_for_each_hentry'
+  - 'sctp_skb_for_each'
+  - 'shdma_for_each_chan'
+  - '__shost_for_each_device'
+  - 'shost_for_each_device'
+  - 'sk_for_each'
+  - 'sk_for_each_bound'
+  - 'sk_for_each_entry_offset_rcu'
+  - 'sk_for_each_from'
+  - 'sk_for_each_rcu'
+  - 'sk_for_each_safe'
+  - 'sk_nulls_for_each'
+  - 'sk_nulls_for_each_from'
+  - 'sk_nulls_for_each_rcu'
+  - 'snd_array_for_each'
+  - 'snd_pcm_group_for_each_entry'
+  - 'snd_soc_dapm_widget_for_each_path'
+  - 'snd_soc_dapm_widget_for_each_path_safe'
+  - 'snd_soc_dapm_widget_for_each_sink_path'
+  - 'snd_soc_dapm_widget_for_each_source_path'
+  - 'tb_property_for_each'
+  - 'tcf_exts_for_each_action'
+  - 'udp_portaddr_for_each_entry'
+  - 'udp_portaddr_for_each_entry_rcu'
+  - 'usb_hub_for_each_child'
+  - 'v4l2_device_for_each_subdev'
+  - 'v4l2_m2m_for_each_dst_buf'
+  - 'v4l2_m2m_for_each_dst_buf_safe'
+  - 'v4l2_m2m_for_each_src_buf'
+  - 'v4l2_m2m_for_each_src_buf_safe'
+  - 'virtio_device_for_each_vq'
+  - 'xa_for_each'
+  - 'xas_for_each'
+  - 'xas_for_each_conflict'
+  - 'xas_for_each_marked'
+  - 'zorro_for_each_dev'
+...
index 64444b9..b34babd 100644 (file)
@@ -2,7 +2,7 @@
 
 Name:        vision-source-v4l2
 Summary:     vision source-v4l2
-Version:     0.0.1
+Version:     0.0.2
 Release:     0
 Group:       Multimedia/Framework
 License:     Apache-2.0
index c04aad1..f310b6d 100644 (file)
@@ -31,7 +31,6 @@
        fourcc & 0xff, (fourcc >> 8) & 0xff, (fourcc >> 16) & 0xff, \
                        (fourcc >> 24) & 0xff
 
-static vision_source_device_info_list_s *g_device_info_list;
 static guint32 g_device_caps;
 static GMutex g_device_info_lock;
 
@@ -235,7 +234,8 @@ __vision_source_get_device_info(int device_index, int device_fd,
        return VISION_SOURCE_ERROR_NONE;
 }
 
-static int __vision_source_get_device_info_list(void)
+static int __vision_source_get_device_info_list(
+               vision_source_device_info_list_s **h_device_info_list)
 {
        int i = 0;
        int ret = 0;
@@ -250,12 +250,6 @@ static int __vision_source_get_device_info_list(void)
 
        g_mutex_lock(&g_device_info_lock);
 
-       if (g_device_info_list) {
-               LOGD("device info list is already existed");
-               ret = VISION_SOURCE_ERROR_NONE;
-               goto _GET_DEVICE_INFO_LIST_DONE;
-       }
-
        device_info_list = g_new0(vision_source_device_info_list_s, 1);
        if (!device_info_list) {
                LOGE("failed to alloc device info structure");
@@ -342,9 +336,9 @@ static int __vision_source_get_device_info_list(void)
        }
 
        device_info_list->count = device_count;
-       g_device_info_list = device_info_list;
+       *h_device_info_list = device_info_list;
 
-       LOGD("new g_device_info_list %p - device count %d", g_device_info_list,
+       LOGD("new h_device_info_list %p - device count %d", *h_device_info_list,
                 device_count);
 
 _GET_DEVICE_INFO_LIST_DONE:
@@ -367,6 +361,8 @@ static void __vision_source_release_handle(vision_source_v4l2_s *handle)
        g_mutex_clear(&handle->lock);
        g_mutex_clear(&handle->buffer_lock);
        g_cond_clear(&handle->buffer_cond);
+       if (handle->device_info_list)
+               g_free(handle->device_info_list);
 
        LOGD("vision_source_v4l2_s %p destroy", handle);
 
@@ -395,21 +391,11 @@ int vision_source_v4l2_init(vision_source_h *handle)
        v4l2_handle->device_index = CAMERA_HAL_INITIAL_INDEX;
        v4l2_handle->device_fd = CAMERA_HAL_INITIAL_FD;
        v4l2_handle->buffer_thread = NULL;
-
-       int ret = __vision_source_get_device_info_list();
-       if (ret != VISION_SOURCE_ERROR_NONE) {
-               LOGE("get device info failed");
-               goto _INIT_ERROR;
-       }
+       v4l2_handle->device_info_list = NULL;
 
        *handle = v4l2_handle;
 
        return VISION_SOURCE_ERROR_NONE;
-
-_INIT_ERROR:
-       __vision_source_release_handle(v4l2_handle);
-
-       return ret;
 }
 
 int vision_source_v4l2_exit(vision_source_h handle)
@@ -426,8 +412,32 @@ int vision_source_v4l2_exit(vision_source_h handle)
        return VISION_SOURCE_ERROR_NONE;
 }
 
+int vision_source_v4l2_enumerate_devices(
+               vision_source_h handle, vision_source_device_info_list_s *info_list)
+{
+       VISION_SOURCE_NULL_ARG_CHECK(handle);
+       VISION_SOURCE_NULL_ARG_CHECK(info_list);
+
+       vision_source_v4l2_s *v4l2_handle = (vision_source_v4l2_s *) handle;
+       int ret;
+
+       if (!v4l2_handle->device_info_list)
+               ret = __vision_source_get_device_info_list(
+                               &v4l2_handle->device_info_list);
+
+       if (ret != VISION_SOURCE_ERROR_NONE) {
+               LOGE("get device info failed");
+               return ret;
+       }
+
+       memcpy(info_list, v4l2_handle->device_info_list,
+                  sizeof(vision_source_device_info_list_s));
+       return VISION_SOURCE_ERROR_NONE;
+}
+
 void attach_backend(vision_source_func_s *funcp)
 {
        funcp->init = vision_source_v4l2_init;
        funcp->exit = vision_source_v4l2_exit;
-}
+       funcp->enumerate_devices = vision_source_v4l2_enumerate_devices;
+}
\ No newline at end of file
index b9a6163..a940be6 100644 (file)
@@ -64,6 +64,7 @@ typedef struct _vision_source_v4l2_s
        /* device */
        gint32 device_index;
        gint32 device_fd;
+       vision_source_device_info_list_s *device_info_list;
 
        /* buffer */
        guint32 buffer_dequeued_count;
index 15a9584..8ea0f42 100644 (file)
@@ -16,7 +16,10 @@ protected:
        vision_source_h ms_handle;
 };
 
-TEST_F(VisionV4L2, Base)
+TEST_F(VisionV4L2, EnumerateDev)
 {
-       ASSERT_EQ(1, 1);
+       vision_source_device_info_list_s dev_list;
+       ASSERT_EQ(vision_source_enumerate_devices(ms_handle, &dev_list),
+                         VISION_SOURCE_ERROR_NONE);
+       EXPECT_GT(dev_list.count, 0);
 }
\ No newline at end of file