From patchwork Sun Sep 10 20:10:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 5079 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp2329893jaa; Sun, 10 Sep 2017 13:11:24 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBgHjs58aF8ZT3Urht8xujXNq0PXVffD8pTGDX+LAz32ra/Be9YlcUe6w4Vz6iGks2st+ua X-Received: by 10.28.4.135 with SMTP id 129mr6396990wme.34.1505074284272; Sun, 10 Sep 2017 13:11:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505074284; cv=none; d=google.com; s=arc-20160816; b=QDcRYrqHuu32dw59nnKLQOCi4+AN8JMsYMZnn06avi8fNBUSZ6QA/auyMsMbGZSdbE x0qHdIIVH4tmooAvc7aevChIXrhoxcBL8e7x9l8zPa0cpDCn7pj7Y6xbmWsZPv0pspKd 1BJfHQeg0EFRdPspTcSAbRCRoePfsBdPIE6vdJCDiEvEi8j032/li/Rro7ARUTUfkXjL p0jONRDFcJAHLMoOvO8UTPBYSrJmbHCL+Ljvhw5Q0cqy5LyO3M0HjEzxTqX32Ffb38+D ht0vW6RK5gFTIeUCTZOJi4ug8eYAzW41+vsPEd/peA0AaADSbf/aiF9LdcNYpUGRLNoK YaeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=cClpcqaOP/DA2bZ9b3xYueISkLqLWusTwVenKaaQSx4=; b=Ps6RXxFgjIZxXxqSB7go/8HPfJI2EaOgxo24UExPdqOVGNtPKVnNC5utNgCJNWFyRP 5NCdV6Qj32F7twLBWdWu6rqnESeV7jqrtMfEOGENvCJZsnn/W2uN+UM33IBGtvX72vNB 1tdz8k1d6eAkqRIeuPlGm9Zubqkh3oYnVRxNKIDbSNiSzs27gCM4FiYt5YVvi9enNFNO o2rmPfnSGRUOKi+HxVCFIJulIeIe49u11glIgN7x3WDLbi7HZSYOPADCm8AqMYHZ280q B6mEIT+ivYQ2j63LaYLTHA1OQiNBoP+VdAwdbbvd6geWmEf5X2NvoWRRKSqjTCtnGjBq y8aQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d4si5471521wrc.469.2017.09.10.13.11.23; Sun, 10 Sep 2017 13:11:24 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E23D7689B6E; Sun, 10 Sep 2017 23:11:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-3.mx.upcmail.net (vie01a-dmta-pe06-3.mx.upcmail.net [84.116.36.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35AFB688356 for ; Sun, 10 Sep 2017 23:11:04 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dr8ZR-00047j-2R for ffmpeg-devel@ffmpeg.org; Sun, 10 Sep 2017 22:11:09 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 7wAl1w01f0S5wYM01wAmy0; Sun, 10 Sep 2017 22:10:46 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 10 Sep 2017 22:10:43 +0200 Message-Id: <20170910201045.8355-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/mxfenc: Replace more literal magic numbers by enum values. 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" This also moves the enum table up as it is needed earlier Signed-off-by: Michael Niedermayer --- libavformat/mxfenc.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index cc9ec8c93a..11ccc8c6ec 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -100,26 +100,6 @@ typedef struct MXFContainerEssenceEntry { void (*write_desc)(AVFormatContext *, AVStream *); } MXFContainerEssenceEntry; -static const struct { - enum AVCodecID id; - int index; -} mxf_essence_mappings[] = { - { AV_CODEC_ID_MPEG2VIDEO, 0 }, - { AV_CODEC_ID_PCM_S24LE, 1 }, - { AV_CODEC_ID_PCM_S16LE, 1 }, - { AV_CODEC_ID_DVVIDEO, 15 }, - { AV_CODEC_ID_DNXHD, 24 }, - { AV_CODEC_ID_JPEG2000, 34 }, - { AV_CODEC_ID_H264, 35 }, - { AV_CODEC_ID_NONE } -}; - -static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st); -static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st); -static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st); -static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st); -static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st); - enum { INDEX_MPEG2 = 0, INDEX_AES3, @@ -159,6 +139,26 @@ enum { INDEX_H264, }; +static const struct { + enum AVCodecID id; + int index; +} mxf_essence_mappings[] = { + { AV_CODEC_ID_MPEG2VIDEO, INDEX_MPEG2 }, + { AV_CODEC_ID_PCM_S24LE, INDEX_AES3 }, + { AV_CODEC_ID_PCM_S16LE, INDEX_AES3 }, + { AV_CODEC_ID_DVVIDEO, INDEX_DV }, + { AV_CODEC_ID_DNXHD, INDEX_DNXHD_1080p_10bit_HIGH }, + { AV_CODEC_ID_JPEG2000, INDEX_JPEG2000 }, + { AV_CODEC_ID_H264, INDEX_H264 }, + { AV_CODEC_ID_NONE } +}; + +static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st); +static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st); +static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st); +static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st); +static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st); + static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 },