openharmony/distributed_camera
1
0
Fork 0
mirror of https://github.com/openharmony/distributed_camera.git synced 2026-07-21 04:05:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

!51 重构surface第二弹

Browse Source 
Merge pull request !51 from BruceXuXu/refractor_surface
This commit is contained in:
openharmony_ci
2022-04-13 08:44:34 +00:00
committed by Gitee
parent 6d23f7bf27 e834d96625
commit fb9239358d
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp
+3 -3
View File
@@ -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) {
services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener_common.cpp
+2 -2
View File
@@ -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());
}
services/data_process/src/pipeline_node/multimedia_codec/encode_data_process.cpp
+1 -1
View File
@@ -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) {
services/data_process/src/pipeline_node/multimedia_codec/encode_data_process_common.cpp
+2 -1
View File
@@ -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) {