`mod obu`: Cleanup part 1 #590

kkysen · 2023-11-27T07:08:08Z

Main cleanups so far:

Make args refs.
Make some vars refs.
Remove redundant as casts.
Remove redundant type annotations.
Remove .wrapping_* calls.
Translate for loops.
Use indexing for arrays.
Add back comments.

…type`.

…[]`.

`([0-9]+) as ([A-Za-z0-9_]+) as ([A-Za-z0-9_]+)` => `$1 as $3`.

`$([0-9]+) as ([A-Za-z0-9_]+)$([^.])` => `($1)$3`.

`, ([0-9]+) as ([A-Za-z0-9_]+)` => `, $1`.

`= ([0-9]+) as ([A-Za-z0-9_]+);` => `= $1;`.

`(==|!=|&) ([0-9]+) as ([A-Za-z0-9_]+)` => `$1 $2`.

`([0-9]+) as ([A-Za-z0-9_]+),` => `$1,`.

Also remove some redundant parentheses.

…...)[i as usize]` indexing.

…`s and "fall-through"s in `switch`es).

rinon

I haven't carefully read every line of this, so I'm relying on testing to catch any typos or other mistakes, but everything I can see that you're doing here looks fine to me.

src/obu.rs

kkysen requested a review from randomPoison November 27, 2023 07:08

kkysen mentioned this pull request Nov 29, 2023

backport from dav1d 1.2.0: picture: fix attaching props to delayed output pictures #518

Closed

kkysen force-pushed the kkysen/struct-Rav1dIntraPredDSPContext-cfl_ac-enum_map branch from 61e77a0 to f54bf19 Compare November 29, 2023 07:18

kkysen force-pushed the kkysen/cleanup-mod-obu branch from 38a1ef3 to 42be0bc Compare November 29, 2023 07:19

kkysen force-pushed the kkysen/struct-Rav1dIntraPredDSPContext-cfl_ac-enum_map branch from f54bf19 to d18b3a5 Compare November 29, 2023 07:47

kkysen force-pushed the kkysen/cleanup-mod-obu branch 2 times, most recently from 02da7ed to 68ea52d Compare November 30, 2023 05:32

kkysen changed the base branch from kkysen/struct-Rav1dIntraPredDSPContext-cfl_ac-enum_map to main November 30, 2023 05:34

kkysen force-pushed the kkysen/cleanup-mod-obu branch 2 times, most recently from 270f2d0 to bc827e4 Compare November 30, 2023 09:22

kkysen added 20 commits November 30, 2023 14:54

mod obu: Make outlined goto-derived fns inner fns.

5e91686

struct {D,R}av1dFrameHeader_restoration: Rename field `type_0 => r#…

84fa2c4

…type`.

struct {D,R}av1dWarpedMotionParams: Rename field type_0 => r#type.

62f5f0e

mod obu: Remove _[0-9]+ var suffixes.

1b191ef

mod obu: Remove redundant returns.

5a0fc9b

fn check_for_overrun: Make gb arg a ref.

3699bb6

fn rav1d_get_bits_pos: Make c arg a ref.

2a13696

fn rav1d_parse_obus: Make c arg a ref.

d29615c

fn rav1d_parse_obus: Make r#in arg a ref.

219ba90

fn rav1d_parse_obus::error: Make c arg a ref.

4ed363f

fn rav1d_parse_obus::error: Make r#in arg a ref.

69c7a68

fn rav1d_parse_obus::skip: Make c arg a ref.

ef8ab87

fn check_for_overrun: Make c arg a ref.

b9ee5b9

fn parse_tile_hdr: Make c arg a ref.

8b105e6

fn parse_tile_hdr: Make gb arg a ref.

5f0a25c

fn parse_frame_hdr: Make c arg a ref.

c6d2f8f

fn parse_frame_hdr: Make gb arg a ref.

fad6d1f

fn parse_frame_hdr::error: Make c arg a ref.

6990c0c

fn parse_frame_hdr: Make seqhdr var a ref.

5d26d10

fn parse_frame_hdr: Make hdr var a ref.

d4a4a7c

kkysen added 26 commits November 30, 2023 14:54

fn read_frame_size: Make c arg a ref.

01a5877

fn read_frame_size: Make gb arg a ref.

745e508

fn read_frame_size: Make seqhdr var a ref.

b3a6e13

fn read_frame_size: Make hdr var a ref.

21a9591

fn parse_seq_hdr: Make c arg a ref.

92569f9

fn parse_seq_hdr: Make gb arg a ref.

c9331fa

fn parse_seq_hdr: Make hdr arg a ref.

fa725d3

fn parse_seq_hdr::error: Make c arg a ref.

73bc425

fn parse_seq_hdr: Make op var a ref and replace .offset with [].

1a26a50

fn parse_seq_hdr: Make opi var a ref and replace .offset with `…

00c771e

…[]`.

mod obu: Remove fresh[0-9]+ temp vars.

e543bde

mod obu: Translate assert!s.

16a9aef

mod obu: Remove redundant transmutes to the same type.

73130b7

mod obu: Remove redundant literal as casts: double casts.

a5f7158

`([0-9]+) as ([A-Za-z0-9_]+) as ([A-Za-z0-9_]+)` => `$1 as $3`.

mod obu: Remove redundant literal as casts: parenthesized.

2d87e88

`$([0-9]+) as ([A-Za-z0-9_]+)$([^.])` => `($1)$3`.

mod obu: Remove redundant literal as casts: after ,s.

19d0081

`, ([0-9]+) as ([A-Za-z0-9_]+)` => `, $1`.

mod obu: Remove redundant literal as casts: assignments.

d9e113b

`= ([0-9]+) as ([A-Za-z0-9_]+);` => `= $1;`.

mod obu: Remove redundant literal as casts: after binary operators.

133b033

`(==|!=|&) ([0-9]+) as ([A-Za-z0-9_]+)` => `$1 $2`.

mod obu: Remove redundant literal as casts: after ,s.

b9bead9

`([0-9]+) as ([A-Za-z0-9_]+),` => `$1,`.

mod obu: Remove redundant as casts.

50cbc5b

Also remove some redundant parentheses.

mod obu: Replace literal .wrapping_* calls where possible.

57e4e2e

mod obu: Replace variable .wrapping_* calls where possible.

3027146

mod obu: Translate trivial for loops.

7a3b6b8

mod obu: Remove redundant type annotations.

ebaf378

mod obu: Replace *(...).as_(mut_)ptr().offset(i as isize) with `(…

3dd5311

…...)[i as usize]` indexing.

mod obu: Add back comments and line breaks from C (including `break…

6c6bce2

…`s and "fall-through"s in `switch`es).

kkysen force-pushed the kkysen/cleanup-mod-obu branch from bc827e4 to 6c6bce2 Compare November 30, 2023 19:54

rinon approved these changes Dec 2, 2023

View reviewed changes

src/obu.rs Show resolved Hide resolved

kkysen merged commit 3bc2e0b into main Dec 2, 2023
18 checks passed

kkysen deleted the kkysen/cleanup-mod-obu branch December 2, 2023 04:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`mod obu`: Cleanup part 1 #590

`mod obu`: Cleanup part 1 #590

kkysen commented Nov 27, 2023 •

edited

Loading

rinon left a comment

mod obu: Cleanup part 1 #590

mod obu: Cleanup part 1 #590

Conversation

kkysen commented Nov 27, 2023 • edited Loading

rinon left a comment

Choose a reason for hiding this comment

`mod obu`: Cleanup part 1 #590

`mod obu`: Cleanup part 1 #590

kkysen commented Nov 27, 2023 •

edited

Loading