Skip to content

F
ffmpeg.wasm-core
Commit 23a50c8a authored by Aman Gupta's avatar Aman Gupta Committed by Clément Bœsch
Browse files
Options

Revert "lavc/ccaption_dec: reap_screen is not necessary when clearing screen or buffer" 

This reverts commit fe225b11.
parent 836c7935
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
libavcodec/ccaption_dec.c
View file @ 23a50c8a
...@@ -361,15 +361,17 @@ static void handle_pac(CCaptionSubContext *ctx, uint8_t hi, uint8_t lo) ...@@ -361,15 +361,17 @@ static void handle_pac(CCaptionSubContext *ctx, uint8_t hi, uint8_t lo)
} }
} }
static void handle_erase(CCaptionSubContext *ctx, int n_screen) static void handle_erase(CCaptionSubContext *ctx, int64_t pts, int n_screen)
{ {
struct Screen *screen = ctx->screen + n_screen; struct Screen *screen = ctx->screen + n_screen;
reap_screen(ctx, pts);
screen->row_used = 0; screen->row_used = 0;
} }
static void handle_eoc(CCaptionSubContext *ctx, int64_t pts) static void handle_eoc(CCaptionSubContext *ctx, int64_t pts)
{ {
reap_screen(ctx, pts); handle_erase(ctx, pts, ctx->active_screen);
ctx->active_screen = !ctx->active_screen; ctx->active_screen = !ctx->active_screen;
ctx->cursor_column = 0; ctx->cursor_column = 0;
} }
...@@ -450,7 +452,7 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint ...@@ -450,7 +452,7 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint
break; break;
case 0x2c: case 0x2c:
/* erase display memory */ /* erase display memory */
handle_erase(ctx, ctx->active_screen); handle_erase(ctx, pts, ctx->active_screen);
break; break;
case 0x2d: case 0x2d:
/* carriage return */ /* carriage return */
...@@ -461,7 +463,7 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint ...@@ -461,7 +463,7 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint
break; break;
case 0x2e: case 0x2e:
/* erase non displayed memory */ /* erase non displayed memory */
handle_erase(ctx, !ctx->active_screen); handle_erase(ctx, pts, !ctx->active_screen);
break; break;
case 0x2f: case 0x2f:
/* end of caption */ /* end of caption */
......
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