Commit 68cec546 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Commit Bot

media/gpu/v4l2: fix unmatched #define/#undef sequences

Fix some unmatched #undefs that were supposed to cancel the effect of
their matching #define.

Bug: None.
Test: Successful build on arm-generic target.
Change-Id: Iaf0119a28158661a20acf7bc4a9d86fc37f40cc2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1782302
Auto-Submit: Alexandre Courbot <acourbot@chromium.org>
Reviewed-by: default avatarHirokazu Honda <hiroh@chromium.org>
Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693077}
parent 5e1130c1
...@@ -32,7 +32,7 @@ void FillV4L2SegmentationHeader(const Vp8SegmentationHeader& vp8_sgmnt_hdr, ...@@ -32,7 +32,7 @@ void FillV4L2SegmentationHeader(const Vp8SegmentationHeader& vp8_sgmnt_hdr,
V4L2_VP8_SEGMNT_HDR_FLAG_UPDATE_MAP); V4L2_VP8_SEGMNT_HDR_FLAG_UPDATE_MAP);
SET_V4L2_SGMNT_HDR_FLAG_IF(update_segment_feature_data, SET_V4L2_SGMNT_HDR_FLAG_IF(update_segment_feature_data,
V4L2_VP8_SEGMNT_HDR_FLAG_UPDATE_FEATURE_DATA); V4L2_VP8_SEGMNT_HDR_FLAG_UPDATE_FEATURE_DATA);
#undef SET_V4L2_SPARM_FLAG_IF #undef SET_V4L2_SGMNT_HDR_FLAG_IF
v4l2_sgmnt_hdr->segment_feature_mode = vp8_sgmnt_hdr.segment_feature_mode; v4l2_sgmnt_hdr->segment_feature_mode = vp8_sgmnt_hdr.segment_feature_mode;
SafeArrayMemcpy(v4l2_sgmnt_hdr->quant_update, SafeArrayMemcpy(v4l2_sgmnt_hdr->quant_update,
...@@ -48,7 +48,7 @@ void FillV4L2LoopfilterHeader(const Vp8LoopFilterHeader& vp8_loopfilter_hdr, ...@@ -48,7 +48,7 @@ void FillV4L2LoopfilterHeader(const Vp8LoopFilterHeader& vp8_loopfilter_hdr,
SET_V4L2_LF_HDR_FLAG_IF(loop_filter_adj_enable, V4L2_VP8_LF_HDR_ADJ_ENABLE); SET_V4L2_LF_HDR_FLAG_IF(loop_filter_adj_enable, V4L2_VP8_LF_HDR_ADJ_ENABLE);
SET_V4L2_LF_HDR_FLAG_IF(mode_ref_lf_delta_update, SET_V4L2_LF_HDR_FLAG_IF(mode_ref_lf_delta_update,
V4L2_VP8_LF_HDR_DELTA_UPDATE); V4L2_VP8_LF_HDR_DELTA_UPDATE);
#undef SET_V4L2_SGMNT_HDR_FLAG_IF #undef SET_V4L2_LF_HDR_FLAG_IF
#define LF_HDR_TO_V4L2_LF_HDR(a) v4l2_lf_hdr->a = vp8_loopfilter_hdr.a; #define LF_HDR_TO_V4L2_LF_HDR(a) v4l2_lf_hdr->a = vp8_loopfilter_hdr.a;
LF_HDR_TO_V4L2_LF_HDR(type); LF_HDR_TO_V4L2_LF_HDR(type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment