diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2021-07-01 11:42:52 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2021-07-01 12:32:57 +0900 |
| commit | 9ab915fa917ada0d150a1fa221537eb8c7f3ea5f (patch) | |
| tree | fd363a5a9404552cc2f50cf69dc1cf52b7aeac17 | |
| parent | 99649e8caeb60dd9ade2fc86734027fab695445c (diff) | |
| download | camera-9ab915fa917ada0d150a1fa221537eb8c7f3ea5f.tar.gz camera-9ab915fa917ada0d150a1fa221537eb8c7f3ea5f.tar.bz2 camera-9ab915fa917ada0d150a1fa221537eb8c7f3ea5f.zip | |
Add missed frame information for VP8 and VP9 formatssubmit/tizen/20210702.012854accepted/tizen/unified/20210702.133335
[Version] 0.4.61
[Issue Type] Bug fix
Change-Id: I87b1c5e3cc26b9bcdbf1035918b0a4d5544c41bc
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
| -rw-r--r-- | packaging/capi-media-camera.spec | 2 | ||||
| -rw-r--r-- | src/camera_internal.c | 29 |
2 files changed, 21 insertions, 10 deletions
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index ac6a1dd..dd6b891 100644 --- a/packaging/capi-media-camera.spec +++ b/packaging/capi-media-camera.spec @@ -1,6 +1,6 @@ Name: capi-media-camera Summary: A Camera API -Version: 0.4.60 +Version: 0.4.61 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera_internal.c b/src/camera_internal.c index df3b09d..71db289 100644 --- a/src/camera_internal.c +++ b/src/camera_internal.c @@ -90,25 +90,35 @@ void camera_create_preview_frame(camera_stream_data_s *stream, int num_buffer_fd buf_pos = data_bo_handle->ptr; - if (stream->format == MM_PIXEL_FORMAT_ENCODED_H264) { + switch (stream->format) { + case MM_PIXEL_FORMAT_ENCODED_H264: + /* fall through */ + case MM_PIXEL_FORMAT_ENCODED_MJPEG: + /* fall through */ + case MM_PIXEL_FORMAT_ENCODED_VP8: + /* fall through */ + case MM_PIXEL_FORMAT_ENCODED_VP9: frame->data.encoded_plane.data = buf_pos; frame->data.encoded_plane.size = stream->data.encoded.length_data; frame->data.encoded_plane.is_delta_frame = (bool)stream->data.encoded.is_delta_frame; total_size = stream->data.encoded.length_data; - } else if (stream->format == MM_PIXEL_FORMAT_ENCODED_MJPEG) { - frame->data.encoded_plane.data = buf_pos; - frame->data.encoded_plane.size = stream->data.encoded.length_data; - total_size = stream->data.encoded.length_data; - } else if (stream->format == MM_PIXEL_FORMAT_INVZ) { + break; + + case MM_PIXEL_FORMAT_INVZ: frame->data.depth_plane.data = buf_pos; frame->data.depth_plane.size = stream->data.depth.length_data; total_size = stream->data.depth.length_data; - } else if (stream->format == MM_PIXEL_FORMAT_RGBA || - stream->format == MM_PIXEL_FORMAT_ARGB) { + break; + + case MM_PIXEL_FORMAT_RGBA: + /* fall through */ + case MM_PIXEL_FORMAT_ARGB: frame->data.rgb_plane.data = buf_pos; frame->data.rgb_plane.size = stream->data.rgb.length_data; total_size = stream->data.rgb.length_data; - } else { + break; + + default: switch (stream->num_planes) { case 1: frame->data.single_plane.yuv = buf_pos; @@ -140,6 +150,7 @@ void camera_create_preview_frame(camera_stream_data_s *stream, int num_buffer_fd default: break; } + break; } //LCOV_EXCL_STOP } else { |