{"id":2257,"url":"https://patchwork.libcamera.org/api/patches/2257/?format=json","web_url":"https://patchwork.libcamera.org/patch/2257/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20191028022224.795355-9-niklas.soderlund@ragnatech.se>","date":"2019-10-28T02:22:22","name":"[libcamera-devel,08/10] libcamera: pipelines: Align where to call base class queueRequest()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"054797007bf147655d5d5a1f0fa7b250ec81ad97","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":{"id":16,"url":"https://patchwork.libcamera.org/api/users/16/?format=json","username":"neg","first_name":"Niklas","last_name":"Söderlund","email":"niklas.soderlund@ragnatech.se"},"mbox":"https://patchwork.libcamera.org/patch/2257/mbox/","series":[{"id":560,"url":"https://patchwork.libcamera.org/api/series/560/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=560","date":"2019-10-28T02:22:14","name":"libcamera: Fixes found while working on new buffer API","version":1,"mbox":"https://patchwork.libcamera.org/series/560/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2257/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2257/checks/","tags":{},"headers":{"Return-Path":"","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4217B6017E\n\tfor ;\n\tMon, 28 Oct 2019 03:22:50 +0100 (CET)","from localhost.localdomain (unknown [93.2.121.143])\n\tby bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid d453aada-f929-11e9-903a-005056917f90;\n\tMon, 28 Oct 2019 03:22:46 +0100 (CET)"],"X-Halon-ID":"d453aada-f929-11e9-903a-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 28 Oct 2019 03:22:22 +0100","Message-Id":"<20191028022224.795355-9-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20191028022224.795355-1-niklas.soderlund@ragnatech.se>","References":"<20191028022224.795355-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 08/10] libcamera: pipelines: Align where\n\tto call base class queueRequest()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 28 Oct 2019 02:22:50 -0000"},"content":"The PipelineHandler base class queueRequest() where called at different\npoints in different pipeline handlers. Align where they are called to\nmake it easier to read different pipeline implementations.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 5 +++--\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 +---\n src/libcamera/pipeline/uvcvideo.cpp | 4 +---\n src/libcamera/pipeline/vimc.cpp | 4 +---\n 4 files changed, 6 insertions(+), 11 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 8d3ad568d16e9f8f..06ee6ccac641eb41 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -768,9 +768,10 @@ int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n \t\t\terror = ret;\n \t}\n \n-\tPipelineHandler::queueRequest(camera, request);\n+\tif (error)\n+\t\treturn error;\n \n-\treturn error;\n+\treturn PipelineHandler::queueRequest(camera, request);\n }\n \n bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 7a28b03b8d38c8b9..a99df4f8b846d8b7 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -814,8 +814,6 @@ int PipelineHandlerRkISP1::queueRequest(Camera *camera, Request *request)\n \tRkISP1CameraData *data = cameraData(camera);\n \tStream *stream = &data->stream_;\n \n-\tPipelineHandler::queueRequest(camera, request);\n-\n \tRkISP1FrameInfo *info = data->frameInfo_.create(data->frame_, request,\n \t\t\t\t\t\t\tstream);\n \tif (!info)\n@@ -833,7 +831,7 @@ int PipelineHandlerRkISP1::queueRequest(Camera *camera, Request *request)\n \n \tdata->frame_++;\n \n-\treturn 0;\n+\treturn PipelineHandler::queueRequest(camera, request);\n }\n \n /* -----------------------------------------------------------------------------\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex fae0ffc4de30e1b7..dc17b456af6987e6 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -281,9 +281,7 @@ int PipelineHandlerUVC::queueRequest(Camera *camera, Request *request)\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tPipelineHandler::queueRequest(camera, request);\n-\n-\treturn 0;\n+\treturn PipelineHandler::queueRequest(camera, request);\n }\n \n bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex c16ae4cb76b57e1c..5f83ae2b85997828 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -341,9 +341,7 @@ int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tPipelineHandler::queueRequest(camera, request);\n-\n-\treturn 0;\n+\treturn PipelineHandler::queueRequest(camera, request);\n }\n \n bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n","prefixes":["libcamera-devel","08/10"]}