From cc3f9090bf904f3b76ca4d1003f78260106a8511 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Sat, 20 Jul 2024 01:14:04 +0800 Subject: [PATCH] cereal: deprecate FrameData.frameType (#33019) deprecate FrameData.frameType old-commit-hash: 917ea5699f3af241e60311455af5f20c0c55a8c4 --- cereal/log.capnp | 5 ++--- system/camerad/cameras/camera_qcom2.cc | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cereal/log.capnp b/cereal/log.capnp index d94d9632fe..d849f4840b 100644 --- a/cereal/log.capnp +++ b/cereal/log.capnp @@ -137,8 +137,6 @@ struct FrameData { requestId @28 :UInt32; encodeId @1 :UInt32; - frameType @7 :FrameType; - # Timestamps timestampEof @2 :UInt64; timestampSof @8 :UInt64; @@ -158,7 +156,7 @@ struct FrameData { temperaturesC @24 :List(Float32); - enum FrameType { + enum FrameTypeDEPRECATED { unknown @0; neo @1; chffrAndroid @2; @@ -175,6 +173,7 @@ struct FrameData { frameLengthDEPRECATED @3 :Int32; globalGainDEPRECATED @5 :Int32; + frameTypeDEPRECATED @7 :FrameTypeDEPRECATED; androidCaptureResultDEPRECATED @9 :AndroidCaptureResult; lensPosDEPRECATED @11 :Int32; lensSagDEPRECATED @12 :Float32; diff --git a/system/camerad/cameras/camera_qcom2.cc b/system/camerad/cameras/camera_qcom2.cc index 096e288cc2..47ea5ded4d 100644 --- a/system/camerad/cameras/camera_qcom2.cc +++ b/system/camerad/cameras/camera_qcom2.cc @@ -932,7 +932,6 @@ static void process_driver_camera(MultiCameraState *s, CameraState *c, int cnt) MessageBuilder msg; auto framed = msg.initEvent().initDriverCameraState(); - framed.setFrameType(cereal::FrameData::FrameType::FRONT); fill_frame_data(framed, c->buf.cur_frame_data, c); c->ci->processRegisters(c, framed);