From patchwork Tue Nov 24 14:41:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24027 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 1B61C44BE5C for ; Tue, 24 Nov 2020 16:42:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 049FC68BCA6; Tue, 24 Nov 2020 16:42:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CAFB68BC99 for ; Tue, 24 Nov 2020 16:42:06 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id m6so22553407wrg.7 for ; Tue, 24 Nov 2020 06:42:06 -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 :mime-version:content-transfer-encoding; bh=wQdiRJrQkQWvOrDpCKIIBK5mIkZoIWYO7iQWNV60hcw=; b=ARSIYMqYSpINz/2vCUOLB/DNq27FncWcNdyxUHsldsgjLKG+aRTGBPcyyjxVcgCSNd ynUa7JEtbruEeBmdp3o/p9KxY37ELfJxwJnRmjKNPb4JbJjZSxTg76OD4H2Y30BrVK65 YDGUyY80hnQaHPpkd3MLsyyhE3s0fui6m9AMiw8SRsKYWHpC6i95MgEsywFNS3KT0fsO gji2Fe7Su4hKOAHQAUKB3Q5Ket2A8bNcgULvveKcF00cVwwAjxv5ulWbCZq8iD+t2OLs qwg1T+qTSv3yku03zfp8t6aaRs88/qlJE9E6raLttVTH2A3L1Waw5iXMvsU78LGgIq+D lUkg== 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:mime-version:content-transfer-encoding; bh=wQdiRJrQkQWvOrDpCKIIBK5mIkZoIWYO7iQWNV60hcw=; b=tzQpV+3E16HZ5RnpzunpWFiXjEpD5/G0tgqgue2Db7giDnYUZ56IAqqSG9rX9MoRxN 9f6pPG5e/aEurhT+9JRulm6aZ01Ipksdwd30lkGOfKZAFH/hLcgp7CbqZJ8HaI1pAtUv bmzJ6gDlOpH1ngc4TOMmUQ++221IiBYG2qAfQFJPL0pQd5H+694/k3U0njX+WpCGNeyx swFUEYyuoB0sp/417MFyMsp3ZDL02BUYB0JKEaKWLsB5ikd0v8hNIsfucaCiuNjYeIkB 0A5B+jaQG1O18VKyFAF2c0hBislGCGaNAteWfxezPdt9L6NJM+/q2IuADxbtsTMi2IiV 3YPw== X-Gm-Message-State: AOAM53188sFpF9azSNrAlsIYsBxmr7DlSsRh7jQJYFxNEJhieX+HLnZy HvLrwKYLYYjwPoyjb43zYG/co0exOM9ksQ== X-Google-Smtp-Source: ABdhPJxHlG3/SoMZoIkbvkSkvoRSc/liup7Dai5rFaaJFCQCV5ljZTyqPpZTVS+BeSL3d8hEjSErZw== X-Received: by 2002:a05:6000:10d2:: with SMTP id b18mr2328324wrx.344.1606228925637; Tue, 24 Nov 2020 06:42:05 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id 90sm26453232wrl.60.2020.11.24.06.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 06:42:04 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Nov 2020 15:41:22 +0100 Message-Id: <20201124144122.1994769-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201124144122.1994769-1-andreas.rheinhardt@gmail.com> References: <20201124144122.1994769-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/mpeg12enc: Deprecate using MPEG-2 intra VLC table for mpeg1video 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" This option just creates broken output because an MPEG-1 bitstream can't signal whether MPEG-2 intra VLC tables have been used. Signed-off-by: Andreas Rheinhardt --- Missing version bump. doc/APIchanges | 3 +++ libavcodec/mpeg12enc.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index b70c78a483..dea54c4415 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2020-xx-xx - xxxxxxxxxx - lavc 58.xx.100 - avcodec.h + Deprecate the "intra_vlc" option for the mpeg1video encoder. + 2020-xx-xx - xxxxxxxxxx - lavf 58.64.100 - avformat.h Add AVSTREAM_EVENT_FLAG_NEW_PACKETS. diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 2466db8a91..0b5badde3c 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1114,6 +1114,7 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO) { s->min_qcoeff = -255; s->max_qcoeff = 255; + s->intra_vlc_format = 0; } else { s->min_qcoeff = -2047; s->max_qcoeff = 2047; @@ -1136,8 +1137,6 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) #define COMMON_OPTS \ { "gop_timecode", "MPEG GOP Timecode in hh:mm:ss[:;.]ff format. Overrides timecode_frame_start.", \ OFFSET(tc_opt_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE },\ - { "intra_vlc", "Use MPEG-2 intra VLC table.", \ - OFFSET(intra_vlc_format), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, \ { "drop_frame_timecode", "Timecode is in drop frame format.", \ OFFSET(drop_frame_timecode), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, \ { "scan_offset", "Reserve space for SVCD scan offset user data.", \ @@ -1147,12 +1146,16 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) static const AVOption mpeg1_options[] = { COMMON_OPTS + { "intra_vlc", "deprecated, does nothing", + OFFSET(intra_vlc_format), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE | AV_OPT_FLAG_DEPRECATED }, FF_MPV_COMMON_OPTS { NULL }, }; static const AVOption mpeg2_options[] = { COMMON_OPTS + { "intra_vlc", "Use MPEG-2 intra VLC table.", + OFFSET(intra_vlc_format), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "non_linear_quant", "Use nonlinear quantizer.", OFFSET(q_scale_type), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "alternate_scan", "Enable alternate scantable.", OFFSET(alternate_scan), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "seq_disp_ext", "Write sequence_display_extension blocks.", OFFSET(seq_disp_ext), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE, "seq_disp_ext" },