[FFmpeg-devel] [PATCH] api-h264-test: build with another api test
Ludmila Glinskih
lglinskih at gmail.com
Sun Jun 28 00:50:25 CEST 2015
Location of api-h264-test changed to special directory for api tests.
---
libavformat/Makefile | 1 -
libavformat/api-h264-test.c | 183 --------------------------------------------
tests/api/Makefile | 1 +
tests/api/api-h264-test.c | 183 ++++++++++++++++++++++++++++++++++++++++++++
tests/fate/api.mak | 9 ++-
tests/fate/libavformat.mak | 4 -
6 files changed, 192 insertions(+), 189 deletions(-)
delete mode 100644 libavformat/api-h264-test.c
create mode 100644 tests/api/api-h264-test.c
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 5380a2a..993ec09 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -547,7 +547,6 @@ 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
deleted file mode 100644
index 4d2a5b0..0000000
--- a/libavformat/api-h264-test.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * 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 = 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;
- }
-
- 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);
- }
-
- 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) {
- 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, av_frame_get_pkt_duration(fr),
- 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 {
- 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, av_frame_get_pkt_duration(fr),
- 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/api/Makefile b/tests/api/Makefile
index 86c0cf2..52283ee 100644
--- a/tests/api/Makefile
+++ b/tests/api/Makefile
@@ -1,4 +1,5 @@
APITESTPROGS-$(call ENCDEC, FLAC, FLAC) += api-flac
+APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264
APITESTPROGS += $(APITESTPROGS-yes)
APITESTOBJS := $(APITESTOBJS:%=$(APITESTSDIR)%) $(APITESTPROGS:%=$(APITESTSDIR)/%-test.o)
diff --git a/tests/api/api-h264-test.c b/tests/api/api-h264-test.c
new file mode 100644
index 0000000..4d2a5b0
--- /dev/null
+++ b/tests/api/api-h264-test.c
@@ -0,0 +1,183 @@
+/*
+ * 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 = 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;
+ }
+
+ 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);
+ }
+
+ 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) {
+ 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, av_frame_get_pkt_duration(fr),
+ 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 {
+ 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, av_frame_get_pkt_duration(fr),
+ 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/api.mak b/tests/fate/api.mak
index 2127b9b..da50036 100644
--- a/tests/fate/api.mak
+++ b/tests/fate/api.mak
@@ -4,5 +4,12 @@ fate-api-flac: CMD = run $(APITESTSDIR)/api-flac-test
fate-api-flac: CMP = null
fate-api-flac: REF = /dev/null
+FATE_API_SAMPLES-LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264
+fate-api-h264: $(APITESTSDIR)/api-h264-test$(EXESUF)
+fate-api-h264: CMD = run $(APITESTSDIR)/api-h264-test $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
+
FATE-$(CONFIG_AVCODEC) += $(FATE_API_LIBAVCODEC-yes)
-fate-api: $(FATE_API_LIBAVCODEC-yes)
+FATE_API_SAMPLES-$(CONFIG_AVFORMAT) += $(FATE_API_SAMPLES-LIBAVFORMAT-yes)
+FATE_SAMPLES_AVCONV += $(FATE_API_SAMPLES-yes)
+
+fate-api: $(FATE_API_LIBAVCODEC-yes) $(FATE_API_SAMPLES-yes)
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak
index 0e1ff62..a9c02bc 100644
--- a/tests/fate/libavformat.mak
+++ b/tests/fate/libavformat.mak
@@ -14,9 +14,5 @@ FATE_LIBAVFORMAT-yes += fate-url
fate-url: libavformat/url-test$(EXESUF)
fate-url: CMD = run libavformat/url-test
-FATE_SAMPLES_AVCONV-$(call DEMDEC, H264, H264) += 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)
--
1.9.1
More information about the ffmpeg-devel
mailing list