Skip to content

Revert "Remove P010 format references for compatibility with SDK vers… #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Isard7777 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "Remove P010 format references for compatibility with SDK vers… #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions libavdevice/videomaster_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ static const VideoMasterBufferPackingInfo buffer_packing_info_table[] = {
1,
1,
false },
{ AV_VIDEOMASTER_BUFFER_PACKING_PLANAR_P010,
false,
{ .pixel_format = AV_PIX_FMT_P010LE },
24,
1,
1,
false },
{ AV_VIDEOMASTER_BUFFER_PACKING_RGB_32,
false,
{ .pixel_format = AV_PIX_FMT_BGR0 },
Expand Down Expand Up @@ -1009,6 +1016,8 @@ get_buffer_packing_based_on_cable_bit_sampling(
{
case VHD_DV_SAMPLING_4_2_0_8BITS:
return AV_VIDEOMASTER_BUFFER_PACKING_PLANAR_NV12;
case VHD_DV_SAMPLING_4_2_0_10BITS:
return AV_VIDEOMASTER_BUFFER_PACKING_PLANAR_P010;
default:
return AV_VIDEOMASTER_BUFFER_PACKING_YUV422_10;
}
Expand Down
1 change: 1 addition & 0 deletions libavdevice/videomaster_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ enum AVVideoMasterBufferPacking
AV_VIDEOMASTER_BUFFER_PACKING_RGBA4444_10_LSB_PAD =
VHD_BUFPACK_VIDEO_RGBA4444_10_LSB_PAD,
AV_VIDEOMASTER_BUFFER_PACKING_RGBA4444_16 = VHD_BUFPACK_VIDEO_RGBA4444_16,
AV_VIDEOMASTER_BUFFER_PACKING_PLANAR_P010 = VHD_BUFPACK_VIDEO_PLANAR_P010,
AV_NB_VIDEOMASTER_BUFFER_PACKINGS
};

Expand Down
9 changes: 9 additions & 0 deletions libavdevice/videomaster_dec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,6 +1514,15 @@ static const AVOption options[] = {
0,
AV_OPT_FLAG_DECODING_PARAM | DEC | AV_OPT_FLAG_VIDEO_PARAM,
.unit = "buffer_packing_value" },
{ "PLANAR_P010",
NULL,
0,
AV_OPT_TYPE_CONST,
{ .i64 = AV_VIDEOMASTER_BUFFER_PACKING_PLANAR_P010 },
0,
0,
AV_OPT_FLAG_DECODING_PARAM | DEC | AV_OPT_FLAG_VIDEO_PARAM,
.unit = "buffer_packing_value" },
{ NULL },
};

Expand Down