From patchwork Tue Mar 9 08:52:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 11535 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 28A9DBD1F1 for ; Tue, 9 Mar 2021 08:52:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E249568A92; Tue, 9 Mar 2021 09:52:56 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="W43/I5rB"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1852E6051F for ; Tue, 9 Mar 2021 09:52:55 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id AC4B9E9; Tue, 9 Mar 2021 09:52:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1615279974; bh=l1RGlMbdoKHxpVPwWd3MMI2bk7jjinegN9FwaDFYsK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W43/I5rBGB1WMUqUNnt1RKe3atgn9pT9U+VQj/L1ktZ8sFmo11VDB61yZGQCUbtv9 RrKLQDrVlKXHRjJyJCHGwbLN281W6UgUqco1MEdOGVHvB1/PgoZvJpiKr7Tt21f4er CxyI0ZliwMpYZTm8z2AtR3P0xYpn3c3S9+s5bSAE= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 9 Mar 2021 17:52:35 +0900 Message-Id: <20210309085235.106691-5-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210309085235.106691-1-paul.elder@ideasonboard.com> References: <20210309085235.106691-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 4/4] android: jpeg: exif: change GPS method encoding from ASCII to NoEncoding X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" According to the EXIF specification, the GPS method should be UNDEFINED, and the first 8 bytes will designate the type. However, CTS expects the first 8 bytes to be part of the data. Remove the 8-byte encoding designator by changing the encoding to NoEncoding to appease CTS. This is part of the fix that allows the following CTS test to pass: - android.hardware.cts.CameraTest#testJpegExif Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- Changes in v2: - keep UNDEFINED instead of changing it to ASCII, and use NoEncoding --- src/android/jpeg/exif.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp index 628382a9..7e47c1ac 100644 --- a/src/android/jpeg/exif.cpp +++ b/src/android/jpeg/exif.cpp @@ -407,7 +407,7 @@ void Exif::setGPSLocation(const double *coords) void Exif::setGPSMethod(const std::string &method) { setString(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_PROCESSING_METHOD), - EXIF_FORMAT_UNDEFINED, method, Unicode); + EXIF_FORMAT_UNDEFINED, method, NoEncoding); } void Exif::setOrientation(int orientation)