From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 961AF452FD for ; Tue, 17 Jan 2023 19:38:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D87168BEA6; Tue, 17 Jan 2023 21:37:59 +0200 (EET) Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [94.100.177.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F29768BB11 for ; Tue, 17 Jan 2023 21:37:53 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail4; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=d/1XFa1XlJyJw2+tJvRGD2jNd63E5Y9fcMZmCu3zYnE=; t=1673984278;x=1674074278; b=fy6VcXHQo7yAsxACqm5FJrH15djdH2xZXSQOa2GI2/8WgagWL+g48dJ0g+4IYg1AipPVFw32pa4n+w/0N0pH2H/ApOz+GrqiziTe51CsgR/BFOuB3DvWq97yvelglRH0UFA+i0zuy7/o2HQ8MfwHIpagFvG27WJWvZGj+el29iNoai6oIR97GAeHFNhu7l8QrKoTDzgJBO70jANR5ZbFL9jmQfhslpexKL/5cMEuAIV9DP9F0RLD9vLlJ6OV/d8v5QDDi9uEMWgwXDppN28bwgaxaQ+q2pBWlfk8/rtgpqF3Cn0Aq8IJmyAl/VfW1GAezFwJTS7IakggaUJoHafuRQ==; Received: by smtp49.i.mail.ru with esmtpa (envelope-from ) id 1pHrmJ-0005Ei-2T; Tue, 17 Jan 2023 22:37:51 +0300 From: pawday-at-mail.ru@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Jan 2023 23:37:16 +0400 Message-Id: <20230117193715.1160-1-pawday@mail.ru> X-Mailer: git-send-email 2.39.0.windows.2 MIME-Version: 1.0 Authentication-Results: smtp49.i.mail.ru; auth=pass smtp.auth=pawday@mail.ru smtp.mailfrom=pawday@mail.ru X-Mailru-Src: smtp X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD90D1502B3BE350FE4A5712DF39180E67B9907EBBF710504ED00894C459B0CD1B912B2DFE5E336071F5F54DF0B7417D57C99630ED16ABD893D9D86B8FE651AF7FF X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE72F22E6DC541F75D9EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E8DF562B6063DE0A8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8D41926A02E08DE23CBEB4DA5B78F5B4C6F9789CCF6C18C3F8528715B7D10C86859CC434672EE6371117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC1BE95B8C87527B4BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735200A3850AC1BE2E735CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EEB28585415E75ADA9E7815D572A9D6896D8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE386A7C529F68B8E5C040F9FF01DFDA4A8C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637E497A0EAD2F87B28EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A5698414A47C7A6C09AB889572483E1386E5E8BF0B34EF2CF65A4FF58CDAEABE2AA132EA92956906CB697742550EFD07B08A6F03AC25FB4B01 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D340297C696F996E3840A40CFB8042326AAC2EDE658014DE98CB116E68A4CC777B6BE486DFB279120E91D7E09C32AA3244C85A58EEB08C649594D632B8C6A31200FF165894D92D62706729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbDGeE7DdcRmxD9tjZixsFA== X-Mailru-Sender: 7F53729568FFBF28BAC5A23C9FF6F70BE47726FB26488BE193F1063BB83EC6CEA32AB15EA70FF3FB6BCD89EFCAA5B95A3182BEA23F8D30570919CA7848C88715AE27536645352AA2540CD94B559F21E07652F063092A458A0D4ABDE8C577C2ED X-Mras: Ok Subject: [FFmpeg-devel] [PATCH] avcodec: Use preprocessors conditions 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: Pawday Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Pawday Thank you for showing me logic substitution issues. So, if you curious i am trying to substitute calling thread depending functions for unuptimized compiler where dead code illumination is not working and it couse linking error on my microcontroller toolchain without any thread model support. --- libavcodec/avcodec.c | 23 ++++++++++++++++------- libavcodec/decode.c | 7 +++++-- libavcodec/encode.c | 9 ++++++--- libavcodec/h264dec.c | 14 +++++++------- 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index a85d3c2309..9a11ab043f 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @ -403,10 +403,16 @@ void avcodec_flush_buffers(AVCodecContext *avctx) av_frame_unref(avci->buffer_frame); av_packet_unref(avci->buffer_pkt); - if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) +#if HAVE_THREADS + if (avctx->active_thread_type & FF_THREAD_FRAME) ff_thread_flush(avctx); - else if (ffcodec(avctx->codec)->flush) - ffcodec(avctx->codec)->flush(avctx); + else { +#endif + if (ffcodec(avctx->codec)->flush) + ffcodec(avctx->codec)->flush(avctx); +#if HAVE_THREADS + } +#endif } void avsubtitle_free(AVSubtitle *sub) @@ -441,12 +447,15 @@ av_cold int avcodec_close(AVCodecContext *avctx) if (avcodec_is_open(avctx)) { AVCodecInternal *avci = avctx->internal; - if (CONFIG_FRAME_THREAD_ENCODER && - avci->frame_thread_encoder && avctx->thread_count > 1) { +#if CONFIG_FRAME_THREAD_ENCODER + if (avci->frame_thread_encoder && avctx->thread_count > 1) { ff_frame_thread_encoder_free(avctx); } - if (HAVE_THREADS && avci->thread_ctx) +#endif +#if HAVE_THREADS + if (avci->thread_ctx) ff_thread_free(avctx); +#endif if (avci->needs_close && ffcodec(avctx->codec)->close) ffcodec(avctx->codec)->close(avctx); avci->byte_buffer_size = 0; diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 6be2d3d6ed..5076b8a420 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -300,10 +300,11 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, return AVERROR_EOF; got_frame = 0; - - if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) { +#if HAVE_THREADS + if (avctx->active_thread_type & FF_THREAD_FRAME) { ret = ff_thread_decode_frame(avctx, frame, &got_frame, pkt); } else { +#endif ret = codec->cb.decode(avctx, frame, &got_frame, pkt); if (!(codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) @@ -320,7 +321,9 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, if (frame->format == AV_PIX_FMT_NONE) frame->format = avctx->pix_fmt; } } +#if HAVE_THREADS } +#endif emms_c(); actual_got_frame = got_frame; diff --git a/libavcodec/encode.c b/libavcodec/encode.c index fbe2c97cd6..efd1cbe6c7 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -269,17 +269,20 @@ static int encode_simple_internal(AVCodecContext *avctx, AVPacket *avpkt) got_packet = 0; av_assert0(codec->cb_type == FF_CODEC_CB_TYPE_ENCODE); - +#if CONFIG_FRAME_THREAD_ENCODER if (CONFIG_FRAME_THREAD_ENCODER && avci->frame_thread_encoder) /* This will unref frame. */ ret = ff_thread_video_encode_frame(avctx, avpkt, frame, &got_packet); else { +#endif ret = ff_encode_encode_cb(avctx, avpkt, frame, &got_packet); #if FF_API_THREAD_SAFE_CALLBACKS if (frame) av_frame_unref(frame); #endif +#if CONFIG_FRAME_THREAD_ENCODER } +#endif if (avci->draining && !got_packet) avci->draining_done = 1; @@ -670,11 +673,11 @@ int ff_encode_preinit(AVCodecContext *avctx) return AVERROR(ENOMEM); } - if (CONFIG_FRAME_THREAD_ENCODER) { +#if CONFIG_FRAME_THREAD_ENCODER ret = ff_frame_thread_encoder_init(avctx); if (ret < 0) return ret; - } +#endif return 0; } diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 6ede4e8c9f..4538974dab 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -933,13 +933,13 @@ static int finalize_frame(H264Context *h, AVFrame *dst, H264Picture *out, int *g *got_frame = 1; - if (CONFIG_MPEGVIDEODEC) { - ff_print_debug_info2(h->avctx, dst, NULL, - out->mb_type, - out->qscale_table, - out->motion_val, - out->mb_width, out->mb_height, out->mb_stride, 1); - } +#if CONFIG_MPEGVIDEODEC + ff_print_debug_info2(h->avctx, dst, NULL, + out->mb_type, + out->qscale_table, + out->motion_val, + out->mb_width, out->mb_height, out->mb_stride, 1); +#endif } return 0; -- _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".