On 10/24/2018 3:02 PM, jos...@ob-encoder.com wrote: > From: Josh de Kock <jos...@obe.tv> > > This test ensures that you are able to send N number of slice NALUs in slice > threaded mode to be decoded simultaneously > --- > Actually send fix. > > tests/api/Makefile | 1 + > tests/api/api-h264-slice-test.c | 221 +++++++++++++++++++++++ > tests/fate/api.mak | 4 + > tests/ref/fate/api-h264-slice | 309 ++++++++++++++++++++++++++++++++ > 4 files changed, 535 insertions(+) > create mode 100644 tests/api/api-h264-slice-test.c > create mode 100644 tests/ref/fate/api-h264-slice > > diff --git a/tests/api/Makefile b/tests/api/Makefile > index 759dd9d243..b5c4ccae23 100644 > --- a/tests/api/Makefile > +++ b/tests/api/Makefile > @@ -1,5 +1,6 @@ > APITESTPROGS-$(call ENCDEC, FLAC, FLAC) += api-flac > APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264 > +APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264-slice > APITESTPROGS-yes += api-seek > APITESTPROGS-yes += api-codec-param > APITESTPROGS-$(call DEMDEC, H263, H263) += api-band > diff --git a/tests/api/api-h264-slice-test.c b/tests/api/api-h264-slice-test.c > new file mode 100644 > index 0000000000..961bdfbaf3 > --- /dev/null > +++ b/tests/api/api-h264-slice-test.c > @@ -0,0 +1,221 @@ > +/* > + * Copyright (c) 2001 Fabrice Bellard > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > copy > + * of this software and associated documentation files (the "Software"), to > deal > + * in the Software without restriction, including without limitation the > rights > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > + * copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > FROM, > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > + * THE SOFTWARE. > + */ > + > +#define MAX_SLICES 8 > + > +// ./fate 2 ./crew_cif out.y4m > + > +#include "config.h" > + > +#include <stdbool.h> > +#include <stdio.h> > +#include <stdlib.h> > +#include <string.h> > + > +#if HAVE_UNISTD_H > +#include <unistd.h> > +#endif > +#if HAVE_IO_H > +#include <io.h> > +#endif > +#include <sys/types.h> > +#include <sys/stat.h> > +#include <fcntl.h> > + > +#include "libavformat/network.h" > +#include "libavcodec/avcodec.h" > +#include "libavutil/pixdesc.h" > +#include "libavutil/hash.h" > + > +static int header = 0; > + > +static void decode(AVCodecContext *dec_ctx, AVFrame *frame, > + AVPacket *pkt) > +{ > + static uint64_t frame_cnt = 0; > + int ret; > + > + 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); > + } > + > + while (ret >= 0) { > + const AVPixFmtDescriptor *desc; > + char *sum; > + struct AVHashContext *hash; > + > + ret = avcodec_receive_frame(dec_ctx, frame); > + if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) { > + return; > + } else if (ret < 0) { > + fprintf(stderr, "Error during decoding: %s\n", av_err2str(ret)); > + exit(1); > + } > + > + if (!header) { > + printf( > + "#format: frame checksums\n" > + "#version: 2\n" > + "#hash: MD5\n" > + "#tb 0: 1/30\n" > + "#media_type 0: video\n" > + "#codec_id 0: rawvideo\n" > + "#dimensions 0: 352x288\n" > + "#sar 0: 128/117\n" > + "#stream#, dts, pts, duration, size, hash\n"); > + header = 1; > + } > + desc = av_pix_fmt_desc_get(dec_ctx->pix_fmt); > + av_hash_alloc(&hash, "md5");
Unchecked allocation. (Also, kinda late for this, but adler32 would have been much faster than md5). > + av_hash_init(hash); > + sum = av_mallocz(av_hash_get_size(hash) * 2 + 1); Ditto. You could also instead keep sum in stack, using AV_HASH_MAX_SIZE * 2 + 1 as fixed size. The av_hash_final_*() functions are guaranteed to 0-terminate the strings, so it's safe to print without having to zero the buffer every iteration. > + > + for (int i = 0; i < frame->height; i++) > + av_hash_update(hash, &frame->data[0][i * frame->linesize[0]], > frame->width); > + for (int i = 0; i < frame->height >> desc->log2_chroma_h; i++) > + av_hash_update(hash, &frame->data[1][i * frame->linesize[1]], > frame->width >> desc->log2_chroma_w); > + for (int i = 0; i < frame->height >> desc->log2_chroma_h; i++) > + av_hash_update(hash, &frame->data[2][i * frame->linesize[2]], > frame->width >> desc->log2_chroma_w); > + > + av_hash_final_hex(hash, sum, av_hash_get_size(hash) * 2 + 1); > + printf("0, %10"PRId64", %10"PRId64", 1, %8d, %s\n", > + frame_cnt, frame_cnt, > + (frame->width * frame->height + 2 * (frame->height >> > desc->log2_chroma_h) * (frame->width >> desc->log2_chroma_w)), sum); > + frame_cnt += 1; > + av_free(hash); AVHashContext must be freed with av_hash_freep(), not a simple av_free(). I already changed it since it was making the test fail under Valgrind, for that matter. > + av_free(sum); > + } > +} > + > +int main(int argc, char **argv) > +{ > + const AVCodec *codec; > + AVCodecContext *c = NULL; > + AVFrame *frame; > + unsigned int threads; > + AVPacket *pkt; > + FILE *fd; > + char nal[MAX_SLICES * UINT16_MAX + AV_INPUT_BUFFER_PADDING_SIZE]; > + int nals = 0; > + char *p = nal; > + > + if (argc < 4) { > + fprintf(stderr, "Usage: %s <threads> <input file> <output file>\n", > argv[0]); > + exit(1); > + } > + > + if (!(threads = strtoul(argv[1], NULL, 0))) > + threads = 1; > + else if (threads > MAX_SLICES) > + threads = MAX_SLICES; > + > +#ifdef _WIN32 > + setmode(fileno(stdout), O_BINARY); > +#endif > + > + if (!(pkt = av_packet_alloc())) > + exit(1); > + > + if (!(codec = avcodec_find_decoder(AV_CODEC_ID_H264))) { > + fprintf(stderr, "Codec not found\n"); > + exit(1); > + } > + > + if (!(c = avcodec_alloc_context3(codec))) { > + fprintf(stderr, "Could not allocate video codec context\n"); > + exit(1); Instead of using exit(1) all around, you should use goto and do some cleaning to abort gracefully in case of error. > + } > + > + c->width = 352; > + c->height = 288; > + > + c->flags2 |= AV_CODEC_FLAG2_CHUNKS; > + c->thread_type = FF_THREAD_SLICE; > + c->thread_count = threads; > + > + if (avcodec_open2(c, codec, NULL) < 0) { > + fprintf(stderr, "Could not open codec\n"); > + exit(1); > + } > + > +#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); > + } > +#else > + fprintf(stderr, "WARN: not using threads, only checking decoding slice > NALUs\n"); > +#endif > + > + if (!(frame = av_frame_alloc())) { > + fprintf(stderr, "Could not allocate video frame\n"); > + exit(1); > + } > + > + if (!(fd = fopen(argv[2], "rb"))) { > + fprintf(stderr, "Couldn't open NALU file: %s\n", argv[2]); > + exit(1); > + } > + > + 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)) > + break; > + size = ntohs(size); > + ret = fread(p, 1, size, fd); > + if (ret < 0 || ret != size) { > + perror("Couldn't read data"); > + exit(1); > + } > + p += ret; > + > + if (++nals >= threads) { > + pkt->data = nal; > + pkt->size = p - nal; > + decode(c, frame, pkt); Make decode() return int, so you can look for AVERROR values. > + memset(nal, 0, MAX_SLICES * UINT16_MAX + > AV_INPUT_BUFFER_PADDING_SIZE); > + nals = 0; > + p = nal; > + } > + } > + > + if (nals) { > + pkt->data = nal; > + pkt->size = p - nal; > + decode(c, frame, pkt); > + } > + > + decode(c, frame, NULL); > + > + fclose(fd); > + avcodec_free_context(&c); > + av_frame_free(&frame); > + av_packet_free(&pkt); > + > + return 0; > +} _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel