History

avformat/sccdec: split line with multiple subs

Paul B Mahol committed 6 years ago

Commit 49d07641 parent fd54add1 file · +25 −2Browse files

Unified · Split

libavformat/sccdec.c+25−2
@@ -120,18 +120,41 @@ try_again: · 119 unmodified lines
120 for (i = 0; i < 4095; i += 3) {120 for (i = 0; i < 4095; i += 3) {
121 char *ptr = av_strtok(lline, " ", &saveptr);121 char *ptr = av_strtok(lline, " ", &saveptr);
122 char c1, c2, c3, c4;122 char c1, c2, c3, c4;
123 uint8_t o1, o2;
123 124
124 if (!ptr)125 if (!ptr)
125 break;126 break;
126 127
127 if (av_sscanf(ptr, "%c%c%c%c", &c1, &c2, &c3, &c4) != 4)128 if (av_sscanf(ptr, "%c%c%c%c", &c1, &c2, &c3, &c4) != 4)
128 break;129 break;
130 o1 = convert(c2) | (convert(c1) << 4);
131 o2 = convert(c4) | (convert(c3) << 4);
129 132
130 lline = NULL;133 lline = NULL;
131 out[i+0] = 0xfc;134 out[i+0] = 0xfc;
132 out[i+1] = convert(c2) | (convert(c1) << 4);135 out[i+1] = o1;
133 out[i+2] = convert(c4) | (convert(c3) << 4);136 out[i+2] = o2;
137
138 if (o1 == 0x94 && o2 == 0x2f && saveptr && av_strcasecmp(saveptr, "942f")) {
139 int64_t duration;
140
141 i += 3;
142 out[i] = 0;
143 duration = i * 11;
144
145 sub = ff_subtitles_queue_insert(&scc->q, out, i, 0);
146 if (!sub)
147 return AVERROR(ENOMEM);
148
149 current_pos += i;
150 sub->pos = current_pos;
151 sub->pts = ts_start;
152 sub->duration = duration;
153 ts_start += duration;
154 i = 0;
155 }
134 }156 }
157
135 out[i] = 0;158 out[i] = 0;
136 159
137 sub = ff_subtitles_queue_insert(&scc->q, out, i, 0);160 sub = ff_subtitles_queue_insert(&scc->q, out, i, 0);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t