From patchwork Mon Oct 29 13:57:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: joshdk@ob-encoder.com X-Patchwork-Id: 10839 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1B7B944D5DA for ; Mon, 29 Oct 2018 16:05:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8571968A655; Mon, 29 Oct 2018 16:05:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8723A68A642 for ; Mon, 29 Oct 2018 16:05:00 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id 74-v6so613202wrb.13 for ; Mon, 29 Oct 2018 07:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=UXWif9GudriJ7u8QWeo1I9K7HoRYjkfSE/7rPClKJr8=; b=N/WpMGj4IVBGj7p9WScog6IJnwDqVV9d0ESJj3nPPJ8PiDUQA+xzHNm+TEc8pwCGEQ tpqUHSCA83hhLZqwE9B8QsPM1lyUkOpVbecJMwypFGceSVJNMvMHmDu9LtUnR7eDvT2t Xv9jrwsulNFOhrybJwxTq2u37IJS34bACOoLj/di0878yNN8JkfDw+O9qI1QVbd+QOYz feYxzAuuakrnDDW921RV6HRfpRAf16+UoYjQh0u9KKm9htN8RCgS1qK8k6G/1zxTm+vw ++mIAxfZRz4egqhystWfhowvpcBaee6q3JiiUD0d4uQFMMDVe4Z7aQ/SNPsoOF5lQ1IU To6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UXWif9GudriJ7u8QWeo1I9K7HoRYjkfSE/7rPClKJr8=; b=HxoSaoyhbHs1s4RcY1CAylzula7Ma6Q1g7+e5OAyR4ZG3JjNpUjyHT/bG2v4JZ/cYM r8136dcK4HMRYA4o4cZy70Ecg9fOBUBx249aROphkSYsmPOltQ0eEBpve3icJrk2KSJ6 cw9BRwIeyQGyt+YaeER5Vjh89dv4GKkslhzkqBpLiQyI62yUCUsJx76AGgmIGVNPhfKv puoy/OJKGj6JaflaqdWYiMi5TSCVQYXevA889PTady/Y0IkISEWqTd89dc5H5dOqtSWP pewcrow8khZ+9Bzjc38vq0y6EA3tmaMnLeuzUeHZu0aZ7cHdc68HCxFIZier99bC/7HD wchQ== X-Gm-Message-State: AGRZ1gLc2og/8RMB0Fhwq2ik6rhYDnyovBwQvjfg4E2uOPpREOcvNpdc lCjumo3bh3yq/LixDDcKHECWkyiuLXU= X-Google-Smtp-Source: AJdET5cHFb5M4iEkazi0CU7jFC9T3xcnfsKd9U8fFhk7LFy2tBW64vx42K38GIua9i1PtATwzIMsAQ== X-Received: by 2002:a5d:49c6:: with SMTP id t6-v6mr11476424wrs.317.1540821479629; Mon, 29 Oct 2018 06:57:59 -0700 (PDT) Received: from localhost.localdomain ([31.24.218.220]) by smtp.gmail.com with ESMTPSA id l10-v6sm2999405wru.13.2018.10.29.06.57.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 06:57:58 -0700 (PDT) From: joshdk@ob-encoder.com X-Google-Original-From: joshdk@obe.tv To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Oct 2018 13:57:57 +0000 Message-Id: <20181029135757.15077-1-joshdk@obe.tv> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] fate/api-h264-slice-test: use cleaner error handling 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: Josh de Kock MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Josh de Kock --- tests/api/api-h264-slice-test.c | 74 +++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/tests/api/api-h264-slice-test.c b/tests/api/api-h264-slice-test.c index 57e7dc79c3..08d5d57941 100644 --- a/tests/api/api-h264-slice-test.c +++ b/tests/api/api-h264-slice-test.c @@ -48,7 +48,7 @@ static int header = 0; -static void decode(AVCodecContext *dec_ctx, AVFrame *frame, +static int decode(AVCodecContext *dec_ctx, AVFrame *frame, AVPacket *pkt) { static uint64_t frame_cnt = 0; @@ -57,20 +57,20 @@ static void decode(AVCodecContext *dec_ctx, AVFrame *frame, ret = avcodec_send_packet(dec_ctx, pkt); if (ret < 0) { fprintf(stderr, "Error sending a packet for decoding: %s\n", av_err2str(ret)); - exit(1); + return ret; } while (ret >= 0) { const AVPixFmtDescriptor *desc; - char *sum; + char sum[AV_HASH_MAX_SIZE * 2 + 1]; struct AVHashContext *hash; ret = avcodec_receive_frame(dec_ctx, frame); if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) { - return; + return 0; } else if (ret < 0) { fprintf(stderr, "Error during decoding: %s\n", av_err2str(ret)); - exit(1); + return ret; } if (!header) { @@ -87,9 +87,10 @@ static void decode(AVCodecContext *dec_ctx, AVFrame *frame, header = 1; } desc = av_pix_fmt_desc_get(dec_ctx->pix_fmt); - av_hash_alloc(&hash, "md5"); + if ((ret = av_hash_alloc(&hash, "md5")) < 0) { + return ret; + } av_hash_init(hash); - sum = av_mallocz(av_hash_get_size(hash) * 2 + 1); for (int i = 0; i < frame->height; i++) av_hash_update(hash, &frame->data[0][i * frame->linesize[0]], frame->width); @@ -104,8 +105,8 @@ static void decode(AVCodecContext *dec_ctx, AVFrame *frame, (frame->width * frame->height + 2 * (frame->height >> desc->log2_chroma_h) * (frame->width >> desc->log2_chroma_w)), sum); frame_cnt += 1; av_hash_freep(&hash); - av_free(sum); } + return 0; } int main(int argc, char **argv) @@ -117,12 +118,12 @@ int main(int argc, char **argv) AVPacket *pkt; FILE *fd; char nal[MAX_SLICES * UINT16_MAX + AV_INPUT_BUFFER_PADDING_SIZE]; - int nals = 0; + int nals = 0, ret = 0; char *p = nal; if (argc < 4) { fprintf(stderr, "Usage: %s \n", argv[0]); - exit(1); + return -1; } if (!(threads = strtoul(argv[1], NULL, 0))) @@ -134,17 +135,19 @@ int main(int argc, char **argv) setmode(fileno(stdout), O_BINARY); #endif - if (!(pkt = av_packet_alloc())) - exit(1); + if (!(pkt = av_packet_alloc())) { + return -1; + } if (!(codec = avcodec_find_decoder(AV_CODEC_ID_H264))) { fprintf(stderr, "Codec not found\n"); - exit(1); + return -1; } if (!(c = avcodec_alloc_context3(codec))) { fprintf(stderr, "Could not allocate video codec context\n"); - exit(1); + ret = -1; + goto err_avctx; } c->width = 352; @@ -154,15 +157,16 @@ int main(int argc, char **argv) c->thread_type = FF_THREAD_SLICE; c->thread_count = threads; - if (avcodec_open2(c, codec, NULL) < 0) { + if ((ret = avcodec_open2(c, codec, NULL)) < 0) { fprintf(stderr, "Could not open codec\n"); - exit(1); + goto err_frame; } #if HAVE_THREADS if (c->active_thread_type != FF_THREAD_SLICE) { fprintf(stderr, "Couldn't activate slice threading: %d\n", c->active_thread_type); - exit(1); + ret = -1; + goto err_frame; } #else fprintf(stderr, "WARN: not using threads, only checking decoding slice NALUs\n"); @@ -170,34 +174,36 @@ int main(int argc, char **argv) if (!(frame = av_frame_alloc())) { fprintf(stderr, "Could not allocate video frame\n"); - exit(1); + ret = -1; + goto err_frame; } if (!(fd = fopen(argv[2], "rb"))) { fprintf(stderr, "Couldn't open NALU file: %s\n", argv[2]); - exit(1); + ret = -1; + goto err_fopen; } while(1) { uint16_t size = 0; - ssize_t ret = fread(&size, 1, sizeof(uint16_t), fd); - if (ret < 0) { - perror("Couldn't read size"); - exit(1); - } else if (ret != sizeof(uint16_t)) + size_t ret = fread(&size, 1, sizeof(uint16_t), fd); + if (ret != sizeof(uint16_t)) break; size = ntohs(size); ret = fread(p, 1, size, fd); - if (ret < 0 || ret != size) { + if (ret != size) { perror("Couldn't read data"); - exit(1); + goto err; } p += ret; if (++nals >= threads) { + int decret = 0; pkt->data = nal; pkt->size = p - nal; - decode(c, frame, pkt); + if ((decret = decode(c, frame, pkt)) < 0) { + goto err; + } memset(nal, 0, MAX_SLICES * UINT16_MAX + AV_INPUT_BUFFER_PADDING_SIZE); nals = 0; p = nal; @@ -207,15 +213,21 @@ int main(int argc, char **argv) if (nals) { pkt->data = nal; pkt->size = p - nal; - decode(c, frame, pkt); + if ((ret = decode(c, frame, pkt)) < 0) { + goto err; + } } - decode(c, frame, NULL); + ret = decode(c, frame, NULL); +err: fclose(fd); - avcodec_free_context(&c); +err_fopen: av_frame_free(&frame); +err_frame: + avcodec_free_context(&c); +err_avctx: av_packet_free(&pkt); - return 0; + return ret; }