From patchwork Sun Jun 10 20:43:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 50166 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fS7B9-0006cH-57; Sun, 10 Jun 2018 20:43:11 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753655AbeFJUnI (ORCPT + 1 other); Sun, 10 Jun 2018 16:43:08 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:38612 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752082AbeFJUnH (ORCPT ); Sun, 10 Jun 2018 16:43:07 -0400 Received: by mail-wr0-f193.google.com with SMTP id e18-v6so10018541wrs.5 for ; Sun, 10 Jun 2018 13:43:06 -0700 (PDT) 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; bh=y8nCAhzIRe1z4xMOT8m6qkIw3nbeHrp4H6C/yuCxzEI=; b=L5PmKzFxIrgotFbtr2ES4BJEN82xQxcF4vuruf67XkPsghCduEkMf1Bfz5axxgdvOd p2MEFziKFqhA2iW8EHVQ9RZtSgd5PEmaekEU+8tPNS3taTHEIek4rhSY27/zekT5pf/e 6ji3fFH+f8UDhuF+J+GNv1q3lArLZh8JuEKBfRtENLwnMWUUSHPO3jmmU8J6OqGXC2Qa SHZo9ak2t3jheX1a1ZCEmte08z3JkCWBdyhGic+iTfrVOG+w5qPTzwBIZE8LoCaHuoyB lT9tzxsdBqrdlagXanzd6jSXJoav/rVzN3kUbjhtMPdoor0S96dqmv62kNkSGuqXKXnk E26Q== X-Gm-Message-State: APt69E3cOSIIQ5zQXxsVw4b+vxRUjlAUDsr2JzDwFgqLwULVFKeRHdMP Ucv/ru56e3tdatxKYnI96uTT9g== X-Google-Smtp-Source: ADUXVKLr86lg1+zmz/Mm0VUvdxI3A9RDmiH/HCJ+D/GGvRqHhPLgRUuIxdYJzBa6Gqktoy8hlfgLmA== X-Received: by 2002:adf:f90d:: with SMTP id b13-v6mr921033wrr.38.1528663385986; Sun, 10 Jun 2018 13:43:05 -0700 (PDT) Received: from minerva.home ([90.77.100.34]) by smtp.gmail.com with ESMTPSA id y186-v6sm10129441wmd.38.2018.06.10.13.43.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Jun 2018 13:43:05 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Philipp Zabel , Javier Martinez Canillas , Mauro Carvalho Chehab , Brian Warner , "Gustavo A. R. Silva" , Nasser Afshin , linux-media@vger.kernel.org Subject: [PATCH] Revert "[media] tvp5150: fix pad format frame height" Date: Sun, 10 Jun 2018 22:43:02 +0200 Message-Id: <20180610204302.1825-1-javierm@redhat.com> X-Mailer: git-send-email 2.17.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This reverts commit 0866df8dffd514185bfab0d205db76e4c02cf1e4. The v4l uAPI documentation [0] makes clear that in the case of interlaced video (i.e: field is V4L2_FIELD_ALTERNATE) the height refers to the number of lines in the field and not the number of lines in the full frame (which is twice the field height for interlaced formats). So the original height calculation was correct, and it shouldn't had been changed by the mentioned commit. [0]:https://linuxtv.org/downloads/v4l-dvb-apis/uapi/v4l/subdev-formats.html Fixes: 0866df8dffd5 ("[media] tvp5150: fix pad format frame height") Signed-off-by: Javier Martinez Canillas --- drivers/media/i2c/tvp5150.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index 038e4ae0fe8..3ae543559fe 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -872,7 +872,7 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd, f = &format->format; f->width = decoder->rect.width; - f->height = decoder->rect.height; + f->height = decoder->rect.height / 2; f->code = MEDIA_BUS_FMT_UYVY8_2X8; f->field = V4L2_FIELD_ALTERNATE;