Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
6049b15c
Commit
6049b15c
authored
Jan 06, 2016
by
Aman Gupta
Committed by
Clément Bœsch
Jan 09, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/ccaption_dec: combine ROLLUP modes as they are identical
parent
2693275c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
ccaption_dec.c
libavcodec/ccaption_dec.c
+6
-10
No files found.
libavcodec/ccaption_dec.c
View file @
6049b15c
...
@@ -37,9 +37,7 @@
...
@@ -37,9 +37,7 @@
enum
cc_mode
{
enum
cc_mode
{
CCMODE_POPON
,
CCMODE_POPON
,
CCMODE_PAINTON
,
CCMODE_PAINTON
,
CCMODE_ROLLUP_2
,
CCMODE_ROLLUP
,
CCMODE_ROLLUP_3
,
CCMODE_ROLLUP_4
,
CCMODE_TEXT
,
CCMODE_TEXT
,
};
};
...
@@ -143,7 +141,7 @@ static av_cold int init_decoder(AVCodecContext *avctx)
...
@@ -143,7 +141,7 @@ static av_cold int init_decoder(AVCodecContext *avctx)
av_bprint_init
(
&
ctx
->
buffer
,
0
,
AV_BPRINT_SIZE_UNLIMITED
);
av_bprint_init
(
&
ctx
->
buffer
,
0
,
AV_BPRINT_SIZE_UNLIMITED
);
/* taking by default roll up to 2 */
/* taking by default roll up to 2 */
ctx
->
mode
=
CCMODE_ROLLUP
_2
;
ctx
->
mode
=
CCMODE_ROLLUP
;
ctx
->
rollup
=
2
;
ctx
->
rollup
=
2
;
ret
=
ff_ass_subtitle_header_default
(
avctx
);
ret
=
ff_ass_subtitle_header_default
(
avctx
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
...
@@ -233,9 +231,7 @@ static struct Screen *get_writing_screen(CCaptionSubContext *ctx)
...
@@ -233,9 +231,7 @@ static struct Screen *get_writing_screen(CCaptionSubContext *ctx)
// use Inactive screen
// use Inactive screen
return
ctx
->
screen
+
!
ctx
->
active_screen
;
return
ctx
->
screen
+
!
ctx
->
active_screen
;
case
CCMODE_PAINTON
:
case
CCMODE_PAINTON
:
case
CCMODE_ROLLUP_2
:
case
CCMODE_ROLLUP
:
case
CCMODE_ROLLUP_3
:
case
CCMODE_ROLLUP_4
:
case
CCMODE_TEXT
:
case
CCMODE_TEXT
:
// use active screen
// use active screen
return
ctx
->
screen
+
ctx
->
active_screen
;
return
ctx
->
screen
+
ctx
->
active_screen
;
...
@@ -433,15 +429,15 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint
...
@@ -433,15 +429,15 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint
break
;
break
;
case
0x25
:
case
0x25
:
ctx
->
rollup
=
2
;
ctx
->
rollup
=
2
;
ctx
->
mode
=
CCMODE_ROLLUP
_2
;
ctx
->
mode
=
CCMODE_ROLLUP
;
break
;
break
;
case
0x26
:
case
0x26
:
ctx
->
rollup
=
3
;
ctx
->
rollup
=
3
;
ctx
->
mode
=
CCMODE_ROLLUP
_3
;
ctx
->
mode
=
CCMODE_ROLLUP
;
break
;
break
;
case
0x27
:
case
0x27
:
ctx
->
rollup
=
4
;
ctx
->
rollup
=
4
;
ctx
->
mode
=
CCMODE_ROLLUP
_4
;
ctx
->
mode
=
CCMODE_ROLLUP
;
break
;
break
;
case
0x29
:
case
0x29
:
/* resume direct captioning */
/* resume direct captioning */
...
...
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