From patchwork Sat Sep 12 22:33:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 22309 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E43BB449C01 for ; Sun, 13 Sep 2020 01:33:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C492F68BB71; Sun, 13 Sep 2020 01:33:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C521568BA9B for ; Sun, 13 Sep 2020 01:33:32 +0300 (EEST) Received: by mail-ed1-f66.google.com with SMTP id l17so13993798edq.12 for ; Sat, 12 Sep 2020 15:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=CYCc5kFPXAKoyoo1rke+n4sh4vGl2Zo3RAsxuh3wU7U=; b=ooZJPmQ112mo0N22L8vSntPFnr86Q5ARMmT+N5GWgdGbePIXlytc3b+oXa5epOeFqb 1IJicjoCxjhySwLnd67xULwVSBl7nNgZsDGd/xtLSUUno1DsNLqaKjy7E+BOcMmslt2z Y4GReHAhTmT+s8BdQcFE3aqG4vyqASa40mMiLo5tWmiKxw/DeeEsTFN8ZExiLLK6GisK zRASEvlQOpxNycDRouQpLzRu10a27AWfcZmQg7HRngV+2QOgcAjacXR2nargyMS3Uuf0 UdmaF0wXkM6kN0Bn+hoI5ntHq3rVrQWEyeql5EGBfiPoQfJsSn0CCi5gzS1mrNzof9cT EDjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=CYCc5kFPXAKoyoo1rke+n4sh4vGl2Zo3RAsxuh3wU7U=; b=j9vxyGmsnpEzxgMiZ6cogGtOox42DfAKWMd4iryPUtUc1N7CKrM223UWJQFJUbc38V NC0trVhnvrPu/VQsafwlDQdWbUTeXsF9hMtScDx+BgeAIeFKbNRuXl5MII6WWMTg2Y9H rgt+OjIP5qmugElJSIaVIIwdCf3DhIgP1YM6lBi5Ft3rk74ZM9gedff6PYDpdNRvnk6V MRfcgvR1kj0slkdikomYI89JRADYOWAkAydBrtk7HegnMWJ00bh4KZf2QRT+phWvjE+N Ri1fKE/quIr7A7P2aNha4DDOM+CcBoH9Hc7ftEGO/CtwCpRKC+/rKPeguvNqLeEmn4d/ voUA== X-Gm-Message-State: AOAM532fh0BJeWzAcQpPDAfGdqQFrVsrM7epT4mYKfWadm+kq0yQiuxe HTaFup4wrDjr35g31w5EN3WgGEpx0m/fCA== X-Google-Smtp-Source: ABdhPJzhgzUcn9iAbWWn9+e/LXYF8JYhtCuGYpWi1AKFAvb04FGK484DwQkmuH09w3HZAw6OF28rvA== X-Received: by 2002:a05:6402:144c:: with SMTP id d12mr10518895edx.168.1599950011693; Sat, 12 Sep 2020 15:33:31 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id j14sm5541843edr.91.2020.09.12.15.33.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 15:33:31 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 00:33:20 +0200 Message-Id: <20200912223321.21856-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat: add CRI AAX demuxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/Makefile | 1 + libavformat/aaxdec.c | 324 +++++++++++++++++++++++++++++++++++++++ libavformat/allformats.c | 1 + 3 files changed, 326 insertions(+) create mode 100644 libavformat/aaxdec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index b4cc467268..883326770f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -68,6 +68,7 @@ OBJS-$(CONFIG_SRTP) += srtp.o OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o OBJS-$(CONFIG_AA_DEMUXER) += aadec.o OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o apetag.o img2.o rawdec.o +OBJS-$(CONFIG_AAX_DEMUXER) += aaxdec.o OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o OBJS-$(CONFIG_AC3_MUXER) += rawenc.o OBJS-$(CONFIG_ACM_DEMUXER) += acm.o rawdec.o diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c new file mode 100644 index 0000000000..419fad9cc8 --- /dev/null +++ b/libavformat/aaxdec.c @@ -0,0 +1,324 @@ +/* + * AAX demuxer + * Copyright (c) 2020 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/intreadwrite.h" +#include "avformat.h" +#include "internal.h" + +typedef struct AAXColumn { + uint8_t flag; + uint8_t type; + const char *name; + uint32_t offset; + int size; +} AAXColumn; + +typedef struct AAXSegment { + int64_t offset; + uint32_t size; +} AAXSegment; + +typedef struct AAXContext { + int64_t table_size; + uint16_t version; + int64_t rows_offset; + int64_t strings_offset; + int64_t data_offset; + int64_t name_offset; + uint16_t columns; + uint16_t row_width; + uint32_t nb_segments; + int64_t schema_offset; + int64_t strings_size; + char *string_table; + + int64_t prev_pts; + int64_t last_segment_pts; + int current_segment; + + AAXColumn *xcolumns; + AAXSegment *segments; +} AAXContext; + +static int aax_probe(const AVProbeData *p) +{ + if (AV_RB32(p->buf) != MKBETAG('@','U','T','F')) + return 0; + if (AV_RB16(p->buf + 4) <= 1U) + return 0; + + return AVPROBE_SCORE_MAX; +} + +enum ColumnFlag { + COLUMN_FLAG_NAME = 0x1, + COLUMN_FLAG_DEFAULT = 0x2, + COLUMN_FLAG_ROW = 0x4, + COLUMN_FLAG_UNDEFINED = 0x8 /* shouldn't exist */ +}; + +enum ColumnType { + COLUMN_TYPE_UINT8 = 0x00, + COLUMN_TYPE_SINT8 = 0x01, + COLUMN_TYPE_UINT16 = 0x02, + COLUMN_TYPE_SINT16 = 0x03, + COLUMN_TYPE_UINT32 = 0x04, + COLUMN_TYPE_SINT32 = 0x05, + COLUMN_TYPE_UINT64 = 0x06, + COLUMN_TYPE_SINT64 = 0x07, + COLUMN_TYPE_FLOAT = 0x08, + COLUMN_TYPE_DOUBLE = 0x09, + COLUMN_TYPE_STRING = 0x0a, + COLUMN_TYPE_VLDATA = 0x0b, + COLUMN_TYPE_UINT128 = 0x0c, /* for GUIDs */ + COLUMN_TYPE_UNDEFINED = -1 +}; + +static int aax_read_header(AVFormatContext *s) +{ + AAXContext *a = s->priv_data; + AVIOContext *pb = s->pb; + AVCodecParameters *par; + AVStream *st; + int64_t column_offset = 0; + char *codec; + int ret, extradata_size; + + avio_skip(pb, 4); + a->table_size = avio_rb32(pb) + 8LL; + a->version = avio_rb16(pb); + a->rows_offset = avio_rb16(pb) + 8LL; + a->strings_offset = avio_rb32(pb) + 8LL; + a->data_offset = avio_rb32(pb) + 8LL; + a->name_offset = avio_rb32(pb); + a->columns = avio_rb16(pb); + a->row_width = avio_rb16(pb); + a->nb_segments = avio_rb32(pb); + + a->schema_offset = 0x20; + a->strings_size = a->data_offset - a->strings_offset; + + if (a->rows_offset > a->table_size || + a->strings_offset > a->table_size || + a->data_offset > a->table_size) + return AVERROR_INVALIDDATA; + if (a->strings_size <= 0 || a->name_offset > a->strings_size || + a->strings_size > UINT16_MAX) + return AVERROR_INVALIDDATA; + if (a->columns <= 0) + return AVERROR_INVALIDDATA; + + av_freep(&a->segments); + a->segments = av_calloc(a->nb_segments, sizeof(*a->segments)); + if (!a->segments) + return AVERROR(ENOMEM); + + av_freep(&a->xcolumns); + a->xcolumns = av_calloc(a->columns, sizeof(*a->xcolumns)); + if (!a->xcolumns) + return AVERROR(ENOMEM); + + av_freep(&a->string_table); + a->string_table = av_calloc(a->strings_size + 1, sizeof(*a->string_table)); + if (!a->string_table) + return AVERROR(ENOMEM); + + for (int c = 0; c < a->columns; c++) { + uint8_t info = avio_r8(pb); + uint32_t offset = avio_rb32(pb); + int value_size; + + if (offset >= a->strings_size) + return AVERROR_INVALIDDATA; + + a->xcolumns[c].flag = info >> 4; + a->xcolumns[c].type = info & 0x0F; + + switch (a->xcolumns[c].type) { + case COLUMN_TYPE_UINT8: + case COLUMN_TYPE_SINT8: + value_size = 0x01; + break; + case COLUMN_TYPE_UINT16: + case COLUMN_TYPE_SINT16: + value_size = 0x02; + break; + case COLUMN_TYPE_UINT32: + case COLUMN_TYPE_SINT32: + case COLUMN_TYPE_FLOAT: + case COLUMN_TYPE_STRING: + value_size = 0x04; + break; + case COLUMN_TYPE_VLDATA: + value_size = 0x08; + break; + case COLUMN_TYPE_UINT128: + value_size = 0x10; + break; + default: + return AVERROR_INVALIDDATA; + } + + a->xcolumns[c].size = value_size; + + if (a->xcolumns[c].flag & COLUMN_FLAG_NAME) + a->xcolumns[c].name = a->string_table + offset; + + if (a->xcolumns[c].flag & COLUMN_FLAG_DEFAULT) { + /* data is found relative to columns start */ + a->xcolumns[c].offset = avio_tell(pb) - a->schema_offset; + avio_skip(pb, value_size); + } + + if (a->xcolumns[c].flag & COLUMN_FLAG_ROW) { + /* data is found relative to row start */ + a->xcolumns[c].offset = column_offset; + column_offset += value_size; + } + } + + avio_seek(pb, a->strings_offset, SEEK_SET); + ret = avio_read(pb, a->string_table, a->strings_size); + if (ret != a->strings_size) { + if (ret < 0) + return ret; + return AVERROR(EIO); + } + + for (int c = 0; c < a->columns; c++) { + int64_t data_offset = 0; + int64_t col_offset; + int flag, type; + + if (strcmp(a->xcolumns[c].name, "data")) + continue; + + type = a->xcolumns[c].type; + flag = a->xcolumns[c].flag; + col_offset = a->xcolumns[c].offset; + + for (int r = 0; r < a->nb_segments; r++) { + if (flag & COLUMN_FLAG_DEFAULT) { + data_offset = a->schema_offset + col_offset; + } else if (flag & COLUMN_FLAG_ROW) { + data_offset = a->rows_offset + r * a->row_width + col_offset; + } else { + return AVERROR_INVALIDDATA; + } + + avio_seek(pb, data_offset, SEEK_SET); + if (type == COLUMN_TYPE_VLDATA) { + a->segments[r].offset = avio_rb32(pb) + 0x58; + a->segments[r].size = avio_rb32(pb); + } else { + return AVERROR_INVALIDDATA; + } + } + } + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + par = s->streams[0]->codecpar; + par->codec_type = AVMEDIA_TYPE_AUDIO; + + codec = a->string_table + a->name_offset; + if (!strcmp(codec, "AAX")) { + par->codec_id = AV_CODEC_ID_ADPCM_ADX; + } else if (!strcmp(codec, "HCA") ){ + par->codec_id = AV_CODEC_ID_HCA; + } else { + return AVERROR_INVALIDDATA; + } + + avio_seek(pb, a->segments[0].offset, SEEK_SET); + if (avio_rb16(pb) != 0x8000) + return AVERROR_INVALIDDATA; + extradata_size = avio_rb16(pb) + 4; + if (extradata_size < 12) + return AVERROR_INVALIDDATA; + avio_seek(pb, -4, SEEK_CUR); + ff_get_extradata(s, par, pb, extradata_size); + par->channels = AV_RB8 (par->extradata + 7); + par->sample_rate = AV_RB32(par->extradata + 8); + + avpriv_set_pts_info(st, 64, 32, par->sample_rate); + + return 0; +} + +static int aax_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + AAXContext *a = s->priv_data; + AVCodecParameters *par = s->streams[0]->codecpar; + AVIOContext *pb = s->pb; + const int size = 18 * par->channels; + int ret, extradata_size = 0; + uint8_t *dst = NULL; + + if (avio_feof(pb)) + return AVERROR_EOF; + + if (avio_tell(pb) >= a->segments[a->current_segment].offset + + a->segments[a->current_segment].size) { + if (a->current_segment + 1 == a->nb_segments) + return AVERROR_EOF; + a->last_segment_pts = a->prev_pts; + a->current_segment++; + avio_seek(pb, a->segments[a->current_segment].offset, SEEK_SET); + if (avio_rb16(pb) != 0x8000) + return AVERROR_INVALIDDATA; + extradata_size = avio_rb16(pb) + 4; + avio_seek(pb, -4, SEEK_CUR); + if (extradata_size < 12) + return AVERROR_INVALIDDATA; + dst = av_packet_new_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, extradata_size); + if (!dst) + return AVERROR(ENOMEM); + avio_read(pb, dst, extradata_size); + } + + pkt->pos = avio_tell(pb); + ret = av_get_packet(pb, pkt, size); + pkt->duration = 1; + pkt->stream_index = 0; + pkt->pts = a->last_segment_pts + ((pkt->pos - a->segments[a->current_segment].offset) / size); + a->prev_pts = pkt->pts; + + if (dst) { + ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, dst, extradata_size); + if (ret < 0) + return ret; + } + + return ret; +} + +AVInputFormat ff_aax_demuxer = { + .name = "aax", + .long_name = NULL_IF_CONFIG_SMALL("CRI AAX"), + .priv_data_size = sizeof(AAXContext), + .read_probe = aax_probe, + .read_header = aax_read_header, + .read_packet = aax_read_packet, + .extensions = "aax", + .flags = AVFMT_GENERIC_INDEX, +}; diff --git a/libavformat/allformats.c b/libavformat/allformats.c index a23eb9e7fa..d3af6f7f18 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -31,6 +31,7 @@ extern AVOutputFormat ff_a64_muxer; extern AVInputFormat ff_aa_demuxer; extern AVInputFormat ff_aac_demuxer; +extern AVInputFormat ff_aax_demuxer; extern AVInputFormat ff_ac3_demuxer; extern AVOutputFormat ff_ac3_muxer; extern AVInputFormat ff_acm_demuxer; From patchwork Sat Sep 12 22:33:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 22310 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 20610449C01 for ; Sun, 13 Sep 2020 01:33:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08E3068BB70; Sun, 13 Sep 2020 01:33:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84C3268BB50 for ; Sun, 13 Sep 2020 01:33:33 +0300 (EEST) Received: by mail-ed1-f66.google.com with SMTP id w1so14065232edr.3 for ; Sat, 12 Sep 2020 15:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=dUKAUF5YhFBRWqxR3/gWGNdYm9RvCRRsHCAoVgDdfjA=; b=DjO45JWfAVY3dVKWJmR46PpVPGD3IH32HSPnXV6b2NY19rbvafcXt0n2iu2+a2HKfp 5GKRGZE0GHHvB5R8gQLY3w/FRNK3dvCOdtfOo+nw03p6292YLrxLrzRpCz0Py3osooLh ock38PwgM8ZB83iiEbFV+VvipQWZygGTyPlS6/QRzzgJFO+cdK/Sb5NmtpaIPKDCILZi K0BL1IT5fYPjPFuRoWQ9PK3F8T59xsgII2RonNKWE4QJSgllMvZpF+9q8L83CqICilMv rYzZpa1frZ87FcXHo+8oarDAysGc8w3LT0SIh6Bj9bvQtbzyvQcoFLV9x2AM/6f5JGWT 9/MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=dUKAUF5YhFBRWqxR3/gWGNdYm9RvCRRsHCAoVgDdfjA=; b=i6ItppeXmDZyKYb0J+yDTOfD1f0MN/yFiNNNJ1KG6qT/pbLWeX811cXG9MIITqr8R4 qWqZnSBpFTYMfZX/1D5zmjNRboyppNuRqdE6eYwaASB36poVdnDM0TuNfBdsHYI1sm0w nsmwCzAHHWOV7QHyAP+BffBu67BLRQ5kWqpKRSE53ulYD7Jwah5YQFmFdCN4daiqxB12 IsYCyN8t2YdRlaqlABHhc3EnZl5C0MhO4P43fDO8vburxQ75ucpBrEILKM48/FJQV41q b5x8luD1RvwCcZ9ovs8R6mNndrJ1QrCU3FqU1fmTh1rC359ZcxVmw9psI7O2sbhH0IDx HgxQ== X-Gm-Message-State: AOAM5317BeXh0q4fr0VnivF1/VPZGjae9qROB/H/HfahAcLYHihaR3ti RdPGXwJOUgfmZNXlBN7MNcSHFVGE7DVxkg== X-Google-Smtp-Source: ABdhPJxwZoBAhmVpH1z0ynv2eyQfFQxGNV1jAForoqpy+r3EzRf5cegkU+UcqeUUsLpXqcH7WqbyBg== X-Received: by 2002:aa7:d747:: with SMTP id a7mr9963325eds.304.1599950012767; Sat, 12 Sep 2020 15:33:32 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id j14sm5541843edr.91.2020.09.12.15.33.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 15:33:32 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 00:33:21 +0200 Message-Id: <20200912223321.21856-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200912223321.21856-1-onemda@gmail.com> References: <20200912223321.21856-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/adxdec: add support for new extradata in packet sidedata X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/adxdec.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 40ed8e5ba7..81ffc8b296 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -103,6 +103,22 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data, const uint8_t *buf = avpkt->data; const uint8_t *buf_end = buf + avpkt->size; int num_blocks, ch, ret; + int new_extradata_size; + uint8_t *new_extradata; + + new_extradata = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, + &new_extradata_size); + if (new_extradata && new_extradata_size > 0) { + int header_size; + if ((ret = ff_adx_decode_header(avctx, new_extradata, + new_extradata_size, &header_size, + c->coeff)) < 0) { + av_log(avctx, AV_LOG_ERROR, "error parsing new ADX extradata\n"); + return AVERROR_INVALIDDATA; + } + + c->eof = 0; + } if (c->eof) { *got_frame_ptr = 0;