Hi ludmila did you see my reply on the ML (its also below)? as you didnt reply ...
On Tue, Aug 11, 2015 at 03:31:05AM +0200, Michael Niedermayer wrote:
> On Tue, Jul 28, 2015 at 09:54:06PM +0300, Ludmila Glinskih wrote:
> > Works only for flv, h263 and huffyuv decoders, for video with yuv420p pixel
> > format.
> > Makes only one pass through the file (this should be changed to two passes)
> > ---
> > tests/api/Makefile | 1 +
> > tests/api/api-band-test.c | 229
> > ++++++++++++++++++++++++++++++++++++++++++++++
> > tests/fate/api.mak | 6 ++
> > 3 files changed, 236 insertions(+)
> > create mode 100644 tests/api/api-band-test.c
> >
> > diff --git a/tests/api/Makefile b/tests/api/Makefile
> > index 704987e..46fccb8 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, H263, H263) += api-band
> > APITESTPROGS += $(APITESTPROGS-yes)
> >
> > APITESTOBJS := $(APITESTOBJS:%=$(APITESTSDIR)%)
> > $(APITESTPROGS:%=$(APITESTSDIR)/%-test.o)
> > diff --git a/tests/api/api-band-test.c b/tests/api/api-band-test.c
> > new file mode 100644
> > index 0000000..075b781
> > --- /dev/null
> > +++ b/tests/api/api-band-test.c
> > @@ -0,0 +1,229 @@
> > +/*
> > + * Copyright (c) 2015 Ludmila Glinskih
> > + *
> > + * 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.
> > + */
> > +
> > +/**
> > + * draw_horiz_band test.
> > + */
> > +
> > +#include "libavutil/adler32.h"
> > +#include "libavcodec/avcodec.h"
> > +#include "libavformat/avformat.h"
> > +#include "libavutil/imgutils.h"
> > +
> > +uint8_t *slice_byte_buffer;
> > +uint8_t slice_byte_buffer_size;
> > +int draw_horiz_band_called;
> > +
> > +static void draw_horiz_band(AVCodecContext *ctx, const AVFrame *fr, int
> > offset[4],
> > + int slice_position, int type, int height)
> > +{
> > + int i;
> > +
> > + draw_horiz_band_called = 1;
> > +
> > + if (!strcmp(av_get_pix_fmt_name(ctx->pix_fmt), "yuv420p")) {
> > + for (i = 0; i < height; i++) {
> > + memcpy(slice_byte_buffer + ctx->width * slice_position + i *
> > ctx->width,
> > + fr->data[0] + offset[0] + i * fr->linesize[0],
> > ctx->width);
> > + }
> > + for (i = 0; i < height / 2; i++) {
> > + memcpy(slice_byte_buffer + ctx->width * ctx->height +
> > ctx->width * slice_position / 4 + i * ctx->width / 2,
> > + fr->data[1] + offset[1] + i * fr->linesize[1],
> > ctx->width / 2);
> > + }
> > + for (i = 0; i < height / 2; i++) {
> > + memcpy(slice_byte_buffer + 5 * ctx->width * ctx->height / 4 +
> > ctx->width * slice_position / 4 + i * ctx->width / 2,
> > + fr->data[2] + offset[2] + i * fr->linesize[2],
> > ctx->width / 2);
> > + }
> > + }
> > +
> > + else if (!strcmp(av_get_pix_fmt_name(ctx->pix_fmt), "yuv422p")) {
> > + for (i = 0; i < height; i++) {
> > + memcpy(slice_byte_buffer + ctx->width * slice_position + i *
> > ctx->width,
> > + fr->data[0] + offset[0] + i * fr->linesize[0],
> > ctx->width);
> > + }
> > + for (i = 0; i < height; i++) {
> > + memcpy(slice_byte_buffer + ctx->width * ctx->height +
> > ctx->width * slice_position / 2 + i * ctx->width / 2,
> > + fr->data[1] + offset[1] + i * fr->linesize[1],
> > ctx->width / 2);
> > + }
> > + for (i = 0; i < height; i++) {
> > + memcpy(slice_byte_buffer + 3 * ctx->width * ctx->height / 2 +
> > ctx->width * slice_position / 2 + i * ctx->width / 2,
> > + fr->data[2] + offset[2] + i * fr->linesize[2],
> > ctx->width / 2);
> > + }
>
> This should use log2_chroma_w / log2_chroma_h from AVPixFmtDescriptor
> (should be simpler)
>
>
> > + }
> > +}
> > +
> > +static int video_decode(const char *input_filename)
> > +{
> > + AVCodec *codec = NULL;
> > + AVCodecContext *origin_ctx = NULL, *ctx= NULL;
> > + uint8_t *byte_buffer = NULL;
> > + AVFrame *fr = NULL;
> > + AVPacket pkt;
> > + AVFormatContext *fmt_ctx = NULL;
> > + int number_of_written_bytes;
> > + int video_stream;
> > + int got_frame = 0;
> > + int byte_buffer_size;
> > + int result;
> > + int end_of_stream = 0;
> > +
> > + draw_horiz_band_called = 0;
> > +
> > + result = avformat_open_input(&fmt_ctx, input_filename, NULL, NULL);
> > + if (result < 0) {
> > + av_log(NULL, AV_LOG_ERROR, "Can't open file\n");
> > + return result;
> > + }
> > +
> > + result = avformat_find_stream_info(fmt_ctx, NULL);
> > + if (result < 0) {
> > + av_log(NULL, AV_LOG_ERROR, "Can't get stream info\n");
> > + return result;
> > + }
> > +
> > + video_stream = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1,
> > -1, NULL, 0);
> > + if (video_stream < 0) {
> > + av_log(NULL, AV_LOG_ERROR, "Can't find video stream in input
> > file\n");
> > + return -1;
> > + }
> > +
> > + origin_ctx = fmt_ctx->streams[video_stream]->codec;
> > +
> > + codec = avcodec_find_decoder(origin_ctx->codec_id);
> > + if (!codec) {
> > + av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n");
> > + return -1;
> > + }
> > +
> > + ctx = avcodec_alloc_context3(codec);
> > + if (!ctx) {
> > + av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n");
> > + return AVERROR(ENOMEM);
> > + }
> > +
> > + result = avcodec_copy_context(ctx, origin_ctx);
> > + if (result) {
> > + av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n");
> > + return result;
> > + }
> > +
> > + ctx->draw_horiz_band = draw_horiz_band;
> > + ctx->thread_count = 1;
> > +
> > + result = avcodec_open2(ctx, codec, NULL);
> > + if (result < 0) {
> > + av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n");
> > + return result;
> > + }
> > +
> > + fr = av_frame_alloc();
> > + if (!fr) {
> > + av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n");
> > + return AVERROR(ENOMEM);
> > + }
> > +
> > + if (strcmp(codec->name, "flv") && strcmp(codec->name, "mpeg4") &&
> > strcmp(codec->name, "huffyuv")) {
> > + av_log(NULL, AV_LOG_ERROR, "Wrong codec\n");
> > + return -1;
> > + }
> > +
> > + if (strcmp(av_get_pix_fmt_name(ctx->pix_fmt), "yuv420p") &&
> > strcmp(av_get_pix_fmt_name(ctx->pix_fmt), "yuv422p")) {
> > + av_log(NULL, AV_LOG_ERROR, "Wrong pixel format\n");
> > + return -1;
> > + }
> > +
> > + byte_buffer_size = av_image_get_buffer_size(ctx->pix_fmt, ctx->width,
> > ctx->height, 32);
> > + byte_buffer = av_malloc(byte_buffer_size);
>
> > + slice_byte_buffer = av_malloc(10 * byte_buffer_size);
> > + memset(slice_byte_buffer, 0, byte_buffer_size);
>
> missing malloc failure check
>
>
> > + slice_byte_buffer_size = byte_buffer_size;
> > + if (!byte_buffer) {
> > + av_log(NULL, AV_LOG_ERROR, "Can't allocate buffer\n");
> > + return AVERROR(ENOMEM);
> > + }
> > +
> > + av_init_packet(&pkt);
> > + do {
> > + if (!end_of_stream) {
> > + if (av_read_frame(fmt_ctx, &pkt) < 0) {
> > + end_of_stream = 1;
> > + }
> > + }
> > + if (end_of_stream) {
> > + pkt.data = NULL;
> > + pkt.size = 0;
> > + }
> > + if (pkt.stream_index == video_stream || end_of_stream) {
> > + got_frame = 0;
> > + result = avcodec_decode_video2(ctx, fr, &got_frame, &pkt);
> > + if (result < 0) {
> > + av_log(NULL, AV_LOG_ERROR, "Error decoding frame\n");
> > + return result;
> > + }
> > + if (got_frame) {
> > + number_of_written_bytes =
> > av_image_copy_to_buffer(byte_buffer, byte_buffer_size,
> > + (const uint8_t* const *)fr->data,
> > (const int*) fr->linesize,
> > + ctx->pix_fmt, ctx->width,
> > ctx->height, 1);
> > + if (number_of_written_bytes < 0) {
> > + av_log(NULL, AV_LOG_ERROR, "Can't copy image to
> > buffer\n");
> > + return number_of_written_bytes;
> > + }
> > + if (draw_horiz_band_called == 0) {
> > + av_log(NULL, AV_LOG_ERROR, "draw_horiz_band haven't
> > been called!\n");
> > + return -1;
> > + }
> > + if (av_adler32_update(0, (const uint8_t*)byte_buffer,
> > number_of_written_bytes) !=
> > + av_adler32_update(0, (const
> > uint8_t*)slice_byte_buffer, number_of_written_bytes)) {
> > + av_log(NULL, AV_LOG_ERROR, "Decoded frames with and
> > without draw_horiz_band are not the same!\n");
> > + return -1;
> > + }
> > + }
> > + av_free_packet(&pkt);
> > + av_init_packet(&pkt);
> > + }
> > + } while (!end_of_stream || got_frame);
> > +
> > + av_free_packet(&pkt);
> > + av_frame_free(&fr);
> > + avcodec_close(ctx);
> > + avformat_close_input(&fmt_ctx);
> > + avcodec_free_context(&ctx);
> > + av_freep(&byte_buffer);
> > + av_freep(&slice_byte_buffer);
> > + return 0;
> > +}
> > +
>
> > +int main(int argc, char **argv)
> > +{
> > + if (argc < 2)
> > + {
>
> > + av_log(NULL, AV_LOG_ERROR, "Incorrect input\n");
>
> This should give a hint on what the correct input is
>
>
> [...]
> --
> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> The bravest are surely those who have the clearest vision
> of what is before them, glory and danger alike, and yet
> notwithstanding go out to meet it. -- Thucydides
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
It is what and why we do it that matters, not just one of them.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
