virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Aman Gupta 2016-01-05 15:06:02 -08:00 committed by Clément Bœsch
parent e990d746d0
commit fe225b113b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/ccaption_dec.c
View File

@ -361,17 +361,15 @@ static void handle_pac(CCaptionSubContext *ctx, uint8_t hi, uint8_t lo)
} }
} }
static void handle_erase(CCaptionSubContext *ctx, int64_t pts, int n_screen) static void handle_erase(CCaptionSubContext *ctx, 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)
{ {
handle_erase(ctx, pts, ctx->active_screen); reap_screen(ctx, pts);
ctx->active_screen = !ctx->active_screen; ctx->active_screen = !ctx->active_screen;
ctx->cursor_column = 0; ctx->cursor_column = 0;
} }
@ -452,7 +450,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, pts, ctx->active_screen); handle_erase(ctx, ctx->active_screen);
break; break;
case 0x2d: case 0x2d:
/* carriage return */ /* carriage return */
@ -463,7 +461,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, pts, !ctx->active_screen); handle_erase(ctx, !ctx->active_screen);
break; break;
case 0x2f: case 0x2f:
/* end of caption */ /* end of caption */