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 EC66A49437 for ; Sun, 11 Feb 2024 07:41:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9044868D083; Sun, 11 Feb 2024 09:41:17 +0200 (EET) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 732C068CAFA for ; Sun, 11 Feb 2024 09:41:11 +0200 (EET) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6e09493eb8eso1165293b3a.1 for ; Sat, 10 Feb 2024 23:41:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707637269; x=1708242069; darn=ffmpeg.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=4/hjoQL4yhNKLumFMNDizZZFYsXIbgDCkcNFwsTC+Pg=; b=icfaS6nnqpRuJ+LmD8hOM8nUqjOZk5jhnWzLeEXrS+kxC3BzzfAE9lF9H7h+LpcEtP G0dm7Negx3H71MoT7X+E2JVOM6W0igpk1kXMp7C/0VPvqTFlrVZV3scoD9RK1NVIDFni ZVAvLU28TfZ9GUJsOgQ1Mk/oXAg4KtGj+Q3Cz0uspAShA6DP7uxhZBtoqTRU6lqOyf32 Gd/cGHte/aqlMq7/hTzWIrLmkQZLOI9WlTAdE4z2WkKGDyGrUevo9U/aP+CnGeqJazlS 5rSdD6S4VxVcO8ucCyv4lBn/oYnKZVIrRbnMBEqEkMJsiH33gXg93/zg6JGLiwynLod5 IUpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707637269; x=1708242069; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4/hjoQL4yhNKLumFMNDizZZFYsXIbgDCkcNFwsTC+Pg=; b=UBXpBQ4TcSDm6SzxU3IZAegbZfQUkftPwftfcNCTEiuoKaaO97QxvxfshlCkjY66y9 pTsxcZ439azFngkARKEQK7r1dbS6LxTWLBCB1LFfVgs0+SQJDpsLvVWjP+HTR/SPZdCG t/URg2sQeBE1UIefdenpfEix8l/9MsU5n27Zl2bplZNj7P9fHx+jtJoYhzZpgV01ppYl 6DCeoGwEnFfGdCepATNRoKc+Ji9xJJlPJ7NjzP8tuSnbuZtmEAW//wjnvGJ+nGliSeTn 3Tednnh/BPb3ROJ9BKurxUnYIJnRTFmtOwjU11cZHq4WYNvgaoGobFOJ37KvQGKxQq03 gbkQ== X-Gm-Message-State: AOJu0YzUa9L+zkZqccshHbtKpoLDwsELMLtza240pBTXMtUfBe5hkbgE W2RNEU6d/C3HDT1RQUKRqHykvFdLbcQjQgroZjMiwZGPJgHW7eD03xBVrK/9 X-Google-Smtp-Source: AGHT+IHdWQVpznukexJb+bjDjBsV2T5Nof20zm1pntAC1oDZ4yOI7mAYt8PcXP7ApuBlwvXHOKJYag== X-Received: by 2002:a05:6a21:9103:b0:19e:4c37:8737 with SMTP id tn3-20020a056a21910300b0019e4c378737mr4413746pzb.5.1707637269496; Sat, 10 Feb 2024 23:41:09 -0800 (PST) Received: from localhost ([157.82.200.138]) by smtp.gmail.com with UTF8SMTPSA id n8-20020a056a000d4800b006d638fd230bsm3423739pfv.93.2024.02.10.23.41.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 10 Feb 2024 23:41:09 -0800 (PST) From: Akihiko Odaki Date: Sun, 11 Feb 2024 16:40:28 +0900 MIME-Version: 1.0 Message-Id: <20240211-noopenh264-v1-1-e18090bdcfed@gmail.com> X-B4-Tracking: v=1; b=H4sIAOt5yGUC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIxMDI0MD3bz8/ILUvAwjMxNdM1MDEzPD1LSkZGNjJaCGgqLUtMwKsGHRsbW 1ANPN+9hcAAAA To: ffmpeg-devel@ffmpeg.org X-Mailer: b4 0.12.3 Subject: [FFmpeg-devel] [PATCH] lavc/libopenh264: Check for noopenh264 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: Akihiko Odaki 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: noopenh264 is a "fake implementation of the OpenH264 library we can link from regardless of the actual library being available": https://gitlab.com/freedesktop-sdk/noopenh264 A distributor may wish to link against openh264/noopenh264 and let the decoder and encoder work only if the actual library is available. On the other hand, an application may want to know if the decoder or encoder is available beforehand so that it can determine what format to download for decoding, or what format to advertise for the peer receiving the encoded video. Check the availability of the actual library at runtime initialization and do not expose the encoder and decoder if they are not available. Signed-off-by: Akihiko Odaki --- libavcodec/codec_internal.h | 2 ++ libavcodec/libopenh264dec.c | 36 +++++++++++++++++++++++------------ libavcodec/libopenh264enc.c | 46 ++++++++++++++++++++++++++++----------------- libavcodec/tests/avcodec.c | 2 ++ 4 files changed, 57 insertions(+), 29 deletions(-) diff --git a/libavcodec/codec_internal.h b/libavcodec/codec_internal.h index 130a7dc3cd..635af644fa 100644 --- a/libavcodec/codec_internal.h +++ b/libavcodec/codec_internal.h @@ -122,6 +122,8 @@ enum FFCodecType { /* The codec is an encoder using the receive_packet callback; * audio and video codecs only. */ FF_CODEC_CB_TYPE_RECEIVE_PACKET, + /* The codec is not available. */ + FF_CODEC_CB_TYPE_NONE, }; typedef struct FFCodec { diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c index b6a9bba2dc..f5544142aa 100644 --- a/libavcodec/libopenh264dec.c +++ b/libavcodec/libopenh264dec.c @@ -48,6 +48,17 @@ static av_cold int svc_decode_close(AVCodecContext *avctx) return 0; } +static av_cold void svc_decode_init_static_data(FFCodec *codec) +{ + ISVCDecoder *decoder; + + if (WelsCreateDecoder(&decoder)) { + codec->cb_type = FF_CODEC_CB_TYPE_NONE; + } else { + WelsDestroyDecoder(decoder); + } +} + static av_cold int svc_decode_init(AVCodecContext *avctx) { SVCContext *s = avctx->priv_data; @@ -153,18 +164,19 @@ static int svc_decode_frame(AVCodecContext *avctx, AVFrame *avframe, return avpkt->size; } -const FFCodec ff_libopenh264_decoder = { - .p.name = "libopenh264", +FFCodec ff_libopenh264_decoder = { + .p.name = "libopenh264", CODEC_LONG_NAME("OpenH264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), - .p.type = AVMEDIA_TYPE_VIDEO, - .p.id = AV_CODEC_ID_H264, - .priv_data_size = sizeof(SVCContext), - .init = svc_decode_init, + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_H264, + .priv_data_size = sizeof(SVCContext), + .init_static_data = svc_decode_init_static_data, + .init = svc_decode_init, FF_CODEC_DECODE_CB(svc_decode_frame), - .close = svc_decode_close, - .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | - FF_CODEC_CAP_INIT_CLEANUP, - .bsfs = "h264_mp4toannexb", - .p.wrapper_name = "libopenh264", + .close = svc_decode_close, + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | + FF_CODEC_CAP_INIT_CLEANUP, + .bsfs = "h264_mp4toannexb", + .p.wrapper_name = "libopenh264", }; diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 6f231d22b2..1963f2cf5c 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -106,6 +106,17 @@ static av_cold int svc_encode_close(AVCodecContext *avctx) return 0; } +static av_cold void svc_encode_init_static_data(FFCodec *codec) +{ + ISVCEncoder *encoder; + + if (WelsCreateSVCEncoder(&encoder)) { + codec->cb_type = FF_CODEC_CB_TYPE_NONE; + } else { + WelsDestroySVCEncoder(encoder); + } +} + static av_cold int svc_encode_init(AVCodecContext *avctx) { SVCContext *s = avctx->priv_data; @@ -429,23 +440,24 @@ static const FFCodecDefault svc_enc_defaults[] = { { NULL }, }; -const FFCodec ff_libopenh264_encoder = { - .p.name = "libopenh264", +FFCodec ff_libopenh264_encoder = { + .p.name = "libopenh264", CODEC_LONG_NAME("OpenH264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), - .p.type = AVMEDIA_TYPE_VIDEO, - .p.id = AV_CODEC_ID_H264, - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_OTHER_THREADS | - AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, - .priv_data_size = sizeof(SVCContext), - .init = svc_encode_init, + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_H264, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_OTHER_THREADS | + AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, + .priv_data_size = sizeof(SVCContext), + .init_static_data = svc_encode_init_static_data, + .init = svc_encode_init, FF_CODEC_ENCODE_CB(svc_encode_frame), - .close = svc_encode_close, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | - FF_CODEC_CAP_AUTO_THREADS, - .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, - AV_PIX_FMT_YUVJ420P, - AV_PIX_FMT_NONE }, - .defaults = svc_enc_defaults, - .p.priv_class = &class, - .p.wrapper_name = "libopenh264", + .close = svc_encode_close, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_AUTO_THREADS, + .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUVJ420P, + AV_PIX_FMT_NONE }, + .defaults = svc_enc_defaults, + .p.priv_class = &class, + .p.wrapper_name = "libopenh264", }; diff --git a/libavcodec/tests/avcodec.c b/libavcodec/tests/avcodec.c index 08ca507bf0..0e2ecccbf9 100644 --- a/libavcodec/tests/avcodec.c +++ b/libavcodec/tests/avcodec.c @@ -112,6 +112,8 @@ int main(void){ case FF_CODEC_CB_TYPE_RECEIVE_PACKET: is_encoder = 1; break; + case FF_CODEC_CB_TYPE_NONE: + continue; default: ERR("Codec %s has unknown cb_type\n"); continue; --- base-commit: 81c2557691b12ceb79b3ba92aa496f2301ab4d18 change-id: 20240210-noopenh264-650461efbc33 Best regards, -- Akihiko Odaki _______________________________________________ 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".