diff --git a/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp b/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp
index b28b740cb070657b69578448e6b7bc3e3b2255ff..d42f5ad66ca207f549f94fbe087db7752caad42b 100644
--- a/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp
+++ b/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp
@@ -287,9 +287,9 @@ DCamRetCode DCameraStream::ReturnDCameraBuffer(const shared_ptr<DCameraBuffer> &
         if (dcStreamInfo_->intent_ == StreamIntent::VIDEO) {
             int32_t size = (dcStreamInfo_->width_) * (dcStreamInfo_->height_) * YUV_WIDTH_RATIO / YUV_HEIGHT_RATIO;
             int64_t timeStamp = static_cast<int64_t>(GetCurrentLocalTimeStamp());
-            surfaceBuffer->ExtraSet("dataSize", size);
-            surfaceBuffer->ExtraSet("isKeyFrame", (int32_t)0);
-            surfaceBuffer->ExtraSet("timeStamp", timeStamp);
+            surfaceBuffer->GetExtraData()->ExtraSet("dataSize", size);
+            surfaceBuffer->GetExtraData()->ExtraSet("isKeyFrame", (int32_t)0);
+            surfaceBuffer->GetExtraData()->ExtraSet("timeStamp", timeStamp);
         }
         int ret = dcStreamProducer_->FlushBuffer(surfaceBuffer, fence, flushConf);
         if (ret != 0) {
diff --git a/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener_common.cpp b/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener_common.cpp
index 6e63d1b3f21b90f02c215311c0b3bc66a287aaeb..89a8690cbeb2397fdc980850d21f222219ef97e6 100644
--- a/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener_common.cpp
+++ b/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener_common.cpp
@@ -47,8 +47,8 @@ void DCameraPhotoSurfaceListener::OnBufferAvailable()
     }
 
     do {
-        int32_t size;
-        buffer->ExtraGet("dataSize", size);
+        int32_t size = -1;
+        buffer->GetExtraData()->ExtraGet("dataSize", size);
         if (size <= 0) {
             size = static_cast<int32_t>(buffer->GetSize());
         }
diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process.cpp
index 7327f30dddbd0aa8d36db09ce5a78413af528630..834b039099ed0e60dfe84d53bdf5d6b0c88f624a 100644
--- a/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process.cpp
+++ b/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process.cpp
@@ -311,7 +311,7 @@ int32_t EncodeDataProcess::FeedEncoderInputBuffer(std::shared_ptr<DataBuffer>& i
     }
     inputTimeStampUs_ = GetEncoderTimeStamp();
     DHLOGD("Encoder input buffer size %d, timeStamp %lld.", inputBuffer->Size(), (long long)inputTimeStampUs_);
-    surfacebuffer->ExtraSet("timeStamp", inputTimeStampUs_);
+    surfacebuffer->GetExtraData()->ExtraSet("timeStamp", inputTimeStampUs_);
     BufferFlushConfig flushConfig = { {0, 0, sourceConfig_.GetWidth(), sourceConfig_.GetHeight()}, 0};
     SurfaceError ret = encodeProducerSurface_->FlushBuffer(surfacebuffer, -1, flushConfig);
     if (ret != SURFACE_ERROR_OK) {
diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process_common.cpp
index cadc5177a41eeeec85f0fef96055d84f67445f02..6294a2d97cf19b828810fb7faace814bcbb0b2c6 100644
--- a/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process_common.cpp
+++ b/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process_common.cpp
@@ -291,7 +291,8 @@ int32_t EncodeDataProcess::FeedEncoderInputBuffer(std::shared_ptr<DataBuffer>& i
     }
     inputTimeStampUs_ = GetEncoderTimeStamp();
     DHLOGD("Encoder input buffer size %d, timeStamp %lld.", inputBuffer->Size(), (long long)inputTimeStampUs_);
-    surfacebuffer->ExtraSet("timeStamp", inputTimeStampUs_);
+
+    surfacebuffer->GetExtraData()->ExtraGet("timeStamp", inputTimeStampUs_);
     BufferFlushConfig flushConfig = { {0, 0, sourceConfig_.GetWidth(), sourceConfig_.GetHeight()}, 0};
     SurfaceError ret = encodeProducerSurface_->FlushBuffer(surfacebuffer, -1, flushConfig);
     if (ret != SURFACE_ERROR_OK) {