From patchwork Thu Nov 3 11:55:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Turner X-Patchwork-Id: 1269 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp741462vsb; Thu, 3 Nov 2016 04:55:54 -0700 (PDT) X-Received: by 10.28.32.150 with SMTP id g144mr1749167wmg.46.1478174154814; Thu, 03 Nov 2016 04:55:54 -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 vo2si8532238wjb.36.2016.11.03.04.55.54; Thu, 03 Nov 2016 04:55:54 -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; 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 CE026689D74; Thu, 3 Nov 2016 13:55:48 +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 B74B3689D70 for ; Thu, 3 Nov 2016 13:55:41 +0200 (EET) Received: by mail-pf0-f196.google.com with SMTP id y68so4693143pfb.1 for ; Thu, 03 Nov 2016 04:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=fI4HN5N8FUaKRrLmIWRlKfsX6hy3rYEoqwhO7oTQFIc=; b=UHj8pOZbj8Fds1ZuLVYPNZ3h242LcVyAPQ62D8l2+J7PQE8R2E319jewcn1bV2qcut Y3oCVzJFjzpGIz6zVISSg3hYD+xO1zfaYRWztbDFEQucVuasbt4b+4s7nQrvU6GG/hZX PpWHo/iEOED3hUqLL3KKn+xjJDTFp1zrinmim67I+AARAcmJODdiu3RxHzilIpryChts gbJqlY/Nucz8OibWb+tlR6AepB8p8QyvUz2MBlo2SV2UuVVAqlp5bXUVbn2jnqU8Adiz mQhJxz4nlX4jusxDhhZiJ2wHCmxrW/DWAkJN8g2In22Ko/3EMcUOunpyu5Z9dEO9i6fe hgGg== 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=fI4HN5N8FUaKRrLmIWRlKfsX6hy3rYEoqwhO7oTQFIc=; b=lKWoAKEE358hGNK7V+FHEBjbp0yl+VPQsLyKDJRVgJWj1vfTjUTi16ZTFppL2m8gSi W27Zf2zJl9djF3nX4B0i6zUq8GkaHqap6x5g5wzTKOu2VMUWXDs46lRpn2cv13knonxz /ab29ndP/AhGiCg+SV46f+Ansjl4aThPY1eStv8XM4iOI2+RHZP0URnKUt6ZHhw8/kow u3wDXG8DEz/pqtW15SbQg6V9iuskUh68L8Wc+nJnm26wL44unO0RdqptUhV/O/+YXuCk 02ipKUI2LosJfcvppbpIzhCi51jI0JHuxe7/+LjJvNPSSfJZPALaxiFmb30TX3unNtWz zl2A== X-Gm-Message-State: ABUngveTjlgqV6EUlDHYP7cSRQU9hqgzOIN3XqRa0dQ220+VX7yOTdGO6VbL0HavFJpLNg== X-Received: by 10.98.166.70 with SMTP id t67mr16177386pfe.132.1478174143386; Thu, 03 Nov 2016 04:55:43 -0700 (PDT) Received: from Zany.domain.actdsltmp ([47.136.137.222]) by smtp.gmail.com with ESMTPSA id r194sm12207884pfr.94.2016.11.03.04.55.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Nov 2016 04:55:43 -0700 (PDT) From: Thomas Turner To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2016 04:55:40 -0700 Message-Id: <1478174140-10366-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" Function(s) Tested: av_packet_clone(). This test checks if av_packet_clone() can successfully make a copy of an AVPacket. Compares all data members in AVPacket EXCEPT for "buf" because "buf" is initialized to NIL in the original AVPacket [to be cloned]. Signed-off-by: Thomas Turner --- libavcodec/Makefile | 3 +- libavcodec/tests/avpacket.c | 205 ++++++++++++++++++++++++++++++++++++++++++++ tests/fate/libavcodec.mak | 5 ++ 3 files changed, 212 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..784a5a4 --- /dev/null +++ b/libavcodec/tests/avpacket.c @@ -0,0 +1,205 @@ +/* + * 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 const char* str = "Error @"; + +static int compare_AVPacketsSideData(AVPacketSideData* sdata1, + AVPacketSideData* sdata2) +{ + int ret = 0; + + if(!sdata1 || !sdata2) + return; + av_log(NULL, AV_LOG_INFO, "Comparing sidedata data memebers...\n"); + + if(sdata1->size != sdata2->size){ + fprintf(stderr, "%s size\n", str); + ret = 1; + } + if(sdata1->size > 0){ + if(memcmp(sdata1->data, sdata2->data, sdata1->size) != 0){ + fprintf(stderr, "%s data\n", str); + ret = 1; + } + } + else { + av_log(NULL, AV_LOG_INFO, "size is <= 0"); + ret = 1; + } + if(sdata1->type != sdata2->type){ + fprintf(stderr, "%s type\n", str); + ret = 1; + } + return ret; +} + +static int compare_AVPackets(AVPacket* p1, AVPacket* p2) +{ + int ret = 0; + + if(!p1 || !p2) + return; + + av_log(NULL, AV_LOG_INFO, "Comparing AVPacket data memebers...\n"); + + if(p1->size != p2->size){ + fprintf(stderr, "%s size\n", str); + ret = 1; + } + if(p1->size > 0){ + if(memcmp(p1->data, p2->data, p1->size) != 0){ + fprintf(stderr, "%s data\n", str); + ret = 1; + } + } + else { + av_log(NULL, AV_LOG_INFO, "size is <= 0"); + ret = 1; + } + if(p1->pts != p2->pts){ + fprintf(stderr, "%s pts\n", str); + ret = 1; + } + if(p1->dts != p2->dts){ + fprintf(stderr, "%s dts\n", str); + ret = 1; + } + if(p1->stream_index != p2->stream_index){ + fprintf(stderr, "%s stream_index\n", str); + ret = 1; + } + if(p1->flags != p2->flags){ + fprintf(stderr, "%s flags\n", str); + ret = 1; + } + if(p1->side_data_elems != p2->side_data_elems){ + fprintf(stderr, "%s side_data_elems\n", str); + ret = 1; + } + if(p1->duration != p2->duration){ + fprintf(stderr, "%s duration\n", str); + ret = 1; + } + if(p1->pos != p2->pos){ + fprintf(stderr, "%s pos\n", str); + ret = 1; + } + + if(compare_AVPacketsSideData(p1->side_data, p2->side_data) > 0) + ret = 1; + + av_log(NULL, AV_LOG_INFO, "Done comparing!\n"); + + return ret; +} + +static void 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); + goto print_error; + } + /* 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){ + goto print_error; + } + + return; + +print_error: + fprintf(stderr, "Error occurred: %s\n", av_err2str(ret)); + exit(1); +} + +static void initializations(AVPacket* avpkt) +{ + static uint8_t data[] = "selftest for av_packet_clone(...)"; + + /* 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; + + setup_side_data_entry(avpkt); +} + +static void test_av_packet_clone(void) +{ + AVPacket avpkt; + AVPacket *avpkt_clone = NULL; + + initializations(&avpkt); + + /* clone avpkt */ + avpkt_clone = av_packet_clone(&avpkt); + + if(avpkt_clone) { + /* compare avpkt and avpkt_clone*/ + if(compare_AVPackets(&avpkt, avpkt_clone)) + av_log(NULL, AV_LOG_ERROR, "Test failed\n"); + else + av_log(NULL, AV_LOG_INFO, "Test passed\n"); + + /* cleanup */ + av_packet_free(&avpkt_clone); + av_packet_unref(&avpkt); + } + else { + av_log(NULL, AV_LOG_ERROR, "av_packet_clone error\n"); + 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