On Tue, 23 Jun 2015 16:05:38 +0300
Ludmila Glinskih <lglins...@gmail.com> wrote:
> Result differs in pkt_duration and time_base.den for some reason.
> Right now it tests only one example (adjusted to match the output).
>
> Signed-off-by: Ludmila Glinskih <lglins...@gmail.com>
> ---
> libavformat/Makefile | 1 +
> libavformat/api-h264-test.c | 187
> ++++++++++++++++++++++++++++++++++++++++++++
> tests/fate/libavformat.mak | 4 +
> tests/ref/fate/api-h264 | 18 +++++
> 4 files changed, 210 insertions(+)
> create mode 100644 libavformat/api-h264-test.c
> create mode 100644 tests/ref/fate/api-h264
>
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index 993ec09..5cc0f6c 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -547,6 +547,7 @@ TESTPROGS = seek
> \
> url \
>
> TESTPROGS-$(CONFIG_NETWORK) += noproxy
> +TESTPROGS-yes += api-h264
> TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh
>
> TOOLS = aviocat \
> diff --git a/libavformat/api-h264-test.c b/libavformat/api-h264-test.c
> new file mode 100644
> index 0000000..ac4acc4
> --- /dev/null
> +++ b/libavformat/api-h264-test.c
> @@ -0,0 +1,187 @@
> +/*
> + * 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.
> + */
> +
> +/**
> + * H264 codec test.
> + */
> +
> +#include "libavutil/adler32.h"
> +#include "libavcodec/avcodec.h"
> +#include "libavformat/avformat.h"
> +#include "libavutil/imgutils.h"
> +
> +static int video_decode_example(const char *input_filename)
> +{
> + AVCodec *codec = NULL;
> + AVCodecContext *origin_ctx = NULL, *ctx= NULL;
> + AVFrame *fr = NULL;
> + uint8_t *byte_buffer = NULL;
> + AVPacket pkt;
> + AVFormatContext *fmt_ctx = NULL;
> + int number_of_written_bytes;
> + int video_stream;
> + int get_frame = 0;
> + int byte_buffer_size;
> + int i = 0;
> + int result;
> +
> + 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 = -1;
> + for (i = 0; i < fmt_ctx->nb_streams; i++) {
> + if (fmt_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
> + video_stream = i;
> + break;
> + }
> + }
> +
> + origin_ctx = fmt_ctx->streams[video_stream]->codec;
Maybe error out if video_stream is < 0.
> + codec = avcodec_find_decoder(origin_ctx->codec_id);
> + if (codec == NULL) {
Style-wise, writing "if (!codec)" would probably be nicer, though
that's not important for this patch.
> + av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n");
> + return -1;
> + }
> +
> + ctx = avcodec_alloc_context3(codec);
> + if (ctx == NULL) {
> + 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;
> + }
> +
> + 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 == NULL) {
> + av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n");
> + return AVERROR(ENOMEM);
> + }
> +
> + byte_buffer_size = av_image_get_buffer_size(ctx->pix_fmt, ctx->width,
> ctx->height, 16);
> + byte_buffer = av_malloc(byte_buffer_size);
> + if (byte_buffer == NULL) {
> + av_log(NULL, AV_LOG_ERROR, "Can't allocate buffer\n");
> + return AVERROR(ENOMEM);
> + }
> +
> + printf("#tb %d: %d/%d\n", video_stream,
> fmt_ctx->streams[video_stream]->time_base.num,
> fmt_ctx->streams[video_stream]->time_base.den);
> + i = 0;
> + av_init_packet(&pkt);
> + while (av_read_frame(fmt_ctx, &pkt) >= 0) {
> + if (pkt.stream_index == video_stream) {
> + get_frame = 0;
> + if (pkt.pts == AV_NOPTS_VALUE)
> + pkt.pts = pkt.dts = i;
> + result = avcodec_decode_video2(ctx, fr, &get_frame, &pkt);
> + if (result < 0) {
> + av_log(NULL, AV_LOG_ERROR, "Error decoding frame\n");
> + return result;
> + }
> + if (get_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;
> + }
> + printf("%d, %10"PRId64", %10"PRId64", %8"PRId64", %8d,
> 0x%08lx\n", video_stream,
> + fr->pkt_pts, fr->pkt_dts, fr->pkt_duration,
> + number_of_written_bytes, av_adler32_update(0, (const
> uint8_t*)byte_buffer, number_of_written_bytes));
> + }
> + av_free_packet(&pkt);
> + av_init_packet(&pkt);
> + }
> + i++;
> + }
> + pkt.data = NULL;
> + pkt.size = 0;
> + if (pkt.pts == AV_NOPTS_VALUE)
> + pkt.pts = pkt.dts = i;
> + do {
> + if (pkt.stream_index != video_stream)
> + break;
> + get_frame = 0;
> + result = avcodec_decode_video2(ctx, fr, &get_frame, &pkt);
> + if (result < 0) {
> + av_log(NULL, AV_LOG_ERROR, "Error decoding frame\n");
> + return result;
> + }
> + if (get_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;
> + }
> + printf("%d, %10"PRId64", %10"PRId64", %8"PRId64", %8d,
> 0x%08lx\n", video_stream,
> + fr->pkt_pts, fr->pkt_dts, fr->pkt_duration,
> + number_of_written_bytes, av_adler32_update(0, (const
> uint8_t*)byte_buffer, number_of_written_bytes));
> + }
> + i++;
> + } while (get_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);
> + return 0;
> +}
> +
> +int main(int argc, char **argv)
> +{
> + if (argc < 2)
> + {
> + av_log(NULL, AV_LOG_ERROR, "Incorrect input\n");
> + return 1;
> + }
> +
> + av_register_all();
> +
> + if (video_decode_example(argv[1]) != 0)
> + return 1;
> +
> + return 0;
> +}
> diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak
> index a9c02bc..9927e11 100644
> --- a/tests/fate/libavformat.mak
> +++ b/tests/fate/libavformat.mak
> @@ -14,5 +14,9 @@ FATE_LIBAVFORMAT-yes += fate-url
> fate-url: libavformat/url-test$(EXESUF)
> fate-url: CMD = run libavformat/url-test
>
> +FATE_LIBAVFORMAT-yes += fate-api-h264
> +fate-api-h264: libavformat/api-h264-test$(EXESUF)
> +fate-api-h264: CMD = run libavformat/api-h264-test
> $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
> +
> FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes)
> fate-libavformat: $(FATE_LIBAVFORMAT)
> diff --git a/tests/ref/fate/api-h264 b/tests/ref/fate/api-h264
> new file mode 100644
> index 0000000..e1b29f0
> --- /dev/null
> +++ b/tests/ref/fate/api-h264
> @@ -0,0 +1,18 @@
> +#tb 0: 1/1200000
> +0, 0, 0, 48000, 38016, 0xb9ac19bd
> +0, 1, 1, 48000, 38016, 0x53c91566
> +0, 2, 2, 48000, 38016, 0xb5bd089f
> +0, 3, 3, 48000, 38016, 0xb81320bb
> +0, 4, 4, 48000, 38016, 0x7c793dce
> +0, 5, 5, 48000, 38016, 0x3d605b31
> +0, 6, 6, 48000, 38016, 0x40216830
> +0, 7, 7, 48000, 38016, 0x11c48f52
> +0, 8, 8, 48000, 38016, 0x0f37a013
> +0, 9, 9, 48000, 38016, 0xb06cb753
> +0, 10, 10, 48000, 38016, 0x6233ca83
> +0, 11, 11, 48000, 38016, 0x02b6d5a1
> +0, 12, 12, 48000, 38016, 0xf76cc409
> +0, 13, 13, 48000, 38016, 0xd19fa5c3
> +0, 14, 14, 48000, 38016, 0x8d1c8a02
> +0, 15, 15, 48000, 38016, 0x6802966d
> +0, 16, 16, 48000, 38016, 0x107fb055
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
