From patchwork Fri May 29 11:22:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19967 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 078D1449A6D for ; Fri, 29 May 2020 14:23:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D528368AA9A; Fri, 29 May 2020 14:23:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFA76680A71 for ; Fri, 29 May 2020 14:23:07 +0300 (EEST) Received: by mail-pf1-f179.google.com with SMTP id z26so1234578pfk.12 for ; Fri, 29 May 2020 04:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TwVeiQYl+oInhcF31XmDhCScnB/QCctF2nuK8CpshcA=; b=HGWif1Mq+x/0k9QhSmItCXTWjbS7wl3t5VmZIjD0FF5x0iVmdoBL7l69IMJ8m1HLWh 5SafXpVHDdNDWgNbWNU5czLMkM05nzVhTHr7INiblOPdl34Eq8gGLjf5cH95JdStRmcn KnQtUomrTpkLvPd+euLzZFMyTV9FoZ5ANNeiaf3MXR4LalN1gagW5/zz1+UIfBD2KVqq aUXpyI6KKuqHjJxa86ocCzj6jbvLnE0bZfaGvGk8XMt62oPROv/d5jn0keXkljEM46KC VCgkahGdZRqUednclLqgIIJiCepa6VQ+skj2BKx3pwipUxd7LB0zaS9ZW/2yYiICmv/5 MhaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TwVeiQYl+oInhcF31XmDhCScnB/QCctF2nuK8CpshcA=; b=Qfk09Fn+m5dCTEp5M9Q+E2aLLWmRbEKc1J3qVMfqNE/ZAcjlJu8Vwxj6GKPVYdVltF ZwX5Sao6vM7j0L1xpUAITZC3hxXj3QliS7bLDDLDgOK6foy7gGlAIIfRjMueaKBxgw6d DZX0UPgcfPtGTGhNZ3o6Z8cqRnlHv7FJIrwpEnfVGdvHU3sj8PYqgtrfhvpl94o84ZEe 9sotowX8iPYmET2qgmjmVDZUoBakb9oKiCXBuSKbkAuPDsu/JsDI0L6BnY8unK/z6GzE bYIh9Vzisy4xqjfytpnhy29E0ImweKmJaPMfdGWaxe8nnqwZRRhL36BSV0PsEsMzC/md Hd4g== X-Gm-Message-State: AOAM53393tsD9RsAvf9J/03ZX5QU4qJMU5HyKDSgpWUAjOBEawaDB2KM fxEjDoVypIltJwe+DLbcOwXvwymJ X-Google-Smtp-Source: ABdhPJz/xIOymg8J/d1PjC7+Jdte5cWZRlwMcNRr7k4zbtjDkOjNrCnZHEMkSebFUHziPsi0eJxFVQ== X-Received: by 2002:a63:3c11:: with SMTP id j17mr8085097pga.70.1590751385481; Fri, 29 May 2020 04:23:05 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id gq19sm7088763pjb.55.2020.05.29.04.23.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 May 2020 04:23:04 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 19:22:58 +0800 Message-Id: <1590751378-7395-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20200403130454.25228-1-lance.lmwang@gmail.com> References: <20200403130454.25228-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v5] avcodec/mpeg12enc: support mpeg2 encoder const profile 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/mpeg12enc.c | 2 ++ libavcodec/profiles.h | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index cab7076..9fbbcef 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -41,6 +41,7 @@ #include "mpeg12data.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "profiles.h" static const uint8_t svcd_scan_offset_placeholder[] = { 0x10, 0x0E, 0x00, 0x80, 0x81, 0x00, 0x80, @@ -1167,6 +1168,7 @@ static const AVOption mpeg2_options[] = { { "mac", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = VIDEO_FORMAT_MAC }, 0, 0, VE, "video_format" }, { "unspecified", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = VIDEO_FORMAT_UNSPECIFIED}, 0, 0, VE, "video_format" }, FF_MPV_COMMON_OPTS + FF_MPEG2_PROFILE_OPTS { NULL }, }; diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index e414ea7..d6a139e 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -43,6 +43,12 @@ FF_AVCTX_PROFILE_OPTION("mpeg4_main", NULL, VIDEO, FF_PROFILE_MPEG4_MAIN)\ FF_AVCTX_PROFILE_OPTION("mpeg4_asp", NULL, VIDEO, FF_PROFILE_MPEG4_ADVANCED_SIMPLE)\ +#define FF_MPEG2_PROFILE_OPTS \ + FF_AVCTX_PROFILE_OPTION("mpeg2_422", NULL, VIDEO, FF_PROFILE_MPEG2_422)\ + FF_AVCTX_PROFILE_OPTION("mpeg2_high", NULL, VIDEO, FF_PROFILE_MPEG2_HIGH)\ + FF_AVCTX_PROFILE_OPTION("mpeg2_main", NULL, VIDEO, FF_PROFILE_MPEG2_MAIN)\ + FF_AVCTX_PROFILE_OPTION("mpeg2_simple", NULL, VIDEO, FF_PROFILE_MPEG2_SIMPLE)\ + extern const AVProfile ff_aac_profiles[]; extern const AVProfile ff_dca_profiles[]; extern const AVProfile ff_dnxhd_profiles[];