Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
x264
Commits
7e457290
Commit
7e457290
authored
Apr 01, 2018
by
Anton Mitrofanov
Committed by
Henrik Gramner
May 27, 2018
Browse files
Make bs_align_10 imply bs_flush
Now behaves the same as bs_align_0 and bs_align_1.
parent
6afb67c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
common/bitstream.h
View file @
7e457290
...
...
@@ -188,6 +188,7 @@ static inline void bs_align_10( bs_t *s )
{
if
(
s
->
i_left
&
7
)
bs_write
(
s
,
s
->
i_left
&
7
,
1
<<
(
(
s
->
i_left
&
7
)
-
1
)
);
bs_flush
(
s
);
}
/* golomb functions */
...
...
encoder/set.c
View file @
7e457290
...
...
@@ -555,7 +555,6 @@ void x264_sei_recovery_point_write( x264_t *h, bs_t *s, int recovery_frame_cnt )
bs_write
(
&
q
,
2
,
0
);
//changing_slice_group 0
bs_align_10
(
&
q
);
bs_flush
(
&
q
);
x264_sei_write
(
s
,
tmp_buf
,
bs_pos
(
&
q
)
/
8
,
SEI_RECOVERY_POINT
);
}
...
...
@@ -610,7 +609,6 @@ void x264_sei_buffering_period_write( x264_t *h, bs_t *s )
}
bs_align_10
(
&
q
);
bs_flush
(
&
q
);
x264_sei_write
(
s
,
tmp_buf
,
bs_pos
(
&
q
)
/
8
,
SEI_BUFFERING_PERIOD
);
}
...
...
@@ -642,7 +640,6 @@ void x264_sei_pic_timing_write( x264_t *h, bs_t *s )
}
bs_align_10
(
&
q
);
bs_flush
(
&
q
);
x264_sei_write
(
s
,
tmp_buf
,
bs_pos
(
&
q
)
/
8
,
SEI_PIC_TIMING
);
}
...
...
@@ -685,7 +682,6 @@ void x264_sei_frame_packing_write( x264_t *h, bs_t *s )
bs_write1
(
&
q
,
0
);
// frame_packing_arrangement_extension_flag
bs_align_10
(
&
q
);
bs_flush
(
&
q
);
x264_sei_write
(
s
,
tmp_buf
,
bs_pos
(
&
q
)
/
8
,
SEI_FRAME_PACKING
);
}
...
...
@@ -702,7 +698,6 @@ void x264_sei_alternative_transfer_write( x264_t *h, bs_t *s )
bs_write
(
&
q
,
8
,
h
->
param
.
i_alternative_transfer
);
// preferred_transfer_characteristics
bs_align_10
(
&
q
);
bs_flush
(
&
q
);
x264_sei_write
(
s
,
tmp_buf
,
bs_pos
(
&
q
)
/
8
,
SEI_ALTERNATIVE_TRANSFER
);
}
...
...
@@ -746,7 +741,6 @@ void x264_sei_dec_ref_pic_marking_write( x264_t *h, bs_t *s )
}
bs_align_10
(
&
q
);
bs_flush
(
&
q
);
x264_sei_write
(
s
,
tmp_buf
,
bs_pos
(
&
q
)
/
8
,
SEI_DEC_REF_PIC_MARKING
);
}
...
...
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