From patchwork Fri Feb 5 20:24:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 25459 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D777544B533 for ; Fri, 5 Feb 2021 22:24:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADEBA6897C8; Fri, 5 Feb 2021 22:24:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0207681871 for ; Fri, 5 Feb 2021 22:24:26 +0200 (EET) Received: by mail-ej1-f42.google.com with SMTP id r12so13949581ejb.9 for ; Fri, 05 Feb 2021 12:24:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=VyTE01weugpVfegMfTOeGFgOB6Lu2DDbmu8TugHrcfc=; b=uJXmpGV6wQ4LYZ/4oTJGpFpg66LfOYI+1out+13InFalsLBgITZsdHp70xFn0b4TnY DBxXCgHKdWAfHzLFn1rhJhfw1+oJolF4jN/0eMBUN4ln1ApcwKDr086gzASddsusgFU1 UdNZokuhgdPuHyor+EAfpz1MxtDk2pbbS64xDfiRb2r/Ut3fJxkmFcaBNYEhMEp6m+HE ZTpvhbMBfoPwdiTk4brAikwykNPKbFTE4zfFwR9mcM3MwCrYW7L+RvUvYCtifqx6UkrW XLBKW2QJCupzFaPgXORD3sqymey1ziJ0f+yya4f2Gulg06krStH+SR6o6lW0gjCNiJ3Y rs8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=VyTE01weugpVfegMfTOeGFgOB6Lu2DDbmu8TugHrcfc=; b=PZwZ0+OM9WPVCJZBIZf2eH/ueQFF4pwGvm+bkV+3INLy6FNuv9fB9n2dCQ8QfPdyUc 0cuGJimmzdfdsiS0bVLnH9ystNHGjj3kPNl+qSsBCX+DSLvQCOmuEZ0NFmVzymQq3Kf2 NYWlLuq+I6zY/85EI0P+fvekWjSo942467bf0yBNIEDd5m1b/0DU8/H/qh1qs3XY4O6v 8WxeOx31bnvnU9TjOGPUc+0CeXl6yFjF58Lf+BQxh5zAZSytGKeoF4MTQFEdDCVIMhPB o7XSxpufW2aXNXabbuXChqpjvXM7/5GsVwubafyLprog2kY3q8JqQ3kY0lGsTAtLUeg6 lM9g== X-Gm-Message-State: AOAM533fhuSmIN3ZAA9h7G0EhKiYmDmPbGXMwkvR7NqPizvSGd+zMINr HZmsb8ShTSAq1o+je8UK/CrYr+Q+XcS1CQ== X-Google-Smtp-Source: ABdhPJzilUmD2Rhv2S0sSaZh7RQL4fO2JX+XepByLak9t+Ami9kCB2xU9vELsGh7dG9Lh535Yl1Elw== X-Received: by 2002:a17:907:1119:: with SMTP id qu25mr5515590ejb.268.1612556666229; Fri, 05 Feb 2021 12:24:26 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id r7sm4359081ejo.20.2021.02.05.12.24.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 12:24:25 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Feb 2021 21:24:18 +0100 Message-Id: <20210205202418.6479-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec: add cri parser X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/Makefile | 1 + libavcodec/cri_parser.c | 105 ++++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 3 files changed, 107 insertions(+) create mode 100644 libavcodec/cri_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b06b028ae4..116021c0f5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1084,6 +1084,7 @@ OBJS-$(CONFIG_AVS3_PARSER) += avs3_parser.o OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o OBJS-$(CONFIG_COOK_PARSER) += cook_parser.o +OBJS-$(CONFIG_CRI_PARSER) += cri_parser.o OBJS-$(CONFIG_DCA_PARSER) += dca_parser.o dca_exss.o dca.o OBJS-$(CONFIG_DIRAC_PARSER) += dirac_parser.o OBJS-$(CONFIG_DNXHD_PARSER) += dnxhd_parser.o dnxhddata.o diff --git a/libavcodec/cri_parser.c b/libavcodec/cri_parser.c new file mode 100644 index 0000000000..9790747a9e --- /dev/null +++ b/libavcodec/cri_parser.c @@ -0,0 +1,105 @@ +/* + * CRI parser + * Copyright (c) 2021 Paul B Mahol + * + * 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 + */ + +/** + * @file + * CRI parser + */ + +#include "libavutil/bswap.h" +#include "libavutil/common.h" + +#include "parser.h" + +typedef struct CRIParser { + ParseContext pc; + int count; + int chunk; + int read_bytes; + int skip_bytes; +} CRIParser; + +#define KEY (((uint64_t)'\1' << 56) | ((uint64_t)'\0' << 48) | \ + ((uint64_t)'\0' << 40) | ((uint64_t)'\0' << 32) | \ + ((uint64_t)'\4' << 24) | ((uint64_t)'\0' << 16) | \ + ((uint64_t)'\0' << 8) | ((uint64_t)'\0' << 0)) + +static int cri_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + CRIParser *bpc = s->priv_data; + uint64_t state = bpc->pc.state64; + int next = END_NOT_FOUND, i = 0; + + s->pict_type = AV_PICTURE_TYPE_I; + s->key_frame = 1; + s->duration = 1; + + *poutbuf_size = 0; + *poutbuf = NULL; + + for (; i < buf_size; i++) { + state = (state << 8) | buf[i]; + bpc->read_bytes++; + + if (bpc->skip_bytes > 0) { + bpc->skip_bytes--; + if (bpc->skip_bytes == 0) + bpc->read_bytes = 0; + } else { + if (state != KEY) + continue; + } + + if (bpc->skip_bytes == 0 && bpc->read_bytes >= 8) { + bpc->skip_bytes = av_bswap32(state & 0xFFFFFFFF); + bpc->chunk = state >> 32; + bpc->read_bytes = 0; + bpc->count++; + } + + if (bpc->chunk == 0x01000000 && bpc->skip_bytes == 4 && + bpc->read_bytes == 0 && bpc->count > 1) { + next = i - 7; + break; + } + } + + bpc->pc.state64 = state; + if (ff_combine_frame(&bpc->pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + + *poutbuf = buf; + *poutbuf_size = buf_size; + + return next; +} + +AVCodecParser ff_cri_parser = { + .codec_ids = { AV_CODEC_ID_CRI }, + .priv_data_size = sizeof(CRIParser), + .parser_parse = cri_parse, + .parser_close = ff_parse_close, +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index d3353a6b39..61af22b2d5 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -33,6 +33,7 @@ extern AVCodecParser ff_avs3_parser; extern AVCodecParser ff_bmp_parser; extern AVCodecParser ff_cavsvideo_parser; extern AVCodecParser ff_cook_parser; +extern AVCodecParser ff_cri_parser; extern AVCodecParser ff_dca_parser; extern AVCodecParser ff_dirac_parser; extern AVCodecParser ff_dnxhd_parser;