From patchwork Tue Oct 18 20:38:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Turner X-Patchwork-Id: 1059 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp840905vsd; Tue, 18 Oct 2016 13:55:03 -0700 (PDT) X-Received: by 10.28.180.70 with SMTP id d67mr14044696wmf.115.1476824103026; Tue, 18 Oct 2016 13:55:03 -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 cg3si50673330wjb.86.2016.10.18.13.54.59; Tue, 18 Oct 2016 13:55:02 -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 9E7B668925E; Tue, 18 Oct 2016 23:54:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76CB768921B for ; Tue, 18 Oct 2016 23:54:47 +0300 (EEST) Received: by mail-pf0-f193.google.com with SMTP id r16so382645pfg.3 for ; Tue, 18 Oct 2016 13:54:50 -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=XWQaCG9gshQuz8VacLNT7Jzr1etHwpNR2/1a8dHXyN0=; b=TUrVbrNnXfg3W2bmMYBlMnj2A8+ZyM7KojpTPOAI8+n4KQ9Q4A4l1CIUmQP2KZEoQs tgaNpT7XpOHBYijtLuY88z/YRClqWC7DypDLPCAcSwK2Hs0vFnoKx+pX6FZkuKXViJhZ Y0BFpouJNpWawVGKNWh3bWbY3rZQuiyuD8fFXzJTeBeQqxCYFTvS4zWo5wclh0DoSB/c U8f663ehXcleunWuXXZMwFrdT6vEOTxpZmhc+AjEoGh9WCYshfe9tyb1430PzU1IM4Uk OBnQgAhNgTLO+M6dvTk7w/klYn9/gTo0yeQOZiaUsKNaG0Dedf9QpJzqVQK6jRjV7ZKg chyA== 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=XWQaCG9gshQuz8VacLNT7Jzr1etHwpNR2/1a8dHXyN0=; b=R8xPZuGUFWJ3/JmLknKBQLA9lQxkdKzHuukBAQ/NQ3k6+WDcZonoV4tyDTchh4gJeJ qNQ0Qy1T8DZ/XmHwEyGDXQFYMkExStFwk9CJ91rhOgtSJvycNdPI61xYtrkfasHvoRQW eRo2zv3btmthwODWSjfnGRYXLT3aI+WngKO9OKLjdm/GP1Qu/mKedicBWs5OZtaDPTWU HsNoVz29B8MlHOjzbYuBhq4LsS1Isl+F9BfgJEKkrMHU3HuJZxxXugwBbA+lNiVS/NU5 ljyQny15IXCQOfeyxPuJMh3ZPeonO/aOb6gTN/hX+w2Tj9/PyNxQXCq6Nj5Q+i0ohCaJ n0yQ== X-Gm-Message-State: AA6/9RkZM8rB8g2LKeDITbImk+8wDd52z2/m5N3cgg6NyFdYZn+JWE+qFPpGVHdYhnrPcg== X-Received: by 10.98.153.204 with SMTP id t73mr3981896pfk.144.1476823111528; Tue, 18 Oct 2016 13:38:31 -0700 (PDT) Received: from Zany.domain.actdsltmp ([47.136.133.132]) by smtp.gmail.com with ESMTPSA id 136sm58001545pfu.87.2016.10.18.13.38.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Oct 2016 13:38:30 -0700 (PDT) From: Thomas Turner X-Google-Original-From: Thomas Turner To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2016 13:38:27 -0700 Message-Id: <1476823107-5711-1-git-send-email-thomastdt@gmail.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" Improved code coverage for libavcodec Function(s) Tested: av_packet_clone() Signed-off-by: Thomas Turner --- libavcodec/Makefile | 3 +- libavcodec/tests/avpacket.c | 254 ++++++++++++++++++++++++++++++++++++++++++++ tests/fate/libavcodec.mak | 5 + 3 files changed, 261 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..67ec71b --- /dev/null +++ b/libavcodec/tests/avpacket.c @@ -0,0 +1,254 @@ +/* + * 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, 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); + } + else if(index == 1){ + val = snprintf(buffer, buffer_size, "\"%s\"", avpkt.data); + } + 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); + } + + /* 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 ? (char*)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 + ); + +} + +static int compare_av_packet(AVPacket* p1, AVPacket* p2) +{ + /* compare data */ + + if(p1->size != p2->size){ + fprintf(stderr, "size\n"); + goto fail; + } + if(strncmp(p1->data, p2->data, p1->size) != 0){ + fprintf(stderr, "data\n"); + goto fail; + } + if(p1->pts != p2->pts){ + fprintf(stderr, "pts\n"); + goto fail; + } + if(p1->dts != p2->dts){ + fprintf(stderr, "dts\n"); + goto fail; + } + if(p1->stream_index != p2->stream_index){ + fprintf(stderr, "stream_index\n"); + goto fail; + } + if(p1->flags != p2->flags){ + fprintf(stderr, "flags\n"); + goto fail; + } + if(p1->side_data_elems != p2->side_data_elems){ + fprintf(stderr, "side_data_elems\n"); + goto fail; + } + if(p1->duration != p2->duration){ + fprintf(stderr, "duration\n"); + goto fail; + } + if(p1->pos != p2->pos){ + fprintf(stderr, "pos\n"); + goto fail; + } + + /*compare reference to the data buffer contents*/ + + if(p2->buf->size != (p2->size + AV_INPUT_BUFFER_PADDING_SIZE)){ + fprintf(stderr, "buf->size\n"); + goto fail; + } + if(strncmp(p1->data, p2->buf->data, p1->size) != 0){ + fprintf(stderr, "buf->data\n"); + goto fail; + } + + return 0; + +fail: + return 1; +} + +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){ + if(compare_av_packet(&avpkt, avpkt_clone)){ + log_avpacket(avpkt, "Original Packet info"); + log_avpacket(*avpkt_clone, "Cloned Packet info"); + av_log(NULL, AV_LOG_ERROR, "\n\nfailed av_packet_clone test.\n"); + } + } + 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