Changelog

@@ -3,10 +3,6 @@ releases are sorted from youngest to oldest.
 
 
 version 8.0.1:
- avutil/common: cast GET_BYTE/GET_16BIT returned value
- avfilter/vf_drawtext: fix call GET_UTF8 with invalid argument
- avfilter/vf_drawtext: fix incorrect text length
- Update for 8.0.1
  avfilter/vf_drawtext: Account for bbox text seperator
  avcodec/mediacodecdec_common: Check that the input to mediacodec_wrap_sw_audio_buffer() contains channel * sample_size
  avcodec/rv60dec: Clear blk_info

libavfilter/vf_drawtext.c

@@ -1394,7 +1394,8 @@ static int measure_text(AVFilterContext *ctx, TextMetrics *metrics)
 {
     DrawTextContext *s = ctx->priv;
     char *text = s->expanded_text.str;
-    char *textdup = NULL;
+    char *textdup = NULL, *start = NULL;
+    int num_chars = 0;
     int width64 = 0, w64 = 0;
     int cur_min_y64 = 0, first_max_y64 = -32000;
     int first_min_x64 = 32000, last_max_x64 = -32000;
@@ -1404,7 +1405,7 @@ static int measure_text(AVFilterContext *ctx, TextMetrics *metrics)
     Glyph *glyph = NULL;
 
     int i, tab_idx = 0, last_tab_idx = 0, line_offset = 0;
-    uint8_t *start, *p;
+    char* p;
     int ret = 0;
 
     // Count the lines and the tab characters
@@ -1457,7 +1458,7 @@ continue_on_failed2:
             TextLine *cur_line = &s->lines[line_count];
             HarfbuzzData *hb = &cur_line->hb_data;
             cur_line->cluster_offset = line_offset;
-            ret = shape_text_hb(s, hb, start, p - start);
+            ret = shape_text_hb(s, hb, start, num_chars);
             if (ret != 0) {
                 goto done;
             }
@@ -1515,12 +1516,14 @@ continue_on_failed2:
             if (w64 > width64) {
                 width64 = w64;
             }
+            num_chars = -1;
             start = p;
             ++line_count;
             line_offset = i + 1;
         }
 
         if (code == 0) break;
+        ++num_chars;
     }
 
     metrics->line_height64 = s->face->size->metrics.height;

libavutil/common.h

@@ -486,13 +486,13 @@ static av_always_inline av_const int av_parity_c(uint32_t v)
  * to prevent undefined results.
  */
 #define GET_UTF8(val, GET_BYTE, ERROR)\
-    val= (uint8_t)(GET_BYTE);\
+    val= (GET_BYTE);\
     {\
         uint32_t top = (val & 128) >> 1;\
         if ((val & 0xc0) == 0x80 || val >= 0xFE)\
             {ERROR}\
         while (val & top) {\
-            unsigned int tmp = (uint8_t)(GET_BYTE) - 128;\
+            unsigned int tmp = (GET_BYTE) - 128;\
             if(tmp>>6)\
                 {ERROR}\
             val= (val<<6) + tmp;\
@@ -511,11 +511,11 @@ static av_always_inline av_const int av_parity_c(uint32_t v)
  *                  typically a goto statement.
  */
 #define GET_UTF16(val, GET_16BIT, ERROR)\
-    val = (uint16_t)(GET_16BIT);\
+    val = (GET_16BIT);\
     {\
         unsigned int hi = val - 0xD800;\
         if (hi < 0x800) {\
-            val = (uint16_t)(GET_16BIT) - 0xDC00;\
+            val = (GET_16BIT) - 0xDC00;\
             if (val > 0x3FFU || hi > 0x3FFU)\
                 {ERROR}\
             val += (hi<<10) + 0x10000;\