From patchwork Wed Jun 1 18:01:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3581716pzj; Wed, 1 Jun 2022 11:03:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJym9723HkCpPI6SNT10bmxTgBJYUuuXFg9g5qydgdgyE+FiLGldituxvZcQx9piC5171MuW X-Received: by 2002:a17:906:6009:b0:6fe:9813:14ea with SMTP id o9-20020a170906600900b006fe981314eamr675406ejj.732.1654106589603; Wed, 01 Jun 2022 11:03:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654106589; cv=none; d=google.com; s=arc-20160816; b=FTRmlhNd2430L1AeA1RSsdaWKpRrLDiyhZRuPWDQKVrw0Y4/Vvthv05HX6W7j0m4At DCGc4NRXFFW9b/dOcettnzWAtKwYSsDSCSF7hO0jD8kNmg/6MWh9n4PUE32mU5FNdeNl A5zOJIdHIuNXs6dlsYBk12GfL3wJL8ObZTpKdxJStkpLi2N42s9ZUDKREB/AvQsd/kca B1VPJRi40jzfPmnnmaM/cq0EqeDwhfeTHe4E1mpsEvTUQxsm+M5WXXJME/kdTZuvnWYr LYJI8KGxGeR+G+FpLOzJyL9sRDckVJ78PCppMeu4vE58XfTXhyIgd5nXJ8Xj5LLuDW5e oKcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=kdR1YmSiFbbLGLSkWCpqyM48n5DrPBnChPgyJdhSDhQ=; b=zNF52KS9Dk1dgFUU3YMwI8MFZWHUtYNOKS762Kcl5X/biV7KnSNQnxD9FZU907bEp/ q900xpumKbgN4KvgBbJ2bnCLwBIEtrUPBBPqw+xGXPSSxOHo7kCjdqI5DPULWN5sZIMC F7KBErSjb8ICv5/IIYI9TtnVO8OfdOx+SADfZtrRPhccogYReIYRKKHexZZQMDU12lw4 RmSAqDg7LpjXj0pWrL02AH4f3MkTVwCg6TcUyS/hEcDwu7cgRJgnzeMnapK9VaKvns9Z sq6axSB2vWx2B5xaWQx6XIXm+4vhTSU1zroE2hhDbQh75dPK98ik0rKExPUmimafE+g3 m0XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AwW0NJJk; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e23-20020a50a697000000b0042dc8c6e678si2629323edc.150.2022.06.01.11.03.09; Wed, 01 Jun 2022 11:03:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AwW0NJJk; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 413F368B7B8; Wed, 1 Jun 2022 21:02:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BED1868B76A for ; Wed, 1 Jun 2022 21:01:52 +0300 (EEST) Received: by mail-pl1-f178.google.com with SMTP id n18so2482689plg.5; Wed, 01 Jun 2022 11:01:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=98LpnvH/HD0Q8JInmZMfJz2v1DbVTAU2FPyI3+P0RhI=; b=AwW0NJJkSYNXT2cxUVaKZvGDTEUwgEm4asCfubbEFrVjvpVsFgb3jrPsVYAs5vAg31 OtLha6exehxOqXrYO+7rpqspAUPYKmCRbn8WRqCGqc4Tenguvo/EQfEjA2VCwXuLfcgH ICRZ3VSBBrubwHPx04ZnUGdJTd12s+dS6UOoKP29WLNXStgMYyIBsYCNpPP1gFMVB7Q6 yIAqfW86qOpdI2ghn4AJZ9csWq58wsQxHbt3m5qy4itvtBk9CsDKjxYOQJYaUrpe+pB/ 9jjS/6R3XVEO6497FbZqn4w5n8AflKgduNCUtUU1/dNbkt7IIj9DWI89r+VhO9mRAPHn 7R9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=98LpnvH/HD0Q8JInmZMfJz2v1DbVTAU2FPyI3+P0RhI=; b=5sJNMxsrWsgSoegtdBLUxjNH6L45UB2p0YZlM1+1dCfR3N8en4kfcSL9mk+WGs9d08 C8MxtZL/pz9A+KY1AHRI87KlrJqvyvkgw+gDNdiz/cJ2ko8GnjxfgDWdQ9Y6vZ0dk0BJ i4MYkuKdEzhw7WnzQTXVM3ForoLrDFfzwTBUZjVgIP8IlywKpCKKoolOm+uPs80pN4l9 LbzgMn3cf/TUA8mHWdgyOD8JRhHBiyzd6Ho0OBnaooaxGn3CB2SAbb3vrrOQdEJcFXt8 O6Pelsa5ptQzvm9P4iAcQdZsIOVSZmd96U3Rv6leAK0t2rYvOVliWEOXInCyhtQDGAm+ KqtQ== X-Gm-Message-State: AOAM531Y8+vvGWwfDp1q0lvBHhyinZJILabkbNlPv203rPX22+aWn+Kl XrBc7YoMDWaj/Kd4HsVwO/gBX0uMuhc= X-Received: by 2002:a17:90a:4615:b0:1df:40e6:6474 with SMTP id w21-20020a17090a461500b001df40e66474mr624246pjg.194.1654106511170; Wed, 01 Jun 2022 11:01:51 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id q19-20020a635c13000000b003c14af50623sm1638189pgb.59.2022.06.01.11.01.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2022 11:01:50 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Wed, 01 Jun 2022 18:01:43 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 3/6] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: softworkz , "Xiang, Haihao" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2DKouaPOFmLI From: softworkz Signed-off-by: softworkz --- libavcodec/mpeg12.h | 28 ++++++++++++++++++++++++++++ libavcodec/mpeg12dec.c | 40 +++++----------------------------------- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index e0406b32d9..84a829cdd3 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -23,6 +23,7 @@ #define AVCODEC_MPEG12_H #include "mpegvideo.h" +#include "libavutil/stereo3d.h" /* Start codes. */ #define SEQ_END_CODE 0x000001b7 @@ -34,6 +35,31 @@ #define EXT_START_CODE 0x000001b5 #define USER_START_CODE 0x000001b2 +typedef struct Mpeg1Context { + MpegEncContext mpeg_enc_ctx; + int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ + int repeat_field; /* true if we must repeat the field */ + AVPanScan pan_scan; /* some temporary storage for the panscan */ + AVStereo3D stereo3d; + int has_stereo3d; + AVBufferRef *a53_buf_ref; + uint8_t afd; + int has_afd; + int slice_count; + unsigned aspect_ratio_info; + AVRational save_aspect; + int save_width, save_height, save_progressive_seq; + int rc_buffer_size; + AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ + unsigned frame_rate_index; + int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ + int closed_gop; + int tmpgexs; + int first_slice; + int extradata_decoded; + int64_t timecode_frame_start; /*< GOP timecode frame start number, in non drop frame format */ +} Mpeg1Context; + void ff_mpeg12_common_init(MpegEncContext *s); void ff_mpeg1_clean_buffers(MpegEncContext *s); @@ -45,4 +71,6 @@ void ff_mpeg12_find_best_frame_rate(AVRational frame_rate, int *code, int *ext_n, int *ext_d, int nonstandard); +void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size); + #endif /* AVCODEC_MPEG12_H */ diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index e9bde48f7a..11d2b58185 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -58,31 +58,6 @@ #define A53_MAX_CC_COUNT 2000 -typedef struct Mpeg1Context { - MpegEncContext mpeg_enc_ctx; - int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ - int repeat_field; /* true if we must repeat the field */ - AVPanScan pan_scan; /* some temporary storage for the panscan */ - AVStereo3D stereo3d; - int has_stereo3d; - AVBufferRef *a53_buf_ref; - uint8_t afd; - int has_afd; - int slice_count; - unsigned aspect_ratio_info; - AVRational save_aspect; - int save_width, save_height, save_progressive_seq; - int rc_buffer_size; - AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ - unsigned frame_rate_index; - int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ - int closed_gop; - int tmpgexs; - int first_slice; - int extradata_decoded; - int64_t timecode_frame_start; /*< GOP timecode frame start number, in non drop frame format */ -} Mpeg1Context; - #define MB_TYPE_ZERO_MV 0x20000000 static const uint32_t ptype2mb_type[7] = { @@ -2198,11 +2173,9 @@ static int vcr2_init_sequence(AVCodecContext *avctx) return 0; } -static int mpeg_decode_a53_cc(AVCodecContext *avctx, +static int mpeg_decode_a53_cc(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size) { - Mpeg1Context *s1 = avctx->priv_data; - if (buf_size >= 6 && p[0] == 'G' && p[1] == 'A' && p[2] == '9' && p[3] == '4' && p[4] == 3 && (p[5] & 0x40)) { @@ -2333,12 +2306,9 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, return 0; } -static void mpeg_decode_user_data(AVCodecContext *avctx, - const uint8_t *p, int buf_size) +void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size) { - Mpeg1Context *s = avctx->priv_data; const uint8_t *buf_end = p + buf_size; - Mpeg1Context *s1 = avctx->priv_data; #if 0 int i; @@ -2352,7 +2322,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, int i; for(i=0; i<20; i++) if (!memcmp(p+i, "\0TMPGEXS\0", 9)){ - s->tmpgexs= 1; + s1->tmpgexs= 1; } } /* we parse the DTG active format information */ @@ -2398,7 +2368,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, break; } } - } else if (mpeg_decode_a53_cc(avctx, p, buf_size)) { + } else if (mpeg_decode_a53_cc(avctx, s1, p, buf_size)) { return; } } @@ -2590,7 +2560,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, } break; case USER_START_CODE: - mpeg_decode_user_data(avctx, buf_ptr, input_size); + ff_mpeg_decode_user_data(avctx, s, buf_ptr, input_size); break; case GOP_START_CODE: if (last_code == 0) {