From patchwork Thu Dec 10 11:16:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24500 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 94E4E44A39A for ; Thu, 10 Dec 2020 13:24:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C1E268A927; Thu, 10 Dec 2020 13:19:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FF4768A8B4 for ; Thu, 10 Dec 2020 13:19:19 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id a3so4892039wmb.5 for ; Thu, 10 Dec 2020 03:19:19 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=Q/w6zFsTDYxydJT1VO42iSCcynP++MIgAUMqwZqPoFI=; b=bpGS+HTF04Em5A6BslIHiCbcKsVPzN0hJfr5pwiGcQLnXTMQ2OGg4OF+/Zqw3zDg5u unU9mezoBkF1024X4HK8fTDOYwP8HmWdLRS/Rd93VVIJKjnADDQ+++3lhVMMzTZNwn24 knFTDHvJ9obLXHkERO2eDczZh570ps3W1hG55QbEsXtTk3Vmra1BMOvvZlFJZuRAMgRE /2eLDgeSObqdY59PDP2Xs0bsA5wUS6wh3fmBPWKcB5ZoKrbuKtkz3E24a10+m+wVOD65 9uEi678mXXB8qB+FoFhDp1gqrhndjUiHR5fhsaZZrcUI0+G1PNDrQs+CJTdLHkkXnPVG R9Hw== 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:reply-to:mime-version:content-transfer-encoding; bh=Q/w6zFsTDYxydJT1VO42iSCcynP++MIgAUMqwZqPoFI=; b=e8tBO9WWyAqU3UhbpcDtDwDt0oR/HlyQFnIh3OCmzMJN4UpKI/f/ZLjiFk+vJ4tmGR UVE4eAEt65Lgkgff62Wbc5vPtJU3f9m4tmorrtkJ85M5vgBAOSIydDo4BoDu0zXsDUIT a13DU5n/rpOotsTEUfCCuYCJiDQtvVHZrIIW1aS1rJaOGdiVCh814xiK50ofx9PHZ8JG 1jQWpkHMDg/VYdbrO3WFB0LJ9onhP7qTPg7XPLYiu8TItZuhAQ/Oso2Zh4CU6ZvBhUw+ nxe07guMbcaMu0wjm8IFq/WERwm3yI4RSZzP4LRIZadDBGsBlfAudQhMVqGT3jJNITs3 BiYA== X-Gm-Message-State: AOAM533EzwkjFGckzbp538r1GDMqfG8H2nFs6jjfk/uR5yZ9iq3bI9af y477Y73ESK4lGCIdfWsvUCoV+yGvrM7kNQ== X-Google-Smtp-Source: ABdhPJxNaVUCQY/cESdiDuupHGILdxD0lTdkFDQnn6x4mdSx7TrxnISxFifJoY2PPlmxcSjUdxPO8g== X-Received: by 2002:a7b:c198:: with SMTP id y24mr7740583wmi.151.1607599158632; Thu, 10 Dec 2020 03:19:18 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s133sm8942330wmf.38.2020.12.10.03.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:19:18 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:50 +0100 Message-Id: <20201210111657.2276739-33-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> References: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 32/39] avcodec/msmpeg4enc: Don't use code for static init that can fail 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 3 +-- libavcodec/msmpeg4.h | 2 +- libavcodec/msmpeg4enc.c | 23 ++++++++--------------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 8fb415f42b..8f4876b0ca 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1008,8 +1008,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) ff_h263_encode_init(s); if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) - if ((ret = ff_msmpeg4_encode_init(s)) < 0) - return ret; + ff_msmpeg4_encode_init(s); if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) && s->out_format == FMT_MPEG1) ff_mpeg1_encode_init(s); diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index bcdb967401..e111088574 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -50,7 +50,7 @@ void ff_msmpeg4_encode_motion(MpegEncContext * s, int mx, int my); int ff_msmpeg4_coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block_ptr); -int ff_msmpeg4_encode_init(MpegEncContext *s); +void ff_msmpeg4_encode_init(MpegEncContext *s); void ff_msmpeg4_encode_picture_header(MpegEncContext *s, int picture_number); void ff_msmpeg4_encode_ext_header(MpegEncContext *s); void ff_msmpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 2c61735d9d..7a3858b966 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -32,7 +32,6 @@ #include "libavutil/attributes.h" #include "libavutil/avutil.h" -#include "libavutil/mem.h" #include "mpegvideo.h" #include "h263.h" #include "internal.h" @@ -46,13 +45,11 @@ static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2]; /* build the table which associate a (x,y) motion vector to a vlc */ -static av_cold int init_mv_table(MVTable *tab) +static av_cold void init_mv_table(MVTable *tab, uint16_t table_mv_index[4096]) { int i, x, y; - tab->table_mv_index = av_malloc(sizeof(uint16_t) * 4096); - if (!tab->table_mv_index) - return AVERROR(ENOMEM); + tab->table_mv_index = table_mv_index; /* mark all entries as not used */ for(i=0;i<4096;i++) @@ -63,8 +60,6 @@ static av_cold int init_mv_table(MVTable *tab) y = tab->table_mvy[i]; tab->table_mv_index[(x << 6) | y] = i; } - - return 0; } void ff_msmpeg4_code012(PutBitContext *pb, int n) @@ -118,10 +113,10 @@ static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, return size; } -av_cold int ff_msmpeg4_encode_init(MpegEncContext *s) +av_cold void ff_msmpeg4_encode_init(MpegEncContext *s) { static int init_done=0; - int i, ret; + int i; ff_msmpeg4_common_init(s); if(s->msmpeg4_version>=4){ @@ -130,12 +125,12 @@ av_cold int ff_msmpeg4_encode_init(MpegEncContext *s) } if (!init_done) { + static uint16_t mv_index_tables[2][4096]; /* init various encoding tables */ init_done = 1; - if ((ret = init_mv_table(&ff_mv_tables[0])) < 0) - return ret; - if ((ret = init_mv_table(&ff_mv_tables[1])) < 0) - return ret; + init_mv_table(&ff_mv_tables[0], mv_index_tables[0]); + init_mv_table(&ff_mv_tables[1], mv_index_tables[1]); + for(i=0;i