From patchwork Mon Dec 30 12:48:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Roth?= X-Patchwork-Id: 3419161 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B49AEC02DC for ; Mon, 30 Dec 2013 12:49:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF4B520109 for ; Mon, 30 Dec 2013 12:49:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58C18200F2 for ; Mon, 30 Dec 2013 12:49:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755735Ab3L3Mt1 (ORCPT ); Mon, 30 Dec 2013 07:49:27 -0500 Received: from mail-ee0-f45.google.com ([74.125.83.45]:62562 "EHLO mail-ee0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755685Ab3L3Mt0 (ORCPT ); Mon, 30 Dec 2013 07:49:26 -0500 Received: by mail-ee0-f45.google.com with SMTP id d49so5056394eek.4 for ; Mon, 30 Dec 2013 04:49:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=MODR4QXLVvGAqzo5MukYngMoXwCXqVHN62Nsq1d1rYo=; b=c6IRM+cWIs5SpZ/sc5+BH0vJcjYgjfyoM8A3XJlQt4RjL3mMvkQQaNM3VuWt/0OtHC SCYp6o42033pMczGhseJLMLmqaT9mHBgYBtSg0FG2xPWVgtDhWHVpWDnpa+IiWQEEP6j roIuX4+ccnAEU+qPjidZA7JLukm3U9V91Vg/IC5fIG0r6q6WABpmfghavsUzzyKCSXX1 JXkuc+ypU6SEGDQ1jqc5CmUuse+EM5RmzCey6G/H3H4yeQHPiHIZoekru+23quiWrzPZ 9bsr/c9CNYf7ybXK0azOfkGT7GmifKnAWsMHlzbAQsu0MNlsOdbgG8S4uunLQHt6c2Qv efYQ== X-Received: by 10.14.224.197 with SMTP id x45mr1451454eep.103.1388407764590; Mon, 30 Dec 2013 04:49:24 -0800 (PST) Received: from neutrino.exnihilo (140-227.61-188.cust.bluewin.ch. [188.61.227.140]) by mx.google.com with ESMTPSA id z42sm108428856eeo.17.2013.12.30.04.49.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Dec 2013 04:49:24 -0800 (PST) From: =?UTF-8?q?Andr=C3=A9=20Roth?= To: linux-media@vger.kernel.org Cc: =?UTF-8?q?Andr=C3=A9=20Roth?= Subject: [PATCH 02/18] libdvbv5: service location descriptor support Date: Mon, 30 Dec 2013 13:48:35 +0100 Message-Id: <1388407731-24369-2-git-send-email-neolynx@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1388407731-24369-1-git-send-email-neolynx@gmail.com> References: <1388407731-24369-1-git-send-email-neolynx@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Implement the service location descriptor (0xa1), and small cleanups. Signed-off-by: André Roth --- lib/include/descriptors.h | 4 +- lib/include/descriptors/desc_service_location.h | 69 +++++++++++++++++++++++ lib/libdvbv5/Makefile.am | 3 +- lib/libdvbv5/descriptors.c | 2 +- lib/libdvbv5/descriptors/desc_service_location.c | 70 ++++++++++++++++++++++++ 5 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 lib/include/descriptors/desc_service_location.h create mode 100644 lib/libdvbv5/descriptors/desc_service_location.c diff --git a/lib/include/descriptors.h b/lib/include/descriptors.h index 2e614f0..5ab29a0 100644 --- a/lib/include/descriptors.h +++ b/lib/include/descriptors.h @@ -1,4 +1,4 @@ - /* +/* * Copyright (c) 2011-2012 - Mauro Carvalho Chehab * * This program is free software; you can redistribute it and/or @@ -216,6 +216,8 @@ enum descriptors { /* SCTE 35 2004 */ CUE_identifier_descriptor = 0x8a, + extended_channel_name = 0xa0, + service_location = 0xa1, /* From http://www.etherguidesystems.com/Help/SDOs/ATSC/Semantics/Descriptors/Default.aspx */ component_name_descriptor = 0xa3, diff --git a/lib/include/descriptors/desc_service_location.h b/lib/include/descriptors/desc_service_location.h new file mode 100644 index 0000000..89ed055 --- /dev/null +++ b/lib/include/descriptors/desc_service_location.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2013 - Andre Roth + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * + */ + +#ifndef _SERVICE_LOCATION_H +#define _SERVICE_LOCATION_H + +#include +#include /* ssize_t */ + +struct dvb_desc_service_location_element { + uint8_t stream_type; + union { + uint16_t bitfield; + struct { + uint16_t elementary_pid:13; + uint16_t reserved:3; + }; + }; + uint8_t language[4]; +} __attribute__((packed)); + +struct dvb_desc_service_location { + uint8_t type; + uint8_t length; + struct dvb_desc *next; + + union { + uint16_t bitfield; + struct { + uint16_t pcr_pid:13; + uint16_t reserved:3; + }; + }; + uint8_t elements; + struct dvb_desc_service_location_element *element; +} __attribute__((packed)); + +struct dvb_v5_fe_parms; + +#ifdef __cplusplus +extern "C" { +#endif + +void dvb_desc_service_location_init (struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc); +void dvb_desc_service_location_print(struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc); +void dvb_desc_service_location_free (struct dvb_desc *desc); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/lib/libdvbv5/Makefile.am b/lib/libdvbv5/Makefile.am index 2ad5902..80e8adb 100644 --- a/lib/libdvbv5/Makefile.am +++ b/lib/libdvbv5/Makefile.am @@ -48,7 +48,8 @@ libdvbv5_la_SOURCES = \ descriptors/nit.c ../include/descriptors/nit.h \ descriptors/sdt.c ../include/descriptors/sdt.h \ descriptors/vct.c ../include/descriptors/vct.h \ - descriptors/eit.c ../include/descriptors/eit.h + descriptors/eit.c ../include/descriptors/eit.h \ + descriptors/desc_service_location.c ../include/descriptors/desc_service_location.h libdvbv5_la_CPPFLAGS = $(ENFORCE_LIBDVBV5_STATIC) libdvbv5_la_LDFLAGS = $(LIBDVBV5_VERSION) $(ENFORCE_LIBDVBV5_STATIC) -lm diff --git a/lib/libdvbv5/descriptors.c b/lib/libdvbv5/descriptors.c index 5ce9241..437b2f4 100644 --- a/lib/libdvbv5/descriptors.c +++ b/lib/libdvbv5/descriptors.c @@ -69,7 +69,7 @@ void dvb_desc_default_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, st void dvb_desc_default_print(struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc) { - dvb_log("| %s (0x%02x)", dvb_descriptors[desc->type].name, desc->type); + dvb_log("| %s (%#02x)", dvb_descriptors[desc->type].name, desc->type); hexdump(parms, "| ", desc->data, desc->length); } diff --git a/lib/libdvbv5/descriptors/desc_service_location.c b/lib/libdvbv5/descriptors/desc_service_location.c new file mode 100644 index 0000000..3759665 --- /dev/null +++ b/lib/libdvbv5/descriptors/desc_service_location.c @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2013 - Andre Roth + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * + */ + +#include "descriptors/desc_service_location.h" +#include "descriptors.h" +#include "dvb-fe.h" + +void dvb_desc_service_location_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, struct dvb_desc *desc) +{ + struct dvb_desc_service_location *service_location = (struct dvb_desc_service_location *) desc; + /* copy from .next */ + memcpy(((uint8_t *) service_location ) + + sizeof(service_location->type) + + sizeof(service_location->length) + + sizeof(service_location->next), + buf, + sizeof(service_location->bitfield) + sizeof(service_location->elements)); + buf += sizeof(service_location->bitfield) + sizeof(service_location->elements); + + bswap16(service_location->bitfield); + + // FIXME: handle elements == 0 + service_location->element = malloc(service_location->elements * sizeof(struct dvb_desc_service_location_element)); + int i; + struct dvb_desc_service_location_element *element = service_location->element; + for(i = 0; i < service_location->elements; i++) { + memcpy(element, buf, sizeof(struct dvb_desc_service_location_element) - 1); /* no \0 in lang */ + buf += sizeof(struct dvb_desc_service_location_element) - 1; + element->language[3] = '\0'; + bswap16(element->bitfield); + element++; + } +} + +void dvb_desc_service_location_print(struct dvb_v5_fe_parms *parms, const struct dvb_desc *desc) +{ + const struct dvb_desc_service_location *service_location = (const struct dvb_desc_service_location *) desc; + dvb_log("| pcr pid %d", service_location->pcr_pid); + dvb_log("| streams:"); + int i; + struct dvb_desc_service_location_element *element = service_location->element; + for(i = 0; i < service_location->elements; i++) { + dvb_log("| pid %d, type %d: %s", element[i].elementary_pid, element[i].stream_type, element[i].language); + } + dvb_log("| %d elements", service_location->elements); +} + +void dvb_desc_service_location_free(struct dvb_desc *desc) +{ + const struct dvb_desc_service_location *service_location = (const struct dvb_desc_service_location *) desc; + free(service_location->element); +} +