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 D134747676 for ; Tue, 19 Sep 2023 19:24:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 425BE68C9A1; Tue, 19 Sep 2023 22:21:39 +0300 (EEST) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D0E068C264 for ; Tue, 19 Sep 2023 22:21:34 +0300 (EEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id A26105109 for ; Tue, 19 Sep 2023 21:21:34 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Vpgb71cKLZRQ for ; Tue, 19 Sep 2023 21:21:29 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id E1D875177 for ; Tue, 19 Sep 2023 21:20:42 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D58723A0D2D for ; Tue, 19 Sep 2023 21:20:42 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 21:10:45 +0200 Message-Id: <20230919191044.18873-19-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230919191044.18873-1-anton@khirnov.net> References: <20230919191044.18873-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/27] XXX fftools/ffmpeg_enc: temporarily disable side data copying 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 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: It conflicts with threading work. --- fftools/ffmpeg_enc.c | 2 ++ .../fate/matroska-mastering-display-metadata | 24 ++------------- tests/ref/lavf/mpg | 6 ++-- tests/ref/seek/lavf-mpg | 30 +++++++++---------- 4 files changed, 23 insertions(+), 39 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index c300a11f28..d8d7c3416d 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -345,6 +345,7 @@ int enc_open(OutputStream *ost, const AVFrame *frame) return ret; } +#if 0 if (ost->enc_ctx->nb_coded_side_data) { int i; @@ -380,6 +381,7 @@ int enc_open(OutputStream *ost, const AVFrame *frame) } } } +#endif // copy timebase while removing common factors if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0) diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata index 3726469213..6d3c4f1023 100644 --- a/tests/ref/fate/matroska-mastering-display-metadata +++ b/tests/ref/fate/matroska-mastering-display-metadata @@ -1,5 +1,5 @@ -9d0fb8123a2e90e85153428a91d1ee9d *tests/data/fate/matroska-mastering-display-metadata.matroska -1669589 tests/data/fate/matroska-mastering-display-metadata.matroska +1ed4248debff46761cf6230c55768dd9 *tests/data/fate/matroska-mastering-display-metadata.matroska +1669465 tests/data/fate/matroska-mastering-display-metadata.matroska #extradata 0: 4, 0x040901a3 #extradata 3: 200, 0x506463a8 #tb 0: 1/1000 @@ -24,7 +24,7 @@ #sar 3: 1/1 0, 0, 0, 16, 57008, 0x43416399, S=2, 8, 88 1, 0, 0, 16, 2403, 0xaa818522 -3, 0, 0, 16, 274117, 0xc439610f, S=2, 8, 88 +3, 0, 0, 16, 274117, 0xc439610f 0, 17, 17, 16, 57248, 0xa06cd7b5 1, 17, 17, 16, 2403, 0xe1a991e5 2, 17, 17, 16, 1602, 0x5d868171 @@ -74,22 +74,4 @@ codec_name=pcm_s16be [STREAM] index=3 codec_name=ffv1 -[SIDE_DATA] -side_data_type=Content light level metadata -max_content=1000 -max_average=100 -[/SIDE_DATA] -[SIDE_DATA] -side_data_type=Mastering display metadata -red_x=17/25 -red_y=8/25 -green_x=53/200 -green_y=69/100 -blue_x=3/20 -blue_y=3/50 -white_point_x=3127/10000 -white_point_y=329/1000 -min_luminance=0/1 -max_luminance=1000/1 -[/SIDE_DATA] [/STREAM] diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg index 332b7114b5..8779871ebf 100644 --- a/tests/ref/lavf/mpg +++ b/tests/ref/lavf/mpg @@ -1,9 +1,9 @@ -01bbdea588da51ab4a9d1d26f3443c96 *tests/data/lavf/lavf.mpg +f9b99341af206109dc6d48fc7c57fb5c *tests/data/lavf/lavf.mpg 372736 tests/data/lavf/lavf.mpg tests/data/lavf/lavf.mpg CRC=0x000e23ae -87b447b78a7d1141b9d41bb3aa50434d *tests/data/lavf/lavf.mpg +d2b1947240fd0d8da0561c785788cc32 *tests/data/lavf/lavf.mpg 389120 tests/data/lavf/lavf.mpg tests/data/lavf/lavf.mpg CRC=0x60ba4ab9 -284f41c914df75c12de01e223d65f87f *tests/data/lavf/lavf.mpg +a4cc793cd26616ac980514c4399e36cb *tests/data/lavf/lavf.mpg 372736 tests/data/lavf/lavf.mpg tests/data/lavf/lavf.mpg CRC=0x000e23ae diff --git a/tests/ref/seek/lavf-mpg b/tests/ref/seek/lavf-mpg index e804b84739..e8b8899fb6 100644 --- a/tests/ref/seek/lavf-mpg +++ b/tests/ref/seek/lavf-mpg @@ -2,51 +2,51 @@ ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 1 flags:1 dts: 1.051544 pts: 1.051544 pos: 342028 size: 314 +ret: 0 st: 0 flags:1 dts: 1.460000 pts: 1.500000 pos: 346112 size: 24937 ret: 0 st: 0 flags:0 ts: 0.788333 -ret: 0 st: 0 flags:0 dts: 0.820000 pts: 0.860000 pos: 118784 size: 14717 +ret: 0 st: 0 flags:0 dts: 0.820000 pts: 0.860000 pos: 126976 size: 14717 ret: 0 st: 0 flags:1 ts:-0.317500 ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st: 1 flags:0 ts: 2.576667 -ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size: 379 +ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 51200 size: 367 ret: 0 st: 1 flags:1 ts: 1.470833 -ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size: 379 +ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 51200 size: 367 ret: 0 st:-1 flags:0 ts: 0.365002 ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st:-1 flags:1 ts:-0.740831 ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st: 0 flags:0 ts: 2.153333 -ret: 0 st: 1 flags:1 dts: 1.051544 pts: 1.051544 pos: 342028 size: 314 +ret: 0 st: 0 flags:1 dts: 1.460000 pts: 1.500000 pos: 346112 size: 24937 ret: 0 st: 0 flags:1 ts: 1.047500 -ret: 0 st: 0 flags:0 dts: 1.020000 pts: 1.060000 pos: 196608 size: 17639 +ret: 0 st: 0 flags:0 dts: 1.020000 pts: 1.060000 pos: 202752 size: 17651 ret: 0 st: 1 flags:0 ts:-0.058333 ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st: 1 flags:1 ts: 2.835833 -ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size: 379 +ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 51200 size: 367 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 1 flags:1 dts: 1.051544 pts: 1.051544 pos: 342028 size: 314 +ret: 0 st: 0 flags:1 dts: 1.460000 pts: 1.500000 pos: 346112 size: 24937 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:0 dts: 0.620000 pts: 0.660000 pos: 55296 size: 14239 +ret: 0 st: 0 flags:0 dts: 0.620000 pts: 0.660000 pos: 63488 size: 14239 ret: 0 st: 0 flags:0 ts:-0.481667 ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st: 0 flags:1 ts: 2.412500 -ret: 0 st: 1 flags:1 dts: 1.051544 pts: 1.051544 pos: 342028 size: 314 +ret: 0 st: 0 flags:1 dts: 1.460000 pts: 1.500000 pos: 346112 size: 24937 ret: 0 st: 1 flags:0 ts: 1.306667 -ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size: 379 +ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 51200 size: 367 ret: 0 st: 1 flags:1 ts: 0.200844 ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 1 flags:1 dts: 1.051544 pts: 1.051544 pos: 342028 size: 314 +ret: 0 st: 0 flags:1 dts: 1.460000 pts: 1.500000 pos: 346112 size: 24937 ret: 0 st: 0 flags:0 ts: 0.883344 -ret: 0 st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos: 147456 size: 12755 +ret: 0 st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos: 153600 size: 12767 ret: 0 st: 0 flags:1 ts:-0.222489 ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st: 1 flags:0 ts: 2.671678 -ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size: 379 +ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 51200 size: 367 ret: 0 st: 1 flags:1 ts: 1.565844 -ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size: 379 +ret: 0 st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 51200 size: 367 ret: 0 st:-1 flags:0 ts: 0.460008 ret: 0 st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos: 2048 size: 208 ret: 0 st:-1 flags:1 ts:-0.645825 -- 2.40.1 _______________________________________________ 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".