From patchwork Tue Oct 18 06:22:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tdturner@ucdavis.edu X-Patchwork-Id: 1046 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp570731vsd; Mon, 17 Oct 2016 23:22:37 -0700 (PDT) X-Received: by 10.28.194.7 with SMTP id s7mr11048745wmf.4.1476771756958; Mon, 17 Oct 2016 23:22:36 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ll4si46815067wjb.39.2016.10.17.23.22.34; Mon, 17 Oct 2016 23:22:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19714689923; Tue, 18 Oct 2016 09:22:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD8EA680D4A for ; Tue, 18 Oct 2016 09:22:23 +0300 (EEST) Received: by mail-pf0-f195.google.com with SMTP id i85so10847230pfa.0 for ; Mon, 17 Oct 2016 23:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=bX4dmTdyNzaOlLJmAkXwope5qNSrwolxVIR7yc5q9HE=; b=g31Qr0JYP8Mdul2hoY1BN0v9gotSYlJHmgKm73rYbmvXde9YplGQ/MxQ1bQ9feET5B toGIHHLP1PAJaIYnr5xthVHau3w9GALIyFjkGF4bTbvA60ny6Uu2YNIiedsYemmSDu2L 1zz4FbNPbBAs187/5X6gZ4AJHepr9m7Czhb9TpGa+m+NUGjRxBljzYVkm8baSfpAc5z1 ekJnaGXLTFW8AQyQLI3GMcaIReHCO8VmkGNu+An6hP3oZgfT3smtWE0GcM9NEXolYTlY NSDSU2W3jCr835YOpPiKDvgQu/0FpPXD65Cgbpd1UsbG+JPNhbspLHoyiYhkPQbCfc6Z Lnog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=bX4dmTdyNzaOlLJmAkXwope5qNSrwolxVIR7yc5q9HE=; b=Rc6pbLefrMV/Q/cnhKC1hzPjwPIwvWxPvTWtPpVjwzz2QAkeSCovX3xPy0aiT8wQoM e/oq0OX9yoaUfYl4HJh6L0aFySooMHWeWPD1DLjfpbOGqZ258sF/DnjA3Dj/hWqDKMpv dSyUkRR5lSIGJcwZljgMOR3h3h1JnUyMkYlZzOQndYWRtk/xVU4yr1qUE/1T4biU5GMV 2UFKV78N1FqOWPVyvWNqI9XFm35wz/TIfLXyCqcgHxs8rYQID43JnDNyr6ggoBkCn8QJ 3UUwoBwliX/jeiXtAsiQgHmB/okr+JgKIOJjjXY80a6c5oI6Wpgmfl7Y+vIGFP/o+ZHs r1zg== X-Gm-Message-State: AA6/9Rk+wSnb0iSJxHoXG8Pk0pY7+HQeSomfFXMK16Yhdxt3kNKqjguEp2mXfswPxirw5Q== X-Received: by 10.98.192.135 with SMTP id g7mr1971405pfk.58.1476771744598; Mon, 17 Oct 2016 23:22:24 -0700 (PDT) Received: from Zany.domain.actdsltmp ([47.136.133.132]) by smtp.gmail.com with ESMTPSA id o9sm46212883pac.27.2016.10.17.23.22.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Oct 2016 23:22:23 -0700 (PDT) From: tdturner@ucdavis.edu To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Oct 2016 23:22:21 -0700 Message-Id: <1476771741-4046-1-git-send-email-tdturner@ucdavis.edu> X-Mailer: git-send-email 1.9.1 Subject: [FFmpeg-devel] [PATCH] libavcodec/tests: Added selftest for libavcodec/avpacket.c 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 Cc: Thomas Turner MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Thomas Turner Improved code coverage for libavcodec. Function(s) Tested: av_packet_clone() Signed-off-by: Thomas Turner --- libavcodec/Makefile | 3 +- libavcodec/tests/avpacket.c | 207 ++++++++++++++++++++++++++++++++++++++++++++ tests/fate/libavcodec.mak | 5 ++ 3 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 libavcodec/tests/avpacket.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a1560ba..d64b8df 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1016,7 +1016,8 @@ SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_vt_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vda_vt_internal.h -TESTPROGS = imgconvert \ +TESTPROGS = avpacket \ + imgconvert \ jpeg2000dwt \ mathops \ options \ diff --git a/libavcodec/tests/avpacket.c b/libavcodec/tests/avpacket.c new file mode 100644 index 0000000..5b884d7 --- /dev/null +++ b/libavcodec/tests/avpacket.c @@ -0,0 +1,207 @@ +/* + * 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 +#include +#include +#include +#include "libavcodec/avcodec.h" +#include "libavutil/error.h" + + + + +static char* getbuffer(AVPacket avpkt, int index) +{ + uint8_t *buffer; + int val, tot_elem, buffer_size = 256; + + /* Allocate 256 bytes */ + if((buffer = malloc(buffer_size)) == NULL){ + perror("malloc"); + goto EXIT; + } + + if(index == 0){ + val = snprintf(buffer, buffer_size, + "{buffer: %p, data: %p, size: %d}", + avpkt.buf->buffer, avpkt.buf->data, avpkt.buf->size); + + tot_elem = strlen(buffer); + } + else if(index == 1){ + val = snprintf(buffer, buffer_size, "\"%s\"", avpkt.data); + tot_elem = strlen(buffer); + } + else if(index == 2){ + val = snprintf(buffer, buffer_size, + "{data: %p \"%s\", size: %d, type: %d}", + avpkt.side_data, avpkt.side_data->data, avpkt.side_data->size, + avpkt.side_data->type); + + tot_elem = strlen(buffer); + } + + /* snprintf fail check */ + if(!(val > -1 && val < buffer_size)){ + perror("snprintf"); + free(buffer); + goto EXIT; + } + + return buffer; + +EXIT: + exit(-1); +} + +static void LOG_AVPACKET(AVPacket avpkt, const char* message) +{ + uint8_t *buf_info = 0, *data_info = 0, *side_info = 0; + + /* get buf information */ + if(avpkt.buf){ + buf_info = getbuffer(avpkt, 0); + } + + /* get data information */ + if(avpkt.data){ + data_info = getbuffer(avpkt, 1); + } + + /* get side data information */ + if(avpkt.side_data){ + side_info = getbuffer(avpkt, 2); + } + + /* log standard packet information */ + av_log(NULL, AV_LOG_INFO, + "\n%s:\n\n" + "buf\t\t: %p " + "%s\n" + "pts\t\t: %" PRId64 "\n" + "dts\t\t: %" PRId64 "\n" + "data\t\t: %p " + "%s\n" + "size\t\t: %d\n" + "stream_index\t: %d\n" + "flags\t\t: %d\n" + "side_data\t: %p " + "%s\n" + "side_data_elems\t: %d\n" + "duration\t: %" PRId64 "\n" + "pos\t\t: %" PRId64 "\n\n", + message, + avpkt.buf, + buf_info, + avpkt.pts, + avpkt.dts, + avpkt.data, + data_info, + avpkt.size, + avpkt.stream_index, + avpkt.flags, + avpkt.side_data, + side_info, + avpkt.side_data_elems, + avpkt.duration, + avpkt.pos + ); + + /* cleanup */ + if(buf_info) + free(buf_info); + + if(data_info) + free(data_info); + + if(side_info) + free(side_info); +} + + +static void TEST_AV_PACKET_CLONE(void) +{ + int ret = 0, len; + uint8_t *extra_data = NULL; + const uint8_t *data_name = NULL; + AVPacket avpkt, *avpkt_clone = NULL; + uint8_t data[] = "selftest for av_packet_clone(...)"; + + /* initialize avpkt */ + av_init_packet(&avpkt); + + avpkt.data = data; + avpkt.size = strlen(data); + avpkt.flags = AV_PKT_FLAG_DISCARD; + + /* get side_data_name string */ + data_name = av_packet_side_data_name(AV_PKT_DATA_NEW_EXTRADATA); + + /* Allocate a memory bloc */ + len = strlen(data_name); + extra_data = av_malloc(len); + + if(!extra_data){ + ret = AVERROR(ENOMEM); + goto print_error; + } + /* copy side_data_name to extra_data array */ + memcpy(extra_data, data_name, len); + + /* create side data for AVPacket */ + ret = av_packet_add_side_data(&avpkt, AV_PKT_DATA_NEW_EXTRADATA, + extra_data, len); + if(ret < 0){ + goto print_error; + } + + /* clone avpkt */ + avpkt_clone = av_packet_clone(&avpkt); + + /* log packet information */ + if(avpkt_clone){ + LOG_AVPACKET(avpkt, "Original Packet info"); + LOG_AVPACKET(*avpkt_clone, "Cloned Packet info"); + } + else{ + av_log(NULL, AV_LOG_ERROR, "av_packet_clone error\n"); + goto fail; + } + + /* cleanup */ + av_packet_free(&avpkt_clone); + av_packet_unref(&avpkt); + + return; + +print_error: + fprintf(stderr, "Error occurred: %s\n", av_err2str(ret)); + +fail: + exit(1); + +} + + +int main(void) +{ + TEST_AV_PACKET_CLONE(); + + return 0; +} diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index cf25285..3bc74c1 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -1,3 +1,8 @@ +FATE_LIBAVCODEC-yes += fate-avpacket +fate-avpacket: libavcodec/tests/avpacket$(EXESUF) +fate-avpacket: CMD = run libavcodec/tests/avpacket +fate-avpacket: REF = /dev/null + FATE_LIBAVCODEC-$(CONFIG_CABAC) += fate-cabac fate-cabac: libavcodec/tests/cabac$(EXESUF) fate-cabac: CMD = run libavcodec/tests/cabac