From patchwork Sun Oct 23 06:40:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Turner X-Patchwork-Id: 1133 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1691639vsd; Sat, 22 Oct 2016 23:58:10 -0700 (PDT) X-Received: by 10.194.20.3 with SMTP id j3mr7871965wje.30.1477205890834; Sat, 22 Oct 2016 23:58:10 -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 m63si6236823wma.85.2016.10.22.23.58.08; Sat, 22 Oct 2016 23:58:10 -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 B2685689C5C; Sun, 23 Oct 2016 09:58:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A965689757 for ; Sun, 23 Oct 2016 09:57:56 +0300 (EEST) Received: by mail-it0-f67.google.com with SMTP id e203so5821559itc.1 for ; Sat, 22 Oct 2016 23:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:date:message-id; bh=DFq4xY1v96lnV+2cK+L5LbbZxvCJW4RcR4r7AHStB5A=; b=Lx6OhCeOOanFJaxGyz2yxp+0hjQ5V+eg8tJyNJlR3WcZBtgyS/7r4H0pwW6AgJXk4O 3ULW9oUiAJQhAiv2Acv/UvWDJzGLAxyvZplHumsnDYVtZ4+5poTfUPwx6zjADGRcxWHI Jjwe7hPyhNYVVvWrgF6sGlC4V9VOOUodwRQR8smIS79gYgj9HS6rQy4emBGbreisuNUE XJzHuqvsQ6jvE0X9C4BhgqCZTyxCl/gvGFCt03/2w/Ixcx63xPmE/cH5j6lyABJLZDuP j+B07JEh0knEvJHSTpTTSSdGOVr2FYIOdLA5oGZYryq8FtJHE+7+90KA8iR9P9bDMl2D SxdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=DFq4xY1v96lnV+2cK+L5LbbZxvCJW4RcR4r7AHStB5A=; b=bgFLDrRR/cfXPq0O3s5Q+8Fna8KUgvt2t5uyzmVrNS/GnQUPLaoDjQIJaRjWfrgppA xWmMCd9R7bK4P5AGTRNdJopg3AsMV66qZTgsyj9yolF+sxULcPR2JVwb+0oB8uQu2QQW YxCzy/z7ZNRM2ScmL5zeiYl2K49pNgAgbj11FtNjum/TkpqlqlGePYR6Vol1ksvTyScO OmDf6C4LNe5LtCM61Xr7Nc0tdfL37n81GY2U7oKIgDYC4gd7Ry+j/xmxbrhLGTybDRd1 BntAOtTfvQn27oTyp2JDqHSdri261SbyvjlB5MCxWdcqysG4B/qM1jr0n47UYFmfD2Lp OWvg== X-Gm-Message-State: AA6/9Rn8a6dxb87yFyMAf1rtQRnSAyrdJy5b0AioIMF5FaTIJx1seTEzfBjW0s98R6Gong== X-Received: by 10.202.180.136 with SMTP id d130mr16592502oif.174.1477204844111; Sat, 22 Oct 2016 23:40:44 -0700 (PDT) Received: from Zany.attlocal.net (76-225-50-170.lightspeed.bkfdca.sbcglobal.net. [76.225.50.170]) by smtp.gmail.com with ESMTPSA id t57sm3548067otd.10.2016.10.22.23.40.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 22 Oct 2016 23:40:43 -0700 (PDT) From: Thomas Turner To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Oct 2016 23:40:42 -0700 Message-Id: <1477204842-22572-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 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]. This test also prints out the all the contents of the original and cloned AVPackets. Signed-off-by: Thomas Turner --- libavcodec/Makefile | 3 +- libavcodec/tests/avpacket.c | 303 ++++++++++++++++++++++++++++++++++++++++++++ tests/fate/libavcodec.mak | 5 + 3 files changed, 310 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..752cf3c --- /dev/null +++ b/libavcodec/tests/avpacket.c @@ -0,0 +1,303 @@ +/* + * 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" + + + + +#define AVPACKET_FIELDS \ + X(static AVBufferRef*, buf, "%p") \ + X(static int64_t, pts, "%" PRId64) \ + X(static int64_t, dts, "%" PRId64) \ + X(static uint8_t*, data, "%p") \ + X(static int, size, "%d") \ + X(static int, stream_index, "%d") \ + X(static int, flags, "%d") \ + X(static AVPacketSideData*, side_data, "%p") \ + X(static int, side_data_elems, "%d") \ + X(static int64_t, duration, "%" PRId64) \ + X(static int64_t, pos, "%" PRId64) + +#define AVBUFFERREF_FIELDS \ + Y(static AVBuffer*, buffer, "%p") \ + Y(static uint8_t*, data, "%p") \ + Y(static int, size, "%d") + +#define AVPACKETSIDEDATA_FIELDS \ + Z(static uint8_t*, data, "%p") \ + Z(static int, size, "%d") \ + Z(static enum AVPacketSideDataType, type, "%d") + + + + +#define AV_MESSAGE_1(format, name, p1, p2) \ + do { \ + const char* str = "cloned variable \"%s\" equals " format \ + " but should be " format "\n"; \ + av_log(NULL, AV_LOG_ERROR, str, #name, p2->name, p1->name ); \ + } while (0) + +#define AV_MESSAGE_2(name, p1, p2) \ + do { \ + const char* str = "contents of cloned variable " \ + "%s equals \"%.*s\"\nbut should be \"%.*s\"\n"; \ + av_log(NULL, AV_LOG_ERROR, str, #name, p1->size, \ + p2->data, p1->size, p1->data); \ + } while(0) + +#define AV_MESSAGE_3(name) \ + do { \ + const char* str = "error! did not attempt to compare " \ + "contents of \"%s\" variable\n"; \ + av_log(NULL, AV_LOG_ERROR, str, #name); \ + } while(0) + +#define AV_MESSAGE_4(string) \ + do { av_log(NULL, AV_LOG_INFO, "%s", string); } while(0) + + + + +#define COMPARE(a, b) ( ((a) == (b)) ? 1 : 0 ) + + + +static void print_AVPacketSideData(AVPacketSideData* sdata) +{ + if(!sdata) + return; +#define Z(type, name, format) \ + av_log(NULL, AV_LOG_INFO, "%*s: " format "\t\n", \ + 25 , #name, sdata->name); \ + \ + if ((strcmp(#name, "data") == 0) \ + && (sdata->size > 0) \ + && sdata->data) \ + av_log(NULL, AV_LOG_INFO, "%*s" "\"%.*s\"\n", 29, "", \ + sdata->size, sdata->data); + + AVPACKETSIDEDATA_FIELDS +#undef Z +} + +static void print_AVBufferRef(AVBufferRef* refdata) +{ + if(!refdata) + return; +#define Y(type, name, format) \ + av_log(NULL, AV_LOG_INFO, "%*s: " format "\t\n", \ + 27, #name, refdata->name); \ + if ((strcmp(#name, "data") == 0) \ + && (refdata->size > 0) \ + && refdata->data) \ + av_log(NULL, AV_LOG_INFO, "%*s" "\"%.*s\"\n", 31, "", \ + refdata->size, refdata->data); + + AVBUFFERREF_FIELDS +#undef Y +} + +static void print_AVPacket(AVPacket* p) +{ + if(!p) + return; + + AV_MESSAGE_4("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"); + AV_MESSAGE_4("AVPacket contents:\n\n"); + +#define X(type, name, format) \ + av_log(NULL, AV_LOG_INFO, "%*s: " format "\n", 15, #name, p->name); \ + \ + if(strcmp(#name, "buf") == 0) \ + print_AVBufferRef(p->buf); \ + else if (strcmp(#name, "side_data") == 0) \ + print_AVPacketSideData(p->side_data); \ + if ((strcmp(#name, "data") == 0) \ + && (p->size > 0) \ + && p->data) \ + av_log(NULL, AV_LOG_INFO, "%*s" "\"%.*s\"\n", 19, "", \ + p->size, p->data); + + AVPACKET_FIELDS +#undef X + + AV_MESSAGE_4("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"); +} + +static void compare_AVPacketsSideData(AVPacketSideData* sdata1, + AVPacketSideData* sdata2) +{ + if(!sdata1 || !sdata2) + return; + + AV_MESSAGE_4("Comparing AVPacketSideData data memebers...\n"); +#define Z(type, name, format) \ + \ + if (strcmp(#name, "data") == 0) { \ + if((sdata1->size > 0) && (sdata1->size == sdata2->size)) { \ + if(memcmp(sdata1->data, sdata2->data, sdata1->size)) { \ + AV_MESSAGE_2(name, sdata1, sdata2); \ + } \ + } \ + else { \ + AV_MESSAGE_3(name); \ + } \ + } \ + else { \ + if(!COMPARE(sdata1->name, sdata2->name)) { \ + AV_MESSAGE_1(format, name, sdata1, sdata2); \ + } \ + } + AVPACKETSIDEDATA_FIELDS +#undef Z +} + +static void compare_AVPackets(AVPacket* p1, AVPacket* p2) +{ + if(!p1 || !p2) + return; + + AV_MESSAGE_4("Comparing AVPacket data memebers...\n"); +#define X(type, name, format) \ + if(strcmp(#name, "buf") == 0) { \ + \ + } else if (strcmp(#name, "side_data") == 0) { \ + compare_AVPacketsSideData(p1->side_data,p2->side_data); \ + AV_MESSAGE_4("Continue comparing AVPacket data memebers... \n"); \ + } else if (strcmp(#name, "data") == 0) { \ + if((p1->size > 0) && (p1->size == p2->size)) { \ + if(memcmp(p1->data, p2->data, p1->size)) { \ + AV_MESSAGE_2(name, p1, p2); \ + } \ + } \ + else { \ + AV_MESSAGE_3(name); \ + } \ + } \ + else { \ + if(!COMPARE(p1->name, p2->name)) { \ + AV_MESSAGE_1(format, name, p1, p2); \ + } \ + } + AVPACKET_FIELDS + +#undef X +} + +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*/ + compare_AVPackets(&avpkt, avpkt_clone); + AV_MESSAGE_4("Done comparing\n"); + + /* view AVPacket contents */ + AV_MESSAGE_4("Viewing AVPackets...\n"); + print_AVPacket(&avpkt); + print_AVPacket(avpkt_clone); + + /* 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