[FFmpeg-cvslog] avcodec: add missing files missed in previous commits
James Almer
git at videolan.org
Fri Jul 27 17:17:28 EEST 2018
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Jul 27 10:59:38 2018 -0300| [536bcc30e04a7c0868f226606b81d257bae47318] | committer: James Almer
avcodec: add missing files missed in previous commits
Fixes compilation.
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=536bcc30e04a7c0868f226606b81d257bae47318
---
libavcodec/avs2_parser.c | 95 +++++++++++++++++++++++++
libavcodec/libdavs2.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 272 insertions(+)
diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c
new file mode 100644
index 0000000000..520e98a9b4
--- /dev/null
+++ b/libavcodec/avs2_parser.c
@@ -0,0 +1,95 @@
+/*
+ * AVS2/IEEE 1857.4 video parser.
+ * Copyright (c) 2018 Huiwen Ren <hwrenx at gmail.com>
+ *
+ * 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
+ */
+
+#include "parser.h"
+
+#define SLICE_MAX_START_CODE 0x000001af
+
+#define ISPIC(x) ((x) == 0xB3 || (x) == 0xB6)
+#define ISUNIT(x) ((x) == 0xB0 || (x) == 0xB1 || (x) == 0xB2 || ISPIC(x))
+
+static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size)
+{
+ int pic_found = pc->frame_start_found;
+ uint32_t state = pc->state;
+ int cur = 0;
+
+ if (!pic_found) {
+ for (; cur < buf_size; ++cur) {
+ state = (state<<8) | buf[cur];
+ if (ISUNIT(buf[cur])){
+ ++cur;
+ pic_found = 1;
+ break;
+ }
+ }
+ }
+
+ if (pic_found) {
+ if (!buf_size)
+ return END_NOT_FOUND;
+ for (; cur < buf_size; ++cur) {
+ state = (state << 8) | buf[cur];
+ if ((state & 0xFFFFFF00) == 0x100 && state > SLICE_MAX_START_CODE) {
+ pc->frame_start_found = 0;
+ pc->state = -1;
+ return cur - 3;
+ }
+ }
+ }
+
+ pc->frame_start_found = pic_found;
+ pc->state = state;
+
+ return END_NOT_FOUND;
+}
+
+static int avs2_parse(AVCodecParserContext *s, AVCodecContext *avctx,
+ const uint8_t **poutbuf, int *poutbuf_size,
+ const uint8_t *buf, int buf_size)
+{
+ ParseContext *pc = s->priv_data;
+ int next;
+
+ if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
+ next = buf_size;
+ } else {
+ next = avs2_find_frame_end(pc, buf, buf_size);
+ if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
+ *poutbuf = NULL;
+ *poutbuf_size = 0;
+ return buf_size;
+ }
+ }
+
+ *poutbuf = buf;
+ *poutbuf_size = buf_size;
+
+ return next;
+}
+
+AVCodecParser ff_avs2_parser = {
+ .codec_ids = { AV_CODEC_ID_AVS2 },
+ .priv_data_size = sizeof(ParseContext),
+ .parser_parse = avs2_parse,
+ .parser_close = ff_parse_close,
+ .split = ff_mpeg4video_split,
+};
diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c
new file mode 100644
index 0000000000..12db1f9da7
--- /dev/null
+++ b/libavcodec/libdavs2.c
@@ -0,0 +1,177 @@
+/*
+ * AVS2 decoding using the davs2 library
+ *
+ * Copyright (C) 2018 Yiqun Xu, <yiqun.xu at vipl.ict.ac.cn>
+ * Falei Luo, <falei.luo at gmail.com>
+ * Huiwen Ren, <hwrenx at gmail.com>
+ *
+ * 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
+ */
+
+#include "libavutil/avassert.h"
+#include "libavutil/common.h"
+#include "libavutil/avutil.h"
+#include "avcodec.h"
+#include "libavutil/imgutils.h"
+#include "internal.h"
+
+#include "davs2.h"
+
+typedef struct DAVS2Context {
+ void *decoder;
+
+ AVFrame *frame;
+ davs2_param_t param; // decoding parameters
+ davs2_packet_t packet; // input bitstream
+
+ int decoded_frames;
+
+ davs2_picture_t out_frame; // output data, frame data
+ davs2_seq_info_t headerset; // output data, sequence header
+
+}DAVS2Context;
+
+static av_cold int davs2_init(AVCodecContext *avctx)
+{
+ DAVS2Context *cad = avctx->priv_data;
+
+ /* init the decoder */
+ cad->param.threads = avctx->thread_count;
+ cad->param.info_level = 0;
+ cad->decoder = davs2_decoder_open(&cad->param);
+
+ if (!cad->decoder) {
+ av_log(avctx, AV_LOG_ERROR, "decoder created error.");
+ return AVERROR(EINVAL);
+ }
+
+ av_log(avctx, AV_LOG_VERBOSE, "decoder created. %p\n", cad->decoder);
+ return 0;
+}
+
+static int davs2_dump_frames(AVCodecContext *avctx, davs2_picture_t *pic,
+ davs2_seq_info_t *headerset, int ret_type, AVFrame *frame)
+{
+ DAVS2Context *cad = avctx->priv_data;
+ int bytes_per_sample = pic->bytes_per_sample;
+ int plane = 0;
+ int line = 0;
+
+ if (!headerset)
+ return 0;
+
+ if (!pic || ret_type == DAVS2_GOT_HEADER) {
+ avctx->width = headerset->width;
+ avctx->height = headerset->height;
+ avctx->pix_fmt = headerset->output_bit_depth == 10 ?
+ AV_PIX_FMT_YUV420P10 : AV_PIX_FMT_YUV420P;
+
+ avctx->framerate = av_d2q(headerset->frame_rate,4096);
+ return 0;
+ }
+
+ for (plane = 0; plane < 3; ++plane) {
+ int size_line = pic->widths[plane] * bytes_per_sample;
+ frame->buf[plane] = av_buffer_alloc(size_line * pic->lines[plane]);
+
+ if (!frame->buf[plane]){
+ av_log(avctx, AV_LOG_ERROR, "dump error: alloc failed.\n");
+ return AVERROR(EINVAL);
+ }
+
+ frame->data[plane] = frame->buf[plane]->data;
+ frame->linesize[plane] = pic->widths[plane];
+
+ for (line = 0; line < pic->lines[plane]; ++line)
+ memcpy(frame->data[plane] + line * size_line,
+ pic->planes[plane] + line * pic->strides[plane],
+ pic->widths[plane] * bytes_per_sample);
+ }
+
+ frame->width = cad->headerset.width;
+ frame->height = cad->headerset.height;
+ frame->pts = cad->out_frame.pts;
+ frame->pict_type = pic->type;
+ frame->format = avctx->pix_fmt;
+
+ cad->decoded_frames++;
+ return 1;
+}
+
+static av_cold int davs2_end(AVCodecContext *avctx)
+{
+ DAVS2Context *cad = avctx->priv_data;
+
+ /* close the decoder */
+ if (cad->decoder) {
+ davs2_decoder_close(cad->decoder);
+ cad->decoder = NULL;
+ }
+
+ return 0;
+}
+
+static int davs2_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame, AVPacket *avpkt)
+{
+ DAVS2Context *cad = avctx->priv_data;
+ int buf_size = avpkt->size;
+ uint8_t *buf_ptr = avpkt->data;
+ AVFrame *frame = data;
+ int ret = DAVS2_DEFAULT;
+
+ if (!buf_size) {
+ return 0;
+ }
+
+ cad->packet.data = buf_ptr;
+ cad->packet.len = buf_size;
+ cad->packet.pts = avpkt->pts;
+ cad->packet.dts = avpkt->dts;
+
+ ret = davs2_decoder_send_packet(cad->decoder, &cad->packet);
+
+
+ if (ret == DAVS2_ERROR) {
+ av_log(avctx, AV_LOG_ERROR, "Decoder error: can't read packet\n");
+ return AVERROR(EINVAL);
+ }
+
+ ret = davs2_decoder_recv_frame(cad->decoder, &cad->headerset, &cad->out_frame);
+
+ if (ret != DAVS2_DEFAULT) {
+ *got_frame = davs2_dump_frames(avctx, &cad->out_frame, &cad->headerset, ret, frame);
+ davs2_decoder_frame_unref(cad->decoder, &cad->out_frame);
+ }
+
+ return buf_size;
+}
+
+AVCodec ff_libdavs2_decoder = {
+ .name = "libdavs2",
+ .long_name = NULL_IF_CONFIG_SMALL("Decoder for AVS2/IEEE 1857.4"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_AVS2,
+ .priv_data_size = sizeof(DAVS2Context),
+ .init = davs2_init,
+ .close = davs2_end,
+ .decode = davs2_decode_frame,
+ .capabilities = AV_CODEC_CAP_DELAY,//AV_CODEC_CAP_DR1 |
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P10,
+ AV_PIX_FMT_NONE },
+ .wrapper_name = "libdavs2",
+};
More information about the ffmpeg-cvslog
mailing list