Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
3988016f
Commit
3988016f
authored
Jan 10, 2022
by
Andreas Rheinhardt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/h264pred: Reindentation
Signed-off-by:
Andreas Rheinhardt
<
andreas.rheinhardt@outlook.com
>
parent
c32f6b7f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
19 deletions
+16
-19
h264pred.c
libavcodec/h264pred.c
+16
-19
No files found.
libavcodec/h264pred.c
View file @
3988016f
...
...
@@ -445,19 +445,19 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
#define FUNCD(a) a ## _c
#define H264_PRED(depth) \
h->pred4x4[VERT_PRED ]= FUNCC(pred4x4_vertical ,
depth);\
h->pred4x4[HOR_PRED ]= FUNCC(pred4x4_horizontal ,
depth);\
h->pred4x4[DC_PRED ]= FUNCC(pred4x4_dc ,
depth);\
h->pred4x4[DIAG_DOWN_LEFT_PRED ]= FUNCC(pred4x4_down_left ,
depth);\
h->pred4x4[DIAG_DOWN_RIGHT_PRED]= FUNCC(pred4x4_down_right ,
depth);\
h->pred4x4[VERT_RIGHT_PRED ]= FUNCC(pred4x4_vertical_right ,
depth);\
h->pred4x4[HOR_DOWN_PRED ]= FUNCC(pred4x4_horizontal_down
, depth);\
h->pred4x4[VERT_LEFT_PRED ]= FUNCC(pred4x4_vertical_left ,
depth);\
h->pred4x4[HOR_UP_PRED ]= FUNCC(pred4x4_horizontal_up ,
depth);\
h->pred4x4[LEFT_DC_PRED ]= FUNCC(pred4x4_left_dc ,
depth);\
h->pred4x4[TOP_DC_PRED ]= FUNCC(pred4x4_top_dc ,
depth);\
h->pred4x4[VERT_PRED ] = FUNCC(pred4x4_vertical,
depth);\
h->pred4x4[HOR_PRED ] = FUNCC(pred4x4_horizontal,
depth);\
h->pred4x4[DC_PRED ] = FUNCC(pred4x4_dc,
depth);\
h->pred4x4[DIAG_DOWN_LEFT_PRED ] = FUNCC(pred4x4_down_left,
depth);\
h->pred4x4[DIAG_DOWN_RIGHT_PRED] = FUNCC(pred4x4_down_right,
depth);\
h->pred4x4[VERT_RIGHT_PRED ] = FUNCC(pred4x4_vertical_right,
depth);\
h->pred4x4[HOR_DOWN_PRED ] = FUNCC(pred4x4_horizontal_down
, depth);\
h->pred4x4[VERT_LEFT_PRED ] = FUNCC(pred4x4_vertical_left,
depth);\
h->pred4x4[HOR_UP_PRED ] = FUNCC(pred4x4_horizontal_up,
depth);\
h->pred4x4[LEFT_DC_PRED ] = FUNCC(pred4x4_left_dc,
depth);\
h->pred4x4[TOP_DC_PRED ] = FUNCC(pred4x4_top_dc,
depth);\
if (depth > 8 || codec_id != AV_CODEC_ID_VP8)\
h->pred4x4[DC_128_PRED ]= FUNCC(pred4x4_128_dc ,
depth);\
h->pred4x4[DC_128_PRED ] = FUNCC(pred4x4_128_dc,
depth);\
\
h->pred8x8l[VERT_PRED ]= FUNCC(pred8x8l_vertical , depth);\
h->pred8x8l[HOR_PRED ]= FUNCC(pred8x8l_horizontal , depth);\
...
...
@@ -475,15 +475,12 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
if (chroma_format_idc <= 1) {\
h->pred8x8[VERT_PRED8x8 ]= FUNCC(pred8x8_vertical , depth);\
h->pred8x8[HOR_PRED8x8 ]= FUNCC(pred8x8_horizontal , depth);\
h->pred8x8[PLANE_PRED8x8] = FUNCC(pred8x8_plane, depth);\
} else {\
h->pred8x8[VERT_PRED8x8 ]= FUNCC(pred8x16_vertical , depth);\
h->pred8x8[HOR_PRED8x8 ]= FUNCC(pred8x16_horizontal , depth);\
h->pred8x8[PLANE_PRED8x8] = FUNCC(pred8x16_plane, depth);\
}\
if (chroma_format_idc <= 1) {\
h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x8_plane , depth);\
} else {\
h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x16_plane , depth);\
}\
if (depth > 8 || (codec_id != AV_CODEC_ID_RV40 && \
codec_id != AV_CODEC_ID_VP7 && \
codec_id != AV_CODEC_ID_VP8)) { \
...
...
@@ -531,8 +528,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
h->pred8x8l_filter_add [VERT_PRED ]= FUNCC(pred8x8l_vertical_filter_add , depth);\
h->pred8x8l_filter_add [ HOR_PRED ]= FUNCC(pred8x8l_horizontal_filter_add , depth);\
if (chroma_format_idc <= 1) {\
h->pred8x8_add [VERT_PRED8x8]= FUNCC(pred8x8_vertical_add ,
depth);\
h->pred8x8_add [ HOR_PRED8x8]= FUNCC(pred8x8_horizontal_add ,
depth);\
h->pred8x8_add[VERT_PRED8x8] = FUNCC(pred8x8_vertical_add,
depth);\
h->pred8x8_add[ HOR_PRED8x8] = FUNCC(pred8x8_horizontal_add,
depth);\
} else {\
h->pred8x8_add [VERT_PRED8x8]= FUNCC(pred8x16_vertical_add , depth);\
h->pred8x8_add [ HOR_PRED8x8]= FUNCC(pred8x16_horizontal_add , depth);\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment