From patchwork Sat Jun 22 15:31:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50076 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1128638vqz; Sat, 22 Jun 2024 08:31:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWs0EeqbqOkRkfYRaFawustXWKsDXa8IYJGIpwNDZCB2TjDt1vrk1YY4x0wqGKIBjFbi2dE2JVlZ8V9I7/jGN0iIrih8XG7meybzQ== X-Google-Smtp-Source: AGHT+IFmz1h1RQ27t9INoInLgsHYOcMM+RKNdnDjng3tLkyqJwYqPZocGgFoyoKpZgZKJpBrb++z X-Received: by 2002:a50:d552:0:b0:57d:4d2:83fa with SMTP id 4fb4d7f45d1cf-57d4bd53811mr252870a12.9.1719070304009; Sat, 22 Jun 2024 08:31:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070303; cv=none; d=google.com; s=arc-20160816; b=Tx1u39FbZqyWG5crg7C2D000cZidUxSWefELuLjCqWE0emxELGwOMmN1EFFHztIRLG h+A+A9kjbxdf+JW4/5+yALyVL3p05WCoURcezhgt20JXvuWfr+Lp2qMjuNuVWfZDQVUW I3u++DuLryiPu6B3krgFmGFKraZOrumLYgeS2z11uXtbRhdyRLBLk4+RTKCmprQpGKq1 ZhIVQsdQsXlqZKT8tK3NaYqtbIm9be5g8QfqpPX9JiHbJZbYoqPuG2yMuKUlbGUc3ADT enEdnMqKLOZa9zd/z/mqZqf/oeYh7DMYB0WMh3G5KO2A7lc+N11ycJow2kijp3jo9OLF 46UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=CEthkLACo+eF3l3na1oSoBrDJu4wVlZo28YoZ/MDUKw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=F5hwUL7FrixR6EmgzjltT2ZHpxz+5OyMCgq0j+T7B5aztNYKtSaUhF7JkHZ+gLtZ8A BTKZQTpCH+QhCGfOZsNnSEvZH7P3qBtKx6zz8RMGNulcnDQEDwrPj6XejsOHlanRjXhx PjqJ/Zx0eJ+yuNlF5nFiP1q39a+lk7OP2k4qORDleFU1xnDfi5gwIi+IOe0DcLeRaxaG gRAvQLxpK41pwJZgPYH/7zYc1FY5V1jpXWhKaPnrqvBp4+tva4+xvXl9zr2kKxA0Zya5 mn+BD048xcnjWxYxprE+/olqV+JHXKrc0wAQkfjyFbbG95EQJ8lqKUI65Qb94QOQaSoz XYgA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XiYbU7eF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57d306b6844si1844303a12.341.2024.06.22.08.31.43; Sat, 22 Jun 2024 08:31:43 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XiYbU7eF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D41468CE05; Sat, 22 Jun 2024 18:31:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B790368CE05 for ; Sat, 22 Jun 2024 18:31:32 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-70436048c25so2775486b3a.0 for ; Sat, 22 Jun 2024 08:31:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070289; x=1719675089; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=DFM9oymuwxeddWUAQDTqjBGjjo/+oHy445a4in6g7oE=; b=XiYbU7eFJhhfpLDapYjgRMHUes94+hxt8OKP914w22Ytwt8qwddVjlOFk49GSf9VS2 q2CBnidkyRuizH6XV2RRv/fxTPbSYucyf+2O/AjXnVllh9dMjphLQhCPnWieFt7aQwLD GudKG0XNCqGRCoEmSBwQZbbPoQ0Si00T7QAz3iSX8CdX3TYjUv+nufVATrtg1kt1rkWF cbYVm+31kDGvwAqPlMhyrXJb9IsgGLaVXsvZn6s98LuDrutaTiRflWHK/71L7emDlVYa gqD4URWaR+v5zLBCgN5KSPOG0fDvQtT4r0XysTLKEt3jrABRPXtSmBD1I4HIivIIMaR7 t0fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070289; x=1719675089; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DFM9oymuwxeddWUAQDTqjBGjjo/+oHy445a4in6g7oE=; b=W0mMFXdyJ7TPYK6qIX4vNuY0fYoJN0W4M8N/i6CEBfgtfbi7jJbs+RlBOXI/Rr/MC7 jd/gYJzr+dTwknF/HjVrdW7BvwnwZN8Ad42cYKC68Mnujv1bt5R5pjaejwxDktFTsM+n 3P13dAu87RT0O0lG+SK2ruEFTzBRfv9GgH80bmBxtsr5ExaLnqrfPIh/T2mPr0FNd1dV +h2TPbyyIMWb8ytPKDMPlXhPvHZynJOriurgW/gSZCqmWtNmtk4oRN+cR+M03oYe5fVU L/TMt93cqpD7sBZZB1JZ/GltwxRmIkRp0vMJ3SUsWTLTls9O2vLhBseB5M4CguwdDQzs yKqg== X-Gm-Message-State: AOJu0YymqYx0/Uf0dyT6wClO68w9TwMSTlXRImx/di3fN167yP9QeNDQ MreoGMgT3AiR5ysZfGDYBqcXlvKHQXRH6aVtE+euoh5LtyoHryosjJxedA== X-Received: by 2002:a05:6a21:99aa:b0:1b6:ed32:4613 with SMTP id adf61e73a8af0-1bcee665fa4mr1395255637.2.1719070289012; Sat, 22 Jun 2024 08:31:29 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:15 -0300 Message-ID: <20240622153122.6220-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/8 v3] avutil/stereo3d add a Monoscopic view enum value 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 59zrcel+m//a We need a way to signal the frame has a single view that doesn't map to any particular eye, and it should be the default one. Signed-off-by: James Almer --- Now updating all the fate test... The 3D ones will be updated again in the following commits once ffprobe is adapted to properly handle the view field. libavutil/stereo3d.c | 3 ++- libavutil/stereo3d.h | 9 +++++++-- tests/ref/fate/matroska-spherical-mono | 2 +- tests/ref/fate/matroska-spherical-mono-remux | 4 ++-- tests/ref/fate/matroska-stereo_mode | 8 ++++---- tests/ref/fate/matroska-vp8-alpha-remux | 2 +- tests/ref/fate/mov-spherical-mono | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index 19e81e4124..0c0cad127c 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -68,9 +68,10 @@ static const char * const stereo3d_type_names[] = { }; static const char * const stereo3d_view_names[] = { - [AV_STEREO3D_VIEW_PACKED] = "packed", + [AV_STEREO3D_VIEW_MONO] = "monoscopic", [AV_STEREO3D_VIEW_LEFT] = "left", [AV_STEREO3D_VIEW_RIGHT] = "right", + [AV_STEREO3D_VIEW_PACKED] = "packed", }; static const char * const stereo3d_primary_eye_names[] = { diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index 00a5c3900e..77340f72b2 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -143,9 +143,9 @@ enum AVStereo3DType { */ enum AVStereo3DView { /** - * Frame contains two packed views. + * Frame is monoscopic. */ - AV_STEREO3D_VIEW_PACKED, + AV_STEREO3D_VIEW_MONO, /** * Frame contains only the left view. @@ -156,6 +156,11 @@ enum AVStereo3DView { * Frame contains only the right view. */ AV_STEREO3D_VIEW_RIGHT, + + /** + * Frame contains two packed views. + */ + AV_STEREO3D_VIEW_PACKED, }; /** diff --git a/tests/ref/fate/matroska-spherical-mono b/tests/ref/fate/matroska-spherical-mono index b108596350..aa17e9c624 100644 --- a/tests/ref/fate/matroska-spherical-mono +++ b/tests/ref/fate/matroska-spherical-mono @@ -3,7 +3,7 @@ side_data_type=Stereo 3D type=2D inverted=0 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 diff --git a/tests/ref/fate/matroska-spherical-mono-remux b/tests/ref/fate/matroska-spherical-mono-remux index eec41b77f3..75a9b73a37 100644 --- a/tests/ref/fate/matroska-spherical-mono-remux +++ b/tests/ref/fate/matroska-spherical-mono-remux @@ -27,7 +27,7 @@ DISPOSITION:forced=1 side_data_type=Stereo 3D type=2D inverted=0 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -56,7 +56,7 @@ DISPOSITION:forced=0 side_data_type=Stereo 3D type=2D inverted=0 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 diff --git a/tests/ref/fate/matroska-stereo_mode b/tests/ref/fate/matroska-stereo_mode index 26c325b20e..e35425ae76 100644 --- a/tests/ref/fate/matroska-stereo_mode +++ b/tests/ref/fate/matroska-stereo_mode @@ -132,7 +132,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=side by side inverted=0 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -152,7 +152,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=top and bottom inverted=1 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -170,7 +170,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=interleaved lines inverted=1 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -189,7 +189,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=interleaved columns inverted=1 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 diff --git a/tests/ref/fate/matroska-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux index 06bcc4b4ba..814463eeda 100644 --- a/tests/ref/fate/matroska-vp8-alpha-remux +++ b/tests/ref/fate/matroska-vp8-alpha-remux @@ -35,7 +35,7 @@ DISPOSITION:still_image=0 side_data_type=Stereo 3D type=2D inverted=0 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 diff --git a/tests/ref/fate/mov-spherical-mono b/tests/ref/fate/mov-spherical-mono index b108596350..aa17e9c624 100644 --- a/tests/ref/fate/mov-spherical-mono +++ b/tests/ref/fate/mov-spherical-mono @@ -3,7 +3,7 @@ side_data_type=Stereo 3D type=2D inverted=0 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 From patchwork Sat Jun 22 15:31:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50077 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1128715vqz; Sat, 22 Jun 2024 08:31:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUCFJlpG0UOIlwy87ML8gYnSu8VAcgGNES7n5JYbBIrQ4wYCLXB1l9HS2DBsflChiDzVXmksp7668fLuX2Qc/5DBSd92kiQBe1xOA== X-Google-Smtp-Source: AGHT+IEqBeUC6dbydMRitKmchefiGWlk8Ar2W2ydp4evbr1fZFyEgJnYUovnH+wWc8A7C79lY38Q X-Received: by 2002:a50:c307:0:b0:57d:4df:f7e0 with SMTP id 4fb4d7f45d1cf-57d4bddf37dmr270537a12.35.1719070313923; Sat, 22 Jun 2024 08:31:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070313; cv=none; d=google.com; s=arc-20160816; b=ijtpmYX6e11qHwWn/RQx+M++/pMVFWCN0TEKstn5nPccunloQWv1WugwkpBc1hKvpu sQetfEEZSs0EWzu66HNO2Lz/mscD4ki/M5kC5eEp6j/0Zc9x284yla5XW6kZF4GIitZJ OFVKIRA4FTkTu6He6XNJZp5bOjzgNoMYgSAUBAT4QatBghvvkQCKCMR5N6oRAA5OYxy0 E8HPy0wrRH97sslDBgKmTa7TtpVSkvG8Yb6Yl8qOqgnhiSkGEA8XqHQF+y0PPlKf9uen wKapjO92ehqBisgwzvh5a6AemTyRe1TK8OP1Ogagm9RSW7DbxoLa9Tb8yulnWwdlxM/q sMag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=AX4dcz6moONrsqha1fNf9KNHCX+L8ZGyBjKNHgygYj4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=f3HuJqgaryn95BoDyIQVlEODvRrNlU38kzOFyui/O+/QXh98yoWGOqX0mo82fuGYNV agfBhJr2RUV5Rl3XGRUo9Ndo8xQUmM3CUsFNKy5u9YY71ASd04KwG4qKbYezxshv7Tdt N5zct9ziR8UeaXm8dmly2Pu89nAr4FB94++M3NnmqhB4GMGv9bEsR+KAb5XjitZ7AyLJ 7prpX27I1iUq1RE8DqfCjctPaNUfVNop/RpDyqUFWgDWGJEYg2qEmBKtcZ8Bl+e5XLvW zZw/fiOEUdgW6Bo1NNsMhIpUHfg4r38HYnZ5HyT4HGZZAaTEZ7U9ns3omtu7rjveIIp/ PWZQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=MPT8n3A5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57d306b69b9si1827878a12.309.2024.06.22.08.31.53; Sat, 22 Jun 2024 08:31:53 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=MPT8n3A5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3FCE068D5D4; Sat, 22 Jun 2024 18:31:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1922B68D58F for ; Sat, 22 Jun 2024 18:31:34 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-70666aceb5bso508874b3a.1 for ; Sat, 22 Jun 2024 08:31:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070291; x=1719675091; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=V0SJv85We04NYVNfOvzvGaNuzHxlQI0Hgs9vKOXGeiQ=; b=MPT8n3A5PxLRxV6XWPhMF95hXHDwX7JhnTMf6wTtJs2/1kl4Hzknxshv26/iZmfOPX F0AoM6KHGMLhzXStncXeZRzI6sICftIbwxjOMvZml/+PArtq1ayZhzs7JmDc+4UdfNLv a2C32toS0q1Ehzi740IhgV6YvqvCzFhXp5H8bi7uHevgRI9Qhj7OABiX7oqofOX4HPZ5 lMC4euA6E1kEIM9vSWPtjtK9vMOOGUX0Q2P7XPiSY0wogEjEgj2Ivo8YD4+NBNxG06nl hF0Y5JuwFENMqIcIVROau4TiN9cOe3AKb41AlQE3BfuyENRXNDdQDNtxy1sFJPWxND5w GPEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070291; x=1719675091; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V0SJv85We04NYVNfOvzvGaNuzHxlQI0Hgs9vKOXGeiQ=; b=qfoqoAKaBJmps/SYRI264MMf8E5nYT1UVmEx2mPD56M20zthigRnPZhNkPEzi34fLx 79HE0mxGRatl+OZPPhafxoJdEIyj74TyMB0l4yVO037PplH8Gn2ttIBegku4gvcZifIP 9KwIezmxSunBWaaGIMWDWU70xcE3YbPWJRsPMc3nPjKWgctv100Pm8gZDZyAgRls4fiN LIF4qlYoKKBVmXp77Ror4D6F1xGgdIyIUCmHGgIn9iDHSxbpQhbnTuh5Mh7lnEUxquKD 1Oh00YEnb2w9lOulBGgkYQIHKBlIAJS97xTAytIHV/wukaNMNdfFaT2kgT0DuDkSYQje QNQg== X-Gm-Message-State: AOJu0YzGg8hyy89+ORHZuHVm+pUEGBvWC1LVO8yQNO8seb5BtKI45Tfn Y6z9+m0pZh/UWE+3gx27qQr3oh1xESTmbTXNfTVmwY4x0Sp7UV8vIRFLMw== X-Received: by 2002:a05:6a20:aea8:b0:1b6:bb61:3782 with SMTP id adf61e73a8af0-1bcf7fd13admr109591637.39.1719070291248; Sat, 22 Jun 2024 08:31:31 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:16 -0300 Message-ID: <20240622153122.6220-2-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622153122.6220-1-jamrial@gmail.com> References: <20240622153122.6220-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/8 v2] avutil/stereo3d: add a Stereo3D type to signal that the packing is defined by the view field 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: murWZmPpuB4P Given that a video stream/frame may have only one view coded, or both packed in an undefined way, and as the values of AVStereo3DView and AVStereo3DType may clash (namely if type is AV_STEREO3D_2D, then AV_STEREO3D_VIEW_PACKED would be invalid, and if it's anything other than it, then only AV_STEREO3D_VIEW_PACKED would be valid), this commit adds a new type value AV_STEREO3D_VIEW that signals the user that AVStereo3D.view contains information about the nature of the stream, with the added constrain that AVStereo3D.view should be ignored if AVStereo3D.type is anything other than AV_STEREO3D_VIEW. Signed-off-by: James Almer --- This is the only way i could think of to work around the fact AVStereo3DType and AVStereo3DView just can't work well together if we want to keep AVStereo backwards compatible. libavutil/stereo3d.c | 1 + libavutil/stereo3d.h | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index 0c0cad127c..e8e5030db9 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -65,6 +65,7 @@ static const char * const stereo3d_type_names[] = { [AV_STEREO3D_SIDEBYSIDE_QUINCUNX] = "side by side (quincunx subsampling)", [AV_STEREO3D_LINES] = "interleaved lines", [AV_STEREO3D_COLUMNS] = "interleaved columns", + [AV_STEREO3D_VIEW] = "view defined", }; static const char * const stereo3d_view_names[] = { diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index 77340f72b2..e3af519e03 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -136,6 +136,14 @@ enum AVStereo3DType { * @endcode */ AV_STEREO3D_COLUMNS, + + /** + * Video may be monoscopic, or stereoscopic where either the + * packing is unknown or only one view is present. + * + * @see AVStereo3DView + */ + AV_STEREO3D_VIEW, }; /** @@ -207,7 +215,8 @@ typedef struct AVStereo3D { int flags; /** - * Determines which views are packed. + * Determines which views are packed. This field should be ignored when + * @ref type is set to anything other than AV_STEREO3D_VIEW. */ enum AVStereo3DView view; From patchwork Sat Jun 22 15:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50083 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1129087vqz; Sat, 22 Jun 2024 08:32:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVOjFrsU7LYFiDs+uHSUkxYCR3+51RAlFtN/QyOOPi1A3jKxWJdmUtdmG9axEsgllN2Boa/7B2lHXoAW8GJDX/bSHGBQHKHHUOP2g== X-Google-Smtp-Source: AGHT+IHAD8BcgEBL45pcsbPxhhWvzOiyD3OVBTrXbLhYn292PghaidW0tMyNlx8SMV0gvEEH5cXo X-Received: by 2002:a17:906:1849:b0:a6f:bd33:d1d5 with SMTP id a640c23a62f3a-a700e731281mr106124866b.34.1719070367516; Sat, 22 Jun 2024 08:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070367; cv=none; d=google.com; s=arc-20160816; b=aiIBO/YvvZZ5m5ZbB6BxxcVgEFHCnzEj8amHoaY+xgedKT59Vb2B5TVtTjU3k5ky51 R0uv5GmOfgCh0/ESsji6ziF6pSPmTsnIs2Si58AyjIbH1d88YLNQpB34kgADF1j5XNwi zVJidyBhXv/QUrKNNHDNUc60ExpjGTVj9XG7UPvela0IRCFQmZ9XfriJw4w2lfgM26BH 6n4E8SxCK0MuWrwmI2XScJtTMkfoqsD+bO/1U789RGddvvbkeC9Q1LC1t9yVVOG83lnZ /CBQN3fOasHXEdJ7xTXTQad1X9p2Vd/XnfDMhZFueT1CPCT1OWe0sFNqQQhia7SbTfVF RJKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=6oDrMzueIzFF+DvFAtbxF8JEHi34hq4Op+5d+ndlzyI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ewXjzsm21NniMgo4LNhayG2Wac91LzAg7xF9cps5xSLUmbLj45wJ5RnJhf0Manx+Er qSRUIur7g3AjFTYzdmWLwqmJfRZhkIvThMMcVBXctBCk+CDXsby6peYs1bpUX9IpU6M6 Y+LLFGxLlVR/QUeaIGxt833tLHBaBNDVrY6I5JBLN4YYNcXq31sZmV/x26HZr4Pinu2x PvLWR/gDlaaFNIX2YIkqpbDTur2ZYuCk7djODPXm1VTYOa7ziIEXQ0Us2JceqXop3bA7 FZqSjv5iBYtu+KT9f8B0Z3oU3ekwbIbUGfuMsjY+w32r8Z2U5t0LMOLbpHqaVSLNOzjw tMfA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=PQ9no8qV; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6fd391ca78si169865066b.459.2024.06.22.08.32.46; Sat, 22 Jun 2024 08:32:47 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=PQ9no8qV; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3DB3068D66F; Sat, 22 Jun 2024 18:32:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D457A68D5BA for ; Sat, 22 Jun 2024 18:32:02 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-70436ac8882so2422913b3a.2 for ; Sat, 22 Jun 2024 08:32:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070320; x=1719675120; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tRpyk02BfRjJYHgsLSng3k0EbESQSRRb/726TP6Xy7Y=; b=PQ9no8qVRjQ9a2L85vIienwOZS4EaM7+WGjk0sRBKoBK45oIRdeEoLwZciJDc8BG/E RsJNq0lrUDNlUgC0ewZH24F0+Vs30CfqspsfE/50Dvu5Uxlec/sJTZqAdFCRV/jKQeO2 GZUZnJTi/OeX2Rta4VhR3o5kVU01be2YJ5Fkc62/Mns7d1YKBU/3CYAGhH/B5snazAqW uGUSc2N1blDmOY88Zjn+ts9qiNLWWzr9AKikRuUMAL6ws52cJBoEDTrP0f8huAq/NUn2 hcSvE2FCcKOkNXaW0AKltHj+RiQdlJeLBWG8UYOEKkWVGwUpps/+duNgWb0k3ys7O2Vc eO5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070320; x=1719675120; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tRpyk02BfRjJYHgsLSng3k0EbESQSRRb/726TP6Xy7Y=; b=TI0gLqD8+QnZYJpfXSI6mR3fOwNcSb11fGuZ/Z9xzHMHWg1CKiMjA7h9hxuth+oKkw dzZTlJMHkT9qaOUC4hpfsoVRUL7XzdgEWy7OBQrO+2CzgqnS49S7nkLKSNg3TlbaPHnT TecT+HbwCuxB4rlSt3GtVsgqqKB9A/onwG3g9FVIDLbanzcPSgdvIaP21mNT8ghsIzWA MZBwfsgo3RSBtf5u7ITpjut+hpnmlIWuJGaN57RAtMitl7/8nz814J0QNEDPrcmF/rpX RlzKmslilfHEZ2hcztzM9WDMKeEsSJrBdB5dkk2q/lrPpD1E2k+6NtDVlmlFBFLLEwWz uXZg== X-Gm-Message-State: AOJu0YyPKTE+LpiQwW41Pyljh2rTpuqhkTl49inaIO95apSLci9cNtx4 8EHbH9GREXsYWQH38XThQC/ssYRMCYQZKIDVXHCgmKT1Jlt6z3N7Hqy/Bg== X-Received: by 2002:a05:6a20:81d2:b0:1b8:a188:53da with SMTP id adf61e73a8af0-1bcf7ee9057mr118025637.29.1719070292995; Sat, 22 Jun 2024 08:31:32 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:32 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:17 -0300 Message-ID: <20240622153122.6220-3-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622153122.6220-1-jamrial@gmail.com> References: <20240622153122.6220-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/8 v2] avformat/mov: default to Monoscopic view when parsing eyes box 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pp4Rw4vqdsUT Signed-off-by: James Almer --- libavformat/mov.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index f08fec3fb6..9b2ce1f167 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6546,7 +6546,8 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) int size, flags = 0; int64_t remaining; uint32_t tag, baseline = 0; - enum AVStereo3DView view = AV_STEREO3D_VIEW_PACKED; + enum AVStereo3DType type = AV_STEREO3D_2D; + enum AVStereo3DView view = AV_STEREO3D_VIEW_MONO; enum AVStereo3DPrimaryEye primary_eye = AV_PRIMARY_EYE_NONE; AVRational horizontal_disparity_adjustment = { 0, 1 }; @@ -6596,6 +6597,9 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) view = AV_STEREO3D_VIEW_LEFT; else if (has_right) view = AV_STEREO3D_VIEW_RIGHT; + if (view) + type = AV_STEREO3D_VIEW; + break; } case MKTAG('h','e','r','o'): { @@ -6697,6 +6701,7 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) } sc->stereo3d->flags = flags; + sc->stereo3d->type = type; sc->stereo3d->view = view; sc->stereo3d->primary_eye = primary_eye; sc->stereo3d->baseline = baseline; From patchwork Sat Jun 22 15:31:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50078 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1128787vqz; Sat, 22 Jun 2024 08:32:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVXcYuRdhWc+XNGMh1OtBieFNvnHqKhSvpi4lZ+QJUf4MFm2/ylrG1MM6S18HqzAVFu0NkOss6P8d8YGVk7fbz2dtD0g9XUlHp0Gg== X-Google-Smtp-Source: AGHT+IGaW9movITBq3CcnlfwmM0VlUftdNK4ny/CGzdUh90PKbxiGA+0U8LUPHknlkz1C50v5n3s X-Received: by 2002:a17:906:c096:b0:a6f:86fd:72b8 with SMTP id a640c23a62f3a-a715f97972bmr75687566b.42.1719070323089; Sat, 22 Jun 2024 08:32:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070323; cv=none; d=google.com; s=arc-20160816; b=VBuuycZsBps1X/Gjqk2C+CNDSdbwSqw8E1kDr4QL/UrYqnrZ62izuu1dVkTTkodffw CXamRycu+anO000f9APf54f7GQgFFZbS4UJ53Yq7Dmhuz0fg38R1IO0vZE0Etp0OS4uC orc4K8nEBySr8AQmqYWXGFgTUf8bOJloog4vsWc+0s6rvnILWBCAhuDdAmxUYs/15LWJ CcDrkcGjrK9fIQg56gNJo+LReI+U3cM84eT2gmYdYxKnIY5gKLuWpXdMQpOgJ1ETKWYi sNubBkko1zbTnRMyivaVjqswUUkj7U+jnp9yWC+T96oaDJtydTVMZl9+Fi4H84gC4Mry iLPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=XL8ZDM5lB3aLBKPZui33b06JflZjMccW6bJEv3yA+mM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=MIdSRTFGsAPSNHXDuq4LMrrEdl1yiemvRPgmmCF8pTGWzV0s7brXeRGk00pjpzZSji d+uCW1g+q5RXYjYgWjRh0nT1A99CBem4KgosK0scznefbXot0eTyRknmo25P//23OSEw QpHY9MXs3N3yl9NqwlXbWpMHZBWlQ7StrsOCWOju0LdN13Wc+i9UWtzgYOSAK/tIsx4A WGjpM5Or6YCzv/ISxo7uoA+F2v60EpRu66hDvA3QiNTmGjtVvdpmBFbRYPsbSXzM8/Va xae/VN7ZCQT+8YkRXJFHghzTApcT9iSPBI736Z2Sk+egpLh0KwyJMWvCo48iTn1TMUNY ChAQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jjtdDJMl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a70dfba2d51si55908966b.352.2024.06.22.08.32.02; Sat, 22 Jun 2024 08:32:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jjtdDJMl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B41168D607; Sat, 22 Jun 2024 18:31:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A99968D5E0 for ; Sat, 22 Jun 2024 18:31:37 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-70109d34a16so2587525b3a.2 for ; Sat, 22 Jun 2024 08:31:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070294; x=1719675094; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Bp7K2SC09TsoLvHBIg6rOS/6bibk30cL37jV1NNYi7I=; b=jjtdDJMlCv0AVTnKy90ASK6B/WA/FVClMupCgj3DGa2CNEBOEb9K9owXu9jNx/LuEx G5abnNHJIFW8Yjk4sXox7hQF/JswsvJ8SKJVsrOIrbNDj1TDJfbWR+DK8wQsaTKU74Qy gb9KKBr0e8kfiRle2mf8X5XXYsSgUaFPh7KE4iwq6D9TAo//dws4dG4MC4S7qJUGGkTA 3CFJ5oMX9uDt8fLrxottpuCuHN8Ak7IrR0cT97aTUokV/VtusKhEhOmF5xS99fh7Npn4 VsP+q9ngI0ZdkPZKpxGf/kPtzEvWPEVW9Teab5zZYWNB56nDOcoqsaPrHKiX4KgvlwaO zQFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070294; x=1719675094; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Bp7K2SC09TsoLvHBIg6rOS/6bibk30cL37jV1NNYi7I=; b=iWpJ5OMK605CSAkAm3OOF6iTNJOKBRaz3jfwhBuiMjBYE38HoS4DfUQn8F3WTqiFRu SqJlRIvdskrzp7bl+D8Tf1yvqrnHUtQoh/AGs8UGQFl/ypOoxUev9bXoAQIXOtSzcl8Y ArUuxsbVH4GGwCfUy3dq7yvzTdqNoGshj+LC3RqVpy36GgcoxhN2TvgHiRbPeT7TsB1w YYeYBC4K5WdW4shOnK/j/KTFvWLSY8yceaxHbWhJicDC6I60/1c8H94GcoD/BWgftc+M fJJVuA8ytVa9f5s0JVHQY/KNIkYlLMn1jsz2uLaWPhqhKMIIzvsRMd/cg8NwbL1OKSs5 mNvA== X-Gm-Message-State: AOJu0Yx+WiB6veJlXfRsYNMqlTsH5tM7dly9+zOlCZ2djHGuB4ncOb+P XZw0Uay9PBuNe+AkScCSRGlZV4xDtl7QGqG3t7R52R1za+vvs2P37zEhUg== X-Received: by 2002:a05:6a00:2b4d:b0:706:6cb5:9720 with SMTP id d2e1a72fcca58-7067476452cmr203854b3a.34.1719070294420; Sat, 22 Jun 2024 08:31:34 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:18 -0300 Message-ID: <20240622153122.6220-4-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622153122.6220-1-jamrial@gmail.com> References: <20240622153122.6220-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/8 v2] avformat/dump: print Stereo3D view only when type is view defined 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UQp1oo+2d/ap Signed-off-by: James Almer --- libavformat/dump.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index 61a2c6a29f..33d72b7e18 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -259,9 +259,10 @@ static void dump_stereo3d(void *ctx, const AVPacketSideData *sd, int log_level) stereo = (const AVStereo3D *)sd->data; - av_log(ctx, log_level, "%s, view: %s, primary eye: %s", - av_stereo3d_type_name(stereo->type), av_stereo3d_view_name(stereo->view), - av_stereo3d_primary_eye_name(stereo->primary_eye)); + av_log(ctx, log_level, "%s", av_stereo3d_type_name(stereo->type)); + if (stereo->type == AV_STEREO3D_VIEW) + av_log(ctx, log_level, ", view: %s", av_stereo3d_view_name(stereo->view)); + av_log(ctx, log_level, ", primary eye: %s", av_stereo3d_primary_eye_name(stereo->primary_eye)); if (stereo->baseline) av_log(ctx, log_level, ", baseline: %"PRIu32"", stereo->baseline); if (stereo->horizontal_disparity_adjustment.num && stereo->horizontal_disparity_adjustment.den) From patchwork Sat Jun 22 15:31:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50079 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1128852vqz; Sat, 22 Jun 2024 08:32:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULnA1s7Ur7oB2U/gqUUixhEiSPvp3RM2jUEtmWvu2FReYV1ZFNzhgc4zKhHPM1ecRWcq72ClNznMkMVZE0jVJuoY3WcJn/YUJLSw== X-Google-Smtp-Source: AGHT+IEhun/d5X9YQM/cq9l/MfWTd85jZUty82ITXEEcNdd+2/O0KKGYe32YSVwSIOZ/NaeEAJX3 X-Received: by 2002:a17:906:fb0c:b0:a6e:f646:6fdb with SMTP id a640c23a62f3a-a7245c7025emr6563566b.72.1719070331936; Sat, 22 Jun 2024 08:32:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070331; cv=none; d=google.com; s=arc-20160816; b=NmCR893LM9ls/4OEkpGWnzWTw7vJPPb7aWPTZg3mtvNHPjsu4KrSXOAPmkTtDn0LV4 pId+xI8fUf8juPyVvhl0mcdgI6JIldWK6a3nEt7gQ55O+Q0SxUk5AszyusZuuBnMFrbX F6tc45S8u0DMYMNCPzq9aUoayfbZb0+tP61M8qRDLf96XlFA0+BhKlkGmC02xLSvdZm6 3WXgkfftH1OO7hkIwjHOUCdfcoOb0Uyjp6U1KWGDlvzUnSg5Si61UL6HgwKfsYp2xvrI 4YtweSJGaPNg5xnSPfg59aOXAK/EwSrUdC0sFQPjOKwBrXhW79Xup+/TZ04yzFu1LnSu RUiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=goWByIygY+eer6Ao63MmjLB9xPrfwFT97K6Swm4ZOMI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VmJ32IV5ValDebSDKXwspBPEIOIgms4uDXkcTVQhDJpc4wj8WDElcBaTyi1jBZk1Oj 0bG3Ldrs0cyYO5j/JIXP7s8GXx8ffk+5EnggqpqF9W3Os4wgCZMalC62zpnntR5Szqj2 1tHK9IgxsL90eF1Aj7E9hCzgtokbX72+/BVecvF3gSVgixciI/ui6SDDDHwOkATnIwo5 Ta7GWDJjfbyurTVqeS+bh/6FM9SrmHU4q2t5NsBQevtoZOyu1PN85FbuGILZ7956Z0yo ZjkhC2NWXZECFkaPiyy1fy/1OE05tm7H4klvm9PW5SO+Mv+ZvUHjOIsciwt4QlA+PCpB MrMw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jfYPf5IC; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6fcf565342si194239766b.685.2024.06.22.08.32.11; Sat, 22 Jun 2024 08:32:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jfYPf5IC; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D07F68D63E; Sat, 22 Jun 2024 18:31:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A74868D607 for ; Sat, 22 Jun 2024 18:31:39 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-70656b43fd4so1126645b3a.0 for ; Sat, 22 Jun 2024 08:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070297; x=1719675097; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FkX+aRQoxUDPhIxWajQ8kYlXitnC8CdmqqX+0DiEgoU=; b=jfYPf5ICKEAVwGNCGX/3rxzEhkebiQQmMvj/X6Ngp6hd0dD+fnW0zT7sd2/X8kjlSv sBLCpyvS7a5/gMshlMOshej4r2xm/y3681eyxTzcQjmmCG+650lNgNuy4vBLUkQOqgc0 fozkpgP1vniHGKADve/PjQTX+v++SRMkShXQFqk/4p4dLAAhBS9r9720W3rRNaiaF5L1 MWRms/2ZbefrdA7nGgjb02/OSH5iuDZ6sgcucqg0R11/EpWcYLHj362GhyFvUooyg4qD YO0+FELxrorc36MSPl9oIfYitX7vfG8AM7rThxxYBBCqubYLQicoffZcQu24O50icKRe 5TCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070297; x=1719675097; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FkX+aRQoxUDPhIxWajQ8kYlXitnC8CdmqqX+0DiEgoU=; b=PnuvYesqdQZEZ37CRYDKZyjkCbPWJ9EdHKcYXT07VffDPOYIAb3aPy/QZWDN8eoByt aWU4pmutGfQ6R68cnVBVjW9cNzFOkqgIjUgZxqH5/mK56ovvdZBYLJtxharSyvWE416E gKZMTN2OA2zvLpA/rfWC72xe+JN778a4W6VctPTVdBTYdXJJ+0FBkqp69z4oqMi4DvGn Wp6B76FdUicVKRzvC6S7hj2zWzYdv9qmtQIDSYgeyMABi7V5cpPTvVazQMlEwA2yZREm OUhBfxgQ2+cenJaLn56j4dUVi9j2iLLKs++6Y5umJhre1CamKABOzuk8DnrZZbU72sgk 5Daw== X-Gm-Message-State: AOJu0Yxei+MM9KppaUdquUmWe2qFh2dMST7H5aa+td26R9tdjAMBthVr OHmKoKtqPHu4CZaKZM07mEza0nDayJykiyMrcDLrowvTtk8GIUTuF+Sg8A== X-Received: by 2002:a05:6a20:3514:b0:1b6:a7c5:4fac with SMTP id adf61e73a8af0-1bcf7fc2c7dmr115205637.38.1719070295955; Sat, 22 Jun 2024 08:31:35 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:19 -0300 Message-ID: <20240622153122.6220-5-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622153122.6220-1-jamrial@gmail.com> References: <20240622153122.6220-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/8 v2] fftools/ffprobe: infer AVStereo3D.view when it's not explicit 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ENnHbPT7gDxl Signed-off-by: James Almer --- Better infer it than not printing it, following the logic from 5140d8334e3b. fftools/ffprobe.c | 6 +++++- tests/ref/fate/matroska-stereo_mode | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index d7ba980ff9..397ea848fc 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2542,9 +2542,13 @@ static void print_pkt_side_data(WriterContext *w, print_int("rotation", rotation); } else if (sd->type == AV_PKT_DATA_STEREO3D) { const AVStereo3D *stereo = (AVStereo3D *)sd->data; + enum AVStereo3DView view = stereo->view; print_str("type", av_stereo3d_type_name(stereo->type)); print_int("inverted", !!(stereo->flags & AV_STEREO3D_FLAG_INVERT)); - print_str("view", av_stereo3d_view_name(stereo->view)); + if (stereo->type != AV_STEREO3D_VIEW) + view = (stereo->type == AV_STEREO3D_2D) ? + AV_STEREO3D_VIEW_MONO : AV_STEREO3D_VIEW_PACKED; + print_str("view", av_stereo3d_view_name(view)); print_str("primary_eye", av_stereo3d_primary_eye_name(stereo->primary_eye)); print_int("baseline", stereo->baseline); print_q("horizontal_disparity_adjustment", stereo->horizontal_disparity_adjustment, '/'); diff --git a/tests/ref/fate/matroska-stereo_mode b/tests/ref/fate/matroska-stereo_mode index e35425ae76..26c325b20e 100644 --- a/tests/ref/fate/matroska-stereo_mode +++ b/tests/ref/fate/matroska-stereo_mode @@ -132,7 +132,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=side by side inverted=0 -view=monoscopic +view=packed primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -152,7 +152,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=top and bottom inverted=1 -view=monoscopic +view=packed primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -170,7 +170,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=interleaved lines inverted=1 -view=monoscopic +view=packed primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -189,7 +189,7 @@ TAG:DURATION=00:00:10.000000000 side_data_type=Stereo 3D type=interleaved columns inverted=1 -view=monoscopic +view=packed primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 From patchwork Sat Jun 22 15:31:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50080 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1128935vqz; Sat, 22 Jun 2024 08:32:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlVkrjAvY0aUmr1piPDTQuIlLwNqtP9DoyNiVPiaLeRfSd19uY3AiEON33CfTgpRjWW0dGZ2LHu1O5/8dxGVoGpila5zG6KiFOZg== X-Google-Smtp-Source: AGHT+IExk6j4wOlrhfDy2jLeqkYZ80Ah42yF0mg6J/3sdW5BaspEH1XZ+9PvHGSpsoT5sEm8H7Zz X-Received: by 2002:a17:906:5910:b0:a6f:c268:ff2e with SMTP id a640c23a62f3a-a714d72f01bmr76488866b.5.1719070340173; Sat, 22 Jun 2024 08:32:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070340; cv=none; d=google.com; s=arc-20160816; b=OfWd7hSD+GyoehzOkmFzk0qFK2ZkCmo8VVUsmytiQl7bOQpKW2km/XFpZl1Iv/5Sjp lULSJPrDIWWr4brNL2R+Xb32LDjps3A2TwaYtZ8FS7K3tMCTPTJty9aMMAVnwBQCBVFM y0e6YzCE4222+w0UUM12KT7nYGXzisstYVV7Znd6ujzyWMfLHOb+vZPD+TNtrGlocj72 hmEDbpeaY3LGD14WxGpN6tddobtGHAQmRFH4MFTMPLVTZWy9YredoMhuz+4lQ1mc15N8 jEUbe7SFslu+afhNrQhioSox1HMKVcUbQZalIuRMXcr5U27PyvTwTIw1S2DiXVzwFfCk 1X7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=MEroRE6xZ6HgAcW5Dum0boBvUuhMUsmeC+RkSd3VZiw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=s8JmfpYhz6hPzBgZXl+MNaqWfbN/O4NdPqCFxaNEHvB3K5/OH+CPY/8j35r8IeEa2B 1wFLDFf1diukeBl1WzccYck883EP/7nu2id/6wDGvUPjnD3b3MB8pMd9xHiLu+q+c9uG NXJOQNoC/hbygsV9R3lcBTNv/QExobXntB8odosVLG63aPan+Mi7ZnwnW4FrkDZ+JpLS zsW+cqAubHSZdr4SZU1Cng84IjHAk/YKKbpnGYV8vSsIsHAet+V+oLpaqgQt/8oSihvK +S1gpJRkb5SuB9uJLGCrq0Sr/SWecRP6BHYJg5b87H/EGogtDLox/Yy5QCp55WWZC5C0 KQYw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=dblcBOqz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6fcf56516bsi191415466b.602.2024.06.22.08.32.19; Sat, 22 Jun 2024 08:32:20 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=dblcBOqz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 604CF68D654; Sat, 22 Jun 2024 18:31:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5654268D602 for ; Sat, 22 Jun 2024 18:31:40 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-70671ecd334so126037b3a.0 for ; Sat, 22 Jun 2024 08:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070297; x=1719675097; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uBVkSWgJQ7hxhQvvZKdnMrMJSox5bjDYEobbQkYuIAE=; b=dblcBOqz59nHEGmaJ62FVw27IUGJMeXGHY1eekgICUUF+mFNRHQDySdVwgznKhb12S /LU1mwNCRFGj1sCWkK2I6HS+FYbErQhf5m9LmzfWJuJfri6+mHLR/Cq/t0uVzFRN3Vts f20Xlq2yoUlQ6kyC/c0rqLghXkjVue4KwKPQ+1E9QoD0ASmkLkOVnyuqxatcrAPEyGvW bZ+2lLtFOZgz/sUc6Xmv2BVX8w+3GYX26P5V/LQFiihZKZGT8u6as9z+jPrJZ8JTFi63 KiGm8iYu5r4MrLT4r7nT+xlzFCdmr8VWQGxIR246CoqkBh6EdXwM6YnlSoJrA1HWNyNl U2lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070297; x=1719675097; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uBVkSWgJQ7hxhQvvZKdnMrMJSox5bjDYEobbQkYuIAE=; b=EENCWg0kUPpgAEy6LYQRNt11PX+4iIDmgUOWQs4WwiACZJluS/GYgJ5FFBXPtMN0P1 3btOQ8IlYtHKZH3uDl/kBXtnmEjy5qF1n4oh0Que+wKzDggxNqGK23OVaw9iW0lpNa5L H7eXqzCZ1kkzN5gTzIiEzw6OH6CscIC9NW77aVDRj7BTBziOfi7cp/59ZUwLmT+HTduc opxVaVpKSE9+hpHtiHzHMEhJEeuFiOslBaZ39w9XyeY6m1YozaYvXoSHADj645vEhQtl Ek5FSo1o/DmBPQFvNJtp46WFq9Yt8li/uGkUEXjtClTp/Jvrt1NXkJINtzR2uPuaSKEC TO0Q== X-Gm-Message-State: AOJu0Yw/TYoa3D5amOC6ufwMModjjB/8gr2tSv6kzAzVFJWsoPLP8Igt nK7efb3y/oKNkpEzLJ54YVvd1m6b5XG9M1bCsoJ0r8f+XSUdriyBk1YZ9w== X-Received: by 2002:a05:6a20:3ba5:b0:1b7:d72e:9e5e with SMTP id adf61e73a8af0-1bcf44ee325mr723285637.37.1719070297350; Sat, 22 Jun 2024 08:31:37 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:36 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:20 -0300 Message-ID: <20240622153122.6220-6-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622153122.6220-1-jamrial@gmail.com> References: <20240622153122.6220-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8 v2] avutil/stereo3d: add a new allocator function that returns a size 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aDQRfASXOefF av_stereo3d_alloc() is not useful in scenarios where you need to know the runtime size of AVStereo3D. Signed-off-by: James Almer --- libavutil/stereo3d.c | 8 ++++++++ libavutil/stereo3d.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index e8e5030db9..c182b18e52 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -32,6 +32,11 @@ static void get_defaults(AVStereo3D *stereo) } AVStereo3D *av_stereo3d_alloc(void) +{ + return av_stereo3d_alloc_size(NULL); +} + +AVStereo3D *av_stereo3d_alloc_size(size_t *size) { AVStereo3D *stereo = av_mallocz(sizeof(AVStereo3D)); if (!stereo) @@ -39,6 +44,9 @@ AVStereo3D *av_stereo3d_alloc(void) get_defaults(stereo); + if (size) + *size = sizeof(*stereo); + return stereo; } diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index e3af519e03..31167c14fa 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -251,6 +251,14 @@ typedef struct AVStereo3D { */ AVStereo3D *av_stereo3d_alloc(void); +/** + * Allocate an AVStereo3D structure and set its fields to default values. + * The resulting struct can be freed using av_freep(). + * + * @return An AVStereo3D filled with default values or NULL on failure. + */ +AVStereo3D *av_stereo3d_alloc_size(size_t *size); + /** * Allocate a complete AVFrameSideData and add it to the frame. * From patchwork Sat Jun 22 15:31:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50081 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1128993vqz; Sat, 22 Jun 2024 08:32:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWHgFelAQeIUVzNHRoSPJE1kI5yaozKayf+P0lNie+26YM7qMMhjxN6JvRA2zhlax9J5/9FHZjUBaMOH/cG+V3G7SK5sJQ32YMpg== X-Google-Smtp-Source: AGHT+IF7iWLPac90FzjWo5Y6oDRUevpNEdNcadZYDeZcOUoQJ6QNU3hqQH4g4CqmuMfWPeRuE2Qs X-Received: by 2002:a50:a417:0:b0:57c:9c5d:d195 with SMTP id 4fb4d7f45d1cf-57d4bdc9e02mr168569a12.27.1719070349525; Sat, 22 Jun 2024 08:32:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070349; cv=none; d=google.com; s=arc-20160816; b=aQ2CgEXOCvfIQNvJQwwi13Gm18Frry5allMBSNEy/7HR0gY96XCnlDRFpKSE+aoROT jXtt3/QSMy489KwEhK60gVmNk07axRr8ZoXpWpb8t0exDrELJD8mZq/FbMWQPU08A6Sp kA06LqEaaCEQ9nyCZV8/CEY6U0iyvhcu5Q2DWylBsezgYmb8joXdHxkY+zGb9UEtOgmu K5orwQXTThGZlgw1ablRZTp2A0n+6i7weAwvv4rXGROgRzy/+7A9FJ2FKcTTXINRHqGB 5umxcoVon5SMSdmfIF8jZ9G98tDimxWvDUvASCECq6nAhbIB2nAGmummeJ2DTa8FV+Z6 5L7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=yLN/DTNTg/CmtP1lmyqgLEhufK/WLR6PRhWL7VX53+8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=nV7dRsVFXlJXVO6HTXPSiAaOUi2yTz8t4c3bzeAxLV2k80agw4labRIfFb3EGL9lbs 9ArextwyPLJbuCBT332IpZGr9v4jnQS9o4STumvy3po9frtIIE0Uw7SzRe22BO5oWinw g6UzbnLMI+CWLL11o/reTCyYT3lbu7pHrsnnsUB8yc4S6FTusnqWNVF7t6WMOrk9k0sA fTzPn5PuANvQZiAwnVu1HU5jzmG6tXd2XdhMkMsrtb8KZ9qdR614YHSliJeJF3X1CHot YrSYj6gBq8YkRDfOHC/lc2zCFJAKcqppkXb+wd20zhPud5F72vt69kvmPbdDrx7pvEb8 aQ9Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=UrGGAJNS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57d30af3948si1777523a12.584.2024.06.22.08.32.28; Sat, 22 Jun 2024 08:32:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=UrGGAJNS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5121868D499; Sat, 22 Jun 2024 18:31:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF55168D630 for ; Sat, 22 Jun 2024 18:31:41 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-70667943931so455850b3a.0 for ; Sat, 22 Jun 2024 08:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070299; x=1719675099; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=l67hT/5zUzPy87UImTiPB9M3Y/l0EQgISl0PO4Qn2jc=; b=UrGGAJNSzcxyp1PZG2FZo8GlnbyJT3kw75JJQTVk89glYx/axCNzOt4eup2R6wCwp8 oA66N5BMIxoa0Soq/IjLR2FujpRHGr+x0wEV93ZHob3fjftChTqCVU0RcLN7Ke6aEV+a MJklW5y9HshssowVd7WYg/CgW4HB/6/0xospXGjXMW8H8gSqedKyFQsseaNLesv1zYbX BmtncQntwv81Yv0dEPMk8Rf/uw5fWDBX8CY7RhJBlkBa6vOJgXRTdYc02TDV46XYhUbR npE6UcV24WN0XyfKByJsm2wmYc5ixNYuGaFJbqXFNvhxlVlEPQb1rb0x+qYPkkEJ6C4W rOXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070299; x=1719675099; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l67hT/5zUzPy87UImTiPB9M3Y/l0EQgISl0PO4Qn2jc=; b=KqUuh4lKnLDLpPmFV85xweP715ZG596E781RlV/Au7w8WlZTGEfzfwu5k9EFUiLDD9 3Acfvk2MQSbzyM3HA5rPOtiSst5pXhpXopvU+CqCZ6rvmyNP8PB3CYUI6hQAIgMPs9ma 9e/n3sIqljlMv9qaGh/wxxZKV1I6lhRjvylEgAeU8LdK/zvmaY7TL96q1c0846l0FJgl LxRRmpTsUqQyZyxnGlpzCKRTvMFJe8hHeqofVg3Tcd/JzYD4Uy6+MuKFL6bOPekbL87p cMnvtVCP2uA4gWDAov4Rr0D4proI82OdFnOb0+Uk4XiizQ4z8b/HWmSn/UZjfojGHTum quBw== X-Gm-Message-State: AOJu0YyeMW6QQnyzaZIaLckbbDd5eAko3CSrwAVLwNV1PePGCoPVQY0h dxIwal5zfFSS/5PpuFTQoz/DkyCS7Q8t6M56psaz2yEZT9T3V3hJmk+bUA== X-Received: by 2002:aa7:88c6:0:b0:705:e5da:8293 with SMTP id d2e1a72fcca58-706745be181mr238114b3a.12.1719070299115; Sat, 22 Jun 2024 08:31:39 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:21 -0300 Message-ID: <20240622153122.6220-7-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622153122.6220-1-jamrial@gmail.com> References: <20240622153122.6220-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8 v2] avformat/mov: don't use sizeof(AVStereo3D) 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7JZhaywt+X5N It's not part of the libavutil ABI. Signed-off-by: James Almer --- libavformat/isom.h | 1 + libavformat/mov.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 35b767a52c..a0498f45e5 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -247,6 +247,7 @@ typedef struct MOVStreamContext { int32_t *display_matrix; AVStereo3D *stereo3d; + size_t stereo3d_size; AVSphericalMapping *spherical; size_t spherical_size; AVMasteringDisplayMetadata *mastering; diff --git a/libavformat/mov.c b/libavformat/mov.c index 9b2ce1f167..07c0ec3ec4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6332,7 +6332,7 @@ static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) return AVERROR(ENOMEM); @@ -6695,7 +6695,7 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) } if (!sc->stereo3d) { - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) return AVERROR(ENOMEM); } @@ -6782,7 +6782,7 @@ static int mov_read_hfov(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (!sc->stereo3d) { - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) return AVERROR(ENOMEM); } @@ -6831,7 +6831,7 @@ static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_ else mode = AV_STEREO3D_2D; - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) goto out; @@ -10032,7 +10032,7 @@ static int mov_read_header(AVFormatContext *s) if (sc->stereo3d) { if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, AV_PKT_DATA_STEREO3D, - (uint8_t *)sc->stereo3d, sizeof(*sc->stereo3d), 0)) + (uint8_t *)sc->stereo3d, sc->stereo3d_size, 0)) return AVERROR(ENOMEM); sc->stereo3d = NULL; From patchwork Sat Jun 22 15:31:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50082 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1129041vqz; Sat, 22 Jun 2024 08:32:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXjJoWWGUpgQjrv6ixkGtW8vBtw0JyM2Eb8SfZaNzvFC/6euQLnAHa87dhUEyVbVgwYgXr5Z0U3OfrywIWI2rzjL2utUygOcyCgNg== X-Google-Smtp-Source: AGHT+IGXMok7zpCDwZ4gDLsV3Ak3FmS2+Y2xrfq7qy1iCQJKH5FdZwcMvt1CFKf9/V5zx4VRotCx X-Received: by 2002:a17:907:8dc6:b0:a6f:e25d:f6a4 with SMTP id a640c23a62f3a-a7245c642e5mr6822966b.76.1719070357924; Sat, 22 Jun 2024 08:32:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070357; cv=none; d=google.com; s=arc-20160816; b=lwGHC2P8AsWn0OpS62BvHo11BQSGHa8QtGmgO6I8bbl7CZGTa+uMxtF35h3++o4GnF aUpZsXp1t87Os35yQ07ZN5+lQbTrQuFZTVJMSiG5uXSXU3AENMiOcC8x8x1hyIaU+JmJ EwX8pUhabRvXHVt2mOAhOUcA6gWVtN1km8XwxGtu4AoaYh9pns5F0Ckape+ttWQNlw+g thEiLfvBItT5a1GQChY2xCELxLvmbnetx2dRyDre51z/jsI1Xj0m5/5RCHLNy9qXl0Jg uRABPDF7K4gpoZLXLj53axTofdiSHvMOaMjfc9Nr6x6nJZua+Yy21K8ECLoZLOoNkozw v/Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=j8oX8SIXIKcNNuguXqDgiOnNR9YGvDydMYsgC52ELLk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gND6/hOXgmrd/eyWcR/dUZKa+J8bXaJnqte5mbRpezDOlmgV5OY2qsvJrHfMx67//2 BKbSsiOKEOjfCXNlGkw+qtYVDvIEh7NdHRI5gB7usG4coAD81Auu5YcQ/648Afxf94pg q3whgSxMWOqvpXI6qXpiOPFX+FwzY9PU7pQweLB9vhZu4W0izpgowLoRZYUkKBacAy/4 TSnNmnC4M01yuW6osrW4JpOgaapTAJ0xS/mIkrKLmhvoX/08ckkLkI/YI9rmIbWVOryx rWb21h1V6IaCSOkvpw73SjTJpa5u0Y5iNcnwyJwzcQrHbm5SGkvKe9jNOyR81qpdl1rU OugQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gzokZYUC; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6fcf54d5b9si188992266b.345.2024.06.22.08.32.37; Sat, 22 Jun 2024 08:32:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gzokZYUC; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AB6268D673; Sat, 22 Jun 2024 18:31:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED39868D641 for ; Sat, 22 Jun 2024 18:31:42 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7065e2fe7d9so920597b3a.3 for ; Sat, 22 Jun 2024 08:31:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070301; x=1719675101; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3WHZ617zzThCSDoqMw1BEkjPuMhVKL7o5R5/x29PtHw=; b=gzokZYUCeG8sXih1iFppV9tCdmjcvoVSVxKGA1T0pYTvj89SvJ7CThK7Zh0VV/Kx7/ UFDYd043CPa5zu2VAZxxIRlR1ofXouODJ3VUf1Chj1ewrbTmwF7yj8JO33YwZU55sGz7 OlcjfNWt97T1nK4lELXk/OjvxG3EAeN8H79kSos3uB1fqrudY7iDQpCXQesksnaHzUVx 3wsEIniZwxfVIW1Q71gcJeO+y0oF7usp5oXg5vlkwdY/C/UwdU1H0I6XcwH8agA+FN1K 41TcRaOI12HB5YzPSF2dM7QFQeR3Bus2g/FI6InJo8rPnQJrAXkvmt4dArMi/Kxd9TQv trwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070301; x=1719675101; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3WHZ617zzThCSDoqMw1BEkjPuMhVKL7o5R5/x29PtHw=; b=m2eY0no8h6HPnf6KewvlxDTFH0jAbivbc7te1CejbD3tldiFgFF7cUNW/QnStGkImk qAHu/cdskW7VYNSze+YKG+3SnCKJJNx3yVTbTfywpvrqAd7JdbEsg5Cb0T9ODOjdQ410 y0nRfTL98E3JlcWSQkJtgYw39LO/QidEJAOlDsg4hV9US6r2EiVxBWgPKQa5nZxdi2JW casiqo6RvqwwylN5zdu8gKWUFnAtG6hTsTqY4/mY34uw1ztuRGQUEClSvyJpVyoIcOBY UiWcy0wEriLK0GjwfsLLDljcCP0zCX34CQLCCz7CK11YA65JzbALBfsZQTE57/yINoCE I0vw== X-Gm-Message-State: AOJu0YyczHahz5BErFdKNXdF+PIpwQs0YRGbe2xQ0Lx2WLdCRm8R7qGp qYnJbfh3158kJrD6y7RW79sBe+W2sOpg47P1U+u7xP5Udh3ur4yIJ+S4Tw== X-Received: by 2002:a05:6a21:6d89:b0:1b5:d36a:5d68 with SMTP id adf61e73a8af0-1bcf7e76ec5mr159344637.15.1719070300766; Sat, 22 Jun 2024 08:31:40 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:22 -0300 Message-ID: <20240622153122.6220-8-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622153122.6220-1-jamrial@gmail.com> References: <20240622153122.6220-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/8 v2] avformat/matroskadec: don't use sizeof(AVStereo3D) 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PPQaevGh4QWA It's not part of the libavutil ABI. Signed-off-by: James Almer --- libavformat/matroskadec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 6bc5fa621e..d1a135ed63 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2253,8 +2253,9 @@ static int mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mo STEREOMODE_STEREO3D_MAPPING(STEREO_MODE_CONV, NOTHING) }; AVStereo3D *stereo; + size_t size; - stereo = av_stereo3d_alloc(); + stereo = av_stereo3d_alloc_size(&size); if (!stereo) return AVERROR(ENOMEM); @@ -2262,7 +2263,7 @@ static int mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mo stereo->flags = stereo_mode_conv[stereo_mode].flags; if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, - AV_PKT_DATA_STEREO3D, stereo, sizeof(*stereo), 0)) { + AV_PKT_DATA_STEREO3D, stereo, size, 0)) { av_freep(&stereo); return AVERROR(ENOMEM); }