[FFmpeg-cvslog] tools/venc_data_dump: factor out demux/decode code
Anton Khirnov
git at videolan.org
Sun Aug 8 20:28:57 EEST 2021
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Jun 30 11:44:24 2021 +0200| [94170e041107a3831fdd39ebb53f4f50d06edea4] | committer: Anton Khirnov
tools/venc_data_dump: factor out demux/decode code
It can be shared with other simple demux/decode tools.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94170e041107a3831fdd39ebb53f4f50d06edea4
---
tests/ref/fate/source | 1 +
tools/Makefile | 2 +
tools/decode_simple.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++
tools/decode_simple.h | 53 +++++++++++++++++
tools/venc_data_dump.c | 156 +++++++++++-------------------------------------
5 files changed, 248 insertions(+), 121 deletions(-)
diff --git a/tests/ref/fate/source b/tests/ref/fate/source
index c64bc05241..69dcdc4f27 100644
--- a/tests/ref/fate/source
+++ b/tests/ref/fate/source
@@ -20,5 +20,6 @@ Headers without standard inclusion guards:
compat/djgpp/math.h
compat/float/float.h
compat/float/limits.h
+tools/decode_simple.h
Use of av_clip() where av_clip_uintp2() could be used:
Use of av_clip() where av_clip_intp2() could be used:
diff --git a/tools/Makefile b/tools/Makefile
index 82baa8eadb..ec260f254e 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -17,6 +17,8 @@ tools/target_dem_fuzzer.o: tools/target_dem_fuzzer.c
tools/target_io_dem_fuzzer.o: tools/target_dem_fuzzer.c
$(COMPILE_C) -DIO_FLAT=0
+tools/venc_data_dump$(EXESUF): tools/decode_simple.o
+
OUTDIRS += tools
clean::
diff --git a/tools/decode_simple.c b/tools/decode_simple.c
new file mode 100644
index 0000000000..b679fd7ce6
--- /dev/null
+++ b/tools/decode_simple.c
@@ -0,0 +1,157 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/* shared code for simple demux/decode tools */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "decode_simple.h"
+
+#include "libavformat/avformat.h"
+
+#include "libavcodec/avcodec.h"
+#include "libavcodec/packet.h"
+
+#include "libavutil/dict.h"
+#include "libavutil/error.h"
+#include "libavutil/frame.h"
+
+static int decode_read(DecodeContext *dc, int flush)
+{
+ const int ret_done = flush ? AVERROR_EOF : AVERROR(EAGAIN);
+ int ret = 0;
+
+ while (ret >= 0 &&
+ (dc->max_frames == 0 || dc->decoder->frame_number < dc->max_frames)) {
+ ret = avcodec_receive_frame(dc->decoder, dc->frame);
+ if (ret < 0) {
+ if (ret == AVERROR_EOF) {
+ int err = dc->process_frame(dc, NULL);
+ if (err < 0)
+ return err;
+ }
+
+ return (ret == ret_done) ? 0 : ret;
+ }
+
+ ret = dc->process_frame(dc, dc->frame);
+ av_frame_unref(dc->frame);
+ if (ret < 0)
+ return ret;
+
+ if (dc->max_frames && dc->decoder->frame_number == dc->max_frames)
+ return 1;
+ }
+
+ return (dc->max_frames == 0 || dc->decoder->frame_number < dc->max_frames) ? 0 : 1;
+}
+
+int ds_run(DecodeContext *dc)
+{
+ int ret;
+
+ ret = avcodec_open2(dc->decoder, NULL, &dc->decoder_opts);
+ if (ret < 0)
+ return ret;
+
+ while (ret >= 0) {
+ ret = av_read_frame(dc->demuxer, dc->pkt);
+ if (ret < 0)
+ goto flush;
+ if (dc->pkt->stream_index != dc->stream->index) {
+ av_packet_unref(dc->pkt);
+ continue;
+ }
+
+ ret = avcodec_send_packet(dc->decoder, dc->pkt);
+ if (ret < 0) {
+ fprintf(stderr, "Error decoding: %d\n", ret);
+ return ret;
+ }
+ av_packet_unref(dc->pkt);
+
+ ret = decode_read(dc, 0);
+ if (ret < 0) {
+ fprintf(stderr, "Error decoding: %d\n", ret);
+ return ret;
+ } else if (ret > 0)
+ return 0;
+ }
+
+flush:
+ avcodec_send_packet(dc->decoder, NULL);
+ ret = decode_read(dc, 1);
+ if (ret < 0) {
+ fprintf(stderr, "Error flushing: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+void ds_free(DecodeContext *dc)
+{
+ av_dict_free(&dc->decoder_opts);
+
+ av_frame_free(&dc->frame);
+ av_packet_free(&dc->pkt);
+
+ avcodec_free_context(&dc->decoder);
+ avformat_close_input(&dc->demuxer);
+}
+
+int ds_open(DecodeContext *dc, const char *url, int stream_idx)
+{
+ const AVCodec *codec;
+ int ret;
+
+ memset(dc, 0, sizeof(*dc));
+
+ dc->pkt = av_packet_alloc();
+ dc->frame = av_frame_alloc();
+ if (!dc->pkt || !dc->frame) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ ret = avformat_open_input(&dc->demuxer, url, NULL, NULL);
+ if (ret < 0) {
+ fprintf(stderr, "Error opening input file: %d\n", ret);
+ return ret;
+ }
+
+ if (stream_idx < 0 || stream_idx >= dc->demuxer->nb_streams)
+ return AVERROR(EINVAL);
+
+ dc->stream = dc->demuxer->streams[stream_idx];
+
+ codec = avcodec_find_decoder(dc->stream->codecpar->codec_id);
+ if (!codec)
+ return AVERROR_DECODER_NOT_FOUND;
+
+ dc->decoder = avcodec_alloc_context3(codec);
+ if (!dc->decoder)
+ return AVERROR(ENOMEM);
+
+ return 0;
+
+fail:
+ ds_free(dc);
+ return ret;
+}
diff --git a/tools/decode_simple.h b/tools/decode_simple.h
new file mode 100644
index 0000000000..d480489a6c
--- /dev/null
+++ b/tools/decode_simple.h
@@ -0,0 +1,53 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/* shared code for simple demux/decode tools */
+
+#ifndef DECODE_SIMPLE_H
+#define DECODE_SIMPLE_H
+
+#include "libavformat/avformat.h"
+
+#include "libavcodec/avcodec.h"
+#include "libavcodec/packet.h"
+
+#include "libavutil/dict.h"
+#include "libavutil/frame.h"
+
+
+typedef struct DecodeContext {
+ AVFormatContext *demuxer;
+ AVStream *stream;
+ AVCodecContext *decoder;
+
+ AVPacket *pkt;
+ AVFrame *frame;
+
+ int (*process_frame)(struct DecodeContext *dc, AVFrame *frame);
+ void *opaque;
+
+ AVDictionary *decoder_opts;
+ int max_frames;
+} DecodeContext;
+
+int ds_open(DecodeContext *dc, const char *url, int stream_idx);
+void ds_free(DecodeContext *dc);
+
+int ds_run(DecodeContext *dc);
+
+#endif /* DECODE_SIMPLE_H */
diff --git a/tools/venc_data_dump.c b/tools/venc_data_dump.c
index 3a6ce94268..3a3543f80f 100644
--- a/tools/venc_data_dump.c
+++ b/tools/venc_data_dump.c
@@ -20,6 +20,8 @@
#include <stdint.h>
#include <stdlib.h>
+#include "decode_simple.h"
+
#include "libavutil/common.h"
#include "libavutil/dict.h"
#include "libavutil/error.h"
@@ -29,85 +31,44 @@
#include "libavcodec/avcodec.h"
-static int decode_read(AVCodecContext *decoder, AVFrame *frame, int flush, int max_frames)
+static int process_frame(DecodeContext *dc, AVFrame *frame)
{
- const int ret_done = flush ? AVERROR_EOF : AVERROR(EAGAIN);
- int ret = 0;
-
- while (ret >= 0 &&
- (max_frames == 0 || decoder->frame_number < max_frames)) {
- AVFrameSideData *sd;
+ AVFrameSideData *sd;
- ret = avcodec_receive_frame(decoder, frame);
- if (ret < 0)
- return (ret == ret_done) ? 0 : ret;
+ if (!frame)
+ return 0;
- fprintf(stdout, "frame %d\n", decoder->frame_number - 1);
+ fprintf(stdout, "frame %d\n", dc->decoder->frame_number - 1);
- sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_ENC_PARAMS);
- if (sd) {
- AVVideoEncParams *par = (AVVideoEncParams*)sd->data;
+ sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_ENC_PARAMS);
+ if (sd) {
+ AVVideoEncParams *par = (AVVideoEncParams*)sd->data;
- fprintf(stdout, "AVVideoEncParams %d\n", par->type);
- fprintf(stdout, "qp %d\n", par->qp);
- for (int i = 0; i < FF_ARRAY_ELEMS(par->delta_qp); i++)
- for (int j = 0; j < FF_ARRAY_ELEMS(par->delta_qp[i]); j++) {
- if (par->delta_qp[i][j])
- fprintf(stdout, "delta_qp[%d][%d] %"PRId32"\n", i, j, par->delta_qp[i][j]);
- }
+ fprintf(stdout, "AVVideoEncParams %d\n", par->type);
+ fprintf(stdout, "qp %d\n", par->qp);
+ for (int i = 0; i < FF_ARRAY_ELEMS(par->delta_qp); i++)
+ for (int j = 0; j < FF_ARRAY_ELEMS(par->delta_qp[i]); j++) {
+ if (par->delta_qp[i][j])
+ fprintf(stdout, "delta_qp[%d][%d] %"PRId32"\n", i, j, par->delta_qp[i][j]);
+ }
- if (par->nb_blocks) {
- fprintf(stdout, "nb_blocks %d\n", par->nb_blocks);
- for (int i = 0; i < par->nb_blocks; i++) {
- AVVideoBlockParams *b = av_video_enc_params_block(par, i);
+ if (par->nb_blocks) {
+ fprintf(stdout, "nb_blocks %d\n", par->nb_blocks);
+ for (int i = 0; i < par->nb_blocks; i++) {
+ AVVideoBlockParams *b = av_video_enc_params_block(par, i);
- fprintf(stdout, "block %d %d:%d %dx%d %"PRId32"\n",
- i, b->src_x, b->src_y, b->w, b->h, b->delta_qp);
- }
+ fprintf(stdout, "block %d %d:%d %dx%d %"PRId32"\n",
+ i, b->src_x, b->src_y, b->w, b->h, b->delta_qp);
}
}
-
- av_frame_unref(frame);
-
- if (max_frames && decoder->frame_number == max_frames)
- return 1;
}
- return (max_frames == 0 || decoder->frame_number < max_frames) ? 0 : 1;
-}
-
-static int decoder_init(AVFormatContext *demuxer, int stream_idx,
- AVCodecContext **dec, AVDictionary **opts)
-{
- const AVCodec *codec;
- int ret;
-
- if (stream_idx < 0 || stream_idx >= demuxer->nb_streams)
- return AVERROR(EINVAL);
-
- codec = avcodec_find_decoder(demuxer->streams[stream_idx]->codecpar->codec_id);
- if (!codec)
- return AVERROR_DECODER_NOT_FOUND;
-
- *dec = avcodec_alloc_context3(codec);
- if (!*dec)
- return AVERROR(ENOMEM);
-
- ret = avcodec_open2(*dec, NULL, opts);
- if (ret < 0)
- return ret;
-
return 0;
}
int main(int argc, char **argv)
{
- AVFormatContext *demuxer = NULL;
- AVCodecContext *decoder = NULL;
- AVDictionary *opts = NULL;
-
- AVPacket *pkt = NULL;
- AVFrame *frame = NULL;
+ DecodeContext dc;
unsigned int stream_idx, max_frames;
const char *filename, *thread_type = NULL, *nb_threads = NULL;
@@ -126,70 +87,23 @@ int main(int argc, char **argv)
thread_type = argv[5];
}
- ret = av_dict_set(&opts, "threads", nb_threads, 0);
- ret |= av_dict_set(&opts, "thread_type", thread_type, 0);
- ret |= av_dict_set(&opts, "export_side_data", "venc_params", 0);
-
- ret = avformat_open_input(&demuxer, filename, NULL, NULL);
- if (ret < 0) {
- fprintf(stderr, "Error opening input file: %d\n", ret);
- return ret;
- }
-
- ret = decoder_init(demuxer, stream_idx, &decoder, &opts);
- if (ret < 0) {
- fprintf(stderr, "Error initializing decoder\n");
- goto finish;
- }
-
- pkt = av_packet_alloc();
- frame = av_frame_alloc();
- if (!pkt || !frame) {
- ret = AVERROR(ENOMEM);
+ ret = ds_open(&dc, filename, stream_idx);
+ if (ret < 0)
goto finish;
- }
- while (ret >= 0) {
- ret = av_read_frame(demuxer, pkt);
- if (ret < 0)
- goto flush;
- if (pkt->stream_index != stream_idx) {
- av_packet_unref(pkt);
- continue;
- }
+ dc.process_frame = process_frame;
+ dc.max_frames = max_frames;
- ret = avcodec_send_packet(decoder, pkt);
- if (ret < 0) {
- fprintf(stderr, "Error decoding: %d\n", ret);
- goto finish;
- }
- av_packet_unref(pkt);
-
- ret = decode_read(decoder, frame, 0, max_frames);
- if (ret < 0) {
- fprintf(stderr, "Error decoding: %d\n", ret);
- goto finish;
- } else if (ret > 0) {
- ret = 0;
- goto finish;
- }
- }
+ ret = av_dict_set(&dc.decoder_opts, "threads", nb_threads, 0);
+ ret |= av_dict_set(&dc.decoder_opts, "thread_type", thread_type, 0);
+ ret |= av_dict_set(&dc.decoder_opts, "export_side_data", "venc_params", 0);
-flush:
- avcodec_send_packet(decoder, NULL);
- ret = decode_read(decoder, frame, 1, max_frames);
- if (ret < 0) {
- fprintf(stderr, "Error flushing: %d\n", ret);
+ if (ret < 0)
goto finish;
- }
- ret = 0;
-finish:
- av_dict_free(&opts);
- av_packet_free(&pkt);
- av_frame_free(&frame);
- avcodec_free_context(&decoder);
- avformat_close_input(&demuxer);
+ ret = ds_run(&dc);
+finish:
+ ds_free(&dc);
return ret;
}
More information about the ffmpeg-cvslog
mailing list