From patchwork Tue Nov 8 04:38:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Turner X-Patchwork-Id: 1334 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1499568vsb; Mon, 7 Nov 2016 20:56:08 -0800 (PST) X-Received: by 10.28.24.1 with SMTP id 1mr12035320wmy.107.1478580968803; Mon, 07 Nov 2016 20:56:08 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c1si4969978wjn.227.2016.11.07.20.56.08; Mon, 07 Nov 2016 20:56:08 -0800 (PST) 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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D283689C55; Tue, 8 Nov 2016 06:56:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08B54689B02 for ; Tue, 8 Nov 2016 06:55:54 +0200 (EET) Received: by mail-pf0-f196.google.com with SMTP id 144so9655202pfv.0 for ; Mon, 07 Nov 2016 20:55:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=yv1BGOe2F44jA4cYzKCf8KUrwL1TtOyrXsuV+Kl3vRo=; b=ylAuPSWnbDfzpwGQXSOSZvMuCOhS/CiHe8A22to7h9DxJScjGFEGTOxkP/6ShL3sAw H9ldnDopOv/4wdiWzFKFJcjwIVCC/J14bABP14FH+e+PyuWzdQuCTf7fufXl5lv9wsBA DpPqMbJpU05hGzwsE4RNljY9HoeoZWKjxExi8k/8gsYdIkSNkGuWbs9z7CvY/XoKqtO8 EgYUeJNeg9JPky+d4Z45AKzyEr5xQTpocU7UJBTIetN36tIS1uQyuiNRh4rxPxp6i4M5 fLZDU+nsl/JsA5O0ZxyiHZa3/CsAMirWXIeHPOB7MkV96S1mK/rQ9EejdmBtLiQd01eI UZ7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yv1BGOe2F44jA4cYzKCf8KUrwL1TtOyrXsuV+Kl3vRo=; b=fgWrEUj4hBqEoRYdtV+eFuXxtDYtLOU8/3BQw5Zd3QQV6QBMzyEKaubup5mvtp7NVU reTX5ePm3hUy2s7qBsCwq0hzAndLtwv6wvvE0MeChLFmzQe0JW09Il1H/hjLxaPYaURi 3qnJdmFWffkBTi5sK9Rv1EBRpH1xrr7C4pifOGMXQu7KzfUN7QoHtwN5OCdC+PwT8/l0 XIIex1Y4Tlw1SeV16t6DiTvKVBKeSqaokdqXsH8FrRYAciF4OuipSa0zWFR+qBOBgl2X 4vVHydyAg5qSf1eyOuLPl8VJbm1D/3rQcIsLx+AEZYzrUDcKI/bS6qpjvR0hz0r+N1Wr e6VQ== X-Gm-Message-State: ABUngvfpVMyauU9t7jgiGTcfZOOH9cljUz8SNg9vA4+Ayf56kJRAtd7pRvIHW9pADP2lcg== X-Received: by 10.99.98.2 with SMTP id w2mr15912623pgb.59.1478579944088; Mon, 07 Nov 2016 20:39:04 -0800 (PST) Received: from Zany.domain.actdsltmp ([47.136.137.222]) by smtp.gmail.com with ESMTPSA id h85sm44085604pfj.89.2016.11.07.20.39.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Nov 2016 20:39:03 -0800 (PST) From: Thomas Turner To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Nov 2016 20:38:59 -0800 Message-Id: <1478579939-30410-1-git-send-email-thomastdt@googlemail.com> X-Mailer: git-send-email 1.9.1 Subject: [FFmpeg-devel] [PATCH] libavcodec/tests: Added test 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: michael@niedermayer.cc MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Thomas Turner --- libavcodec/Makefile | 3 +- libavcodec/tests/avpacket.c | 134 ++++++++++++++++++++++++++++++++++++++++++++ tests/fate/libavcodec.mak | 5 ++ 3 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 libavcodec/tests/avpacket.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f1d5bf1..46e3af7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1019,7 +1019,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..4826522 --- /dev/null +++ b/libavcodec/tests/avpacket.c @@ -0,0 +1,134 @@ +/* + * 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 int setup_side_data_entry(AVPacket* avpkt) +{ + const uint8_t *data_name = NULL; + int ret = 0, bytes; + uint8_t *extra_data = NULL; + + + /* get side_data_name string */ + data_name = av_packet_side_data_name(AV_PKT_DATA_NEW_EXTRADATA); + + /* Allocate a memory bloc */ + bytes = strlen(data_name); + + if(!(extra_data = av_malloc(bytes))){ + ret = AVERROR(ENOMEM); + fprintf(stderr, "Error occurred: %s\n", av_err2str(ret)); + return 1; + } + /* copy side_data_name to extra_data array */ + memcpy(extra_data, data_name, bytes); + + /* create side data for AVPacket */ + ret = av_packet_add_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, + extra_data, bytes); + if(ret < 0){ + fprintf(stderr, + "Error occurred in av_packet_add_side_data: %s\n", + av_err2str(ret)); + return 1; + } + + return 0; +} + +static int initializations(AVPacket* avpkt) +{ + static uint8_t data[] = "selftest for av_packet_clone(...)"; + int ret = 0; + + /* initialize avpkt */ + av_init_packet(avpkt); + + /* set values for avpkt */ + avpkt->pts = 17; + avpkt->dts = 2; + avpkt->data = data; + avpkt->size = strlen(data); + avpkt->flags = AV_PKT_FLAG_DISCARD; + avpkt->duration = 100; + avpkt->pos = 3; + + if(setup_side_data_entry(avpkt)) + ret = 1; + + return ret; +} + +int main(void) +{ + AVPacket avpkt; + AVPacket *avpkt_clone = NULL; + int ret = 0; + + if(initializations(&avpkt)){ + printf("failed to initialize variables\n"); + return 1; + } + + /* test av_packet_clone*/ + avpkt_clone = av_packet_clone(&avpkt); + + if(!avpkt_clone) { + av_log(NULL, AV_LOG_ERROR,"av_packet_clone failed to clone AVPacket\n"); + return 1; + } + /* test size error check in av_new_packet*/ + if(av_new_packet(avpkt_clone, INT_MAX) == 0){ + printf( "av_new_packet failed to return error " + "when \"size\" parameter is too large.\n" ); + ret = 1; + } + + /*test av_grow_packet*/ + if(av_grow_packet(avpkt_clone, INT_MAX) == 0){ + printf( "av_grow_packet failed to return error " + "when \"grow_by\" parameter is too large.\n" ); + ret = 1; + } + if(av_grow_packet(avpkt_clone, 20) < 0){ + av_log(NULL, AV_LOG_ERROR, "av_grow_packet failed\n"); + return 1; + } + + /*test av_packet_from_data*/ + if(av_packet_from_data(avpkt_clone, avpkt_clone->data, INT_MAX) == 0){ + printf("av_packet_from_data failed to return error " + "when \"size\" parameter is too large.\n" ); + ret = 1; + } + + /*clean up*/ + av_packet_free(&avpkt_clone); + av_packet_unref(&avpkt); + + + return ret; +} 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