From patchwork Wed Jun 24 13:27:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20569 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 92F0844B965 for ; Wed, 24 Jun 2020 16:35:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B45D68B53F; Wed, 24 Jun 2020 16:35:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20D3568B566 for ; Wed, 24 Jun 2020 16:35:13 +0300 (EEST) Received: by mail-qt1-f193.google.com with SMTP id z1so1668553qtn.2 for ; Wed, 24 Jun 2020 06:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=KF8kxrcLaBXhi1tKalJ7rXY9HnVm/4sVqqo2Wv8wbnc=; b=JWwNbr/u1IKWpXR+kO7I+QvGIWav2DlZdwcFE0x3MVXvzTsUTTCB+P9b7Yd3Ufq9NF V/kZ//wmyaqjMZRWkbcCPPUUwqiPNP3eLN3v7SS5EFI8m2QeoJz5FqleXRtu3u6NL1JC fQkLsvPjkVp5eJEBL0AmVGQrFhai1cummkZPwO8ivb/wJUJLeiuxjbG9lKhfXM6Stec+ iwocihYP7onp2xbPQDXxRhX8epoDZCaTvabjHeRSnpDC74HwfutYCjEZktsT4VIjD0hK mViqYAzJ7iuM5mXEJatbDdqKU+vZmsmNSQnN9/1u4i+NYsyuDfovnKn6+0tzOLz9OZht /M6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=KF8kxrcLaBXhi1tKalJ7rXY9HnVm/4sVqqo2Wv8wbnc=; b=FRLDraamKnjlj+3ex5zIzWg+lrVOKsupPYuFjoQ0V3yhDrrpwf5vBlPHbncK+tFHpX t2bY1AktH6G7JtnZy/jjeLJUSFWHvE+Xq/46XwtmTAp7bfSR9/AMdUeDd0uIu4NQViJV 01cXrNxGnJvZOTXPKgPvov2phYXlRfi9bt7dC2JHGRSgX8EvlCE88GU8ZuNVp03GZ1zK jpPiNaE422oHPKaYRh9eez8qJmedsGUgR2243h/XkI1oOpQPcKrd4GA5dRofi6/XuECf 38clrhPjkFTEckdzLuzlaEmHbtODRmp1bbIRCChkURM79x/YuHisZZhTtww/M2uwKkdx ypLg== X-Gm-Message-State: AOAM532RL/Bd1ZIHx5pEV5GEO08gk1i8vPTr/risfB1KNDiiBxw4xg20 VjUIU3NUlvqo9nQH1CH9HI21R67J X-Google-Smtp-Source: ABdhPJz7YqPsPxTzgTS1NADDJymJ9qR5mrsaNgAMB/cguRFUWK4ejaNNqy/ybTfkaPW5Htl9yLRBVg== X-Received: by 2002:a37:8ac7:: with SMTP id m190mr17729310qkd.209.1593005290774; Wed, 24 Jun 2020 06:28:10 -0700 (PDT) Received: from localhost.localdomain ([191.83.220.40]) by smtp.gmail.com with ESMTPSA id k2sm3239673qkf.127.2020.06.24.06.28.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 06:28:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jun 2020 10:27:23 -0300 Message-Id: <20200624132725.1483-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/mlpenc: remove delay codec capability 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The encoder has no delayed packets at the end of the encoding process, so signaling this capability is unnecessary. This also fix an assertion failure introduced in 827d6fe73d, as return values higher than 0 are not expected. Signed-off-by: James Almer --- libavcodec/mlpenc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index c6a7963c22..f99d2f5d6f 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -2226,9 +2226,6 @@ static int mlp_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if ((ret = ff_alloc_packet2(avctx, avpkt, 87500 * avctx->channels, 0)) < 0) return ret; - if (!frame) - return 1; - /* add current frame to queue */ if ((ret = ff_af_queue_add(&ctx->afq, frame)) < 0) return ret; @@ -2389,7 +2386,7 @@ AVCodec ff_mlp_encoder = { .init = mlp_encode_init, .encode2 = mlp_encode_frame, .close = mlp_encode_close, - .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]) {AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE}, .supported_samplerates = (const int[]) {44100, 48000, 88200, 96000, 176400, 192000, 0}, .channel_layouts = ff_mlp_channel_layouts, @@ -2405,7 +2402,7 @@ AVCodec ff_truehd_encoder = { .init = mlp_encode_init, .encode2 = mlp_encode_frame, .close = mlp_encode_close, - .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]) {AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE}, .supported_samplerates = (const int[]) {44100, 48000, 88200, 96000, 176400, 192000, 0}, .channel_layouts = (const uint64_t[]) {AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, 0},