demux: mp4: remove ReadBox_String

Same usage as binary data

modules/demux/mp4/libmp4.c

@@ -3315,33 +3315,6 @@ static int MP4_ReadBox_drms( stream_t *p_stream, MP4_Box_t *p_box )
     return 1;
 }
 
-static void MP4_FreeBox_String( MP4_Box_t *p_box )
-{
-    FREENULL( p_box->data.p_string->psz_text );
-}
-
-static int MP4_ReadBox_String( stream_t *p_stream, MP4_Box_t *p_box )
-{
-    MP4_READBOX_ENTER( MP4_Box_data_string_t, MP4_FreeBox_String );
-
-    if( p_box->i_size < 8 || p_box->i_size > SIZE_MAX )
-        MP4_READBOX_EXIT( 0 );
-
-    p_box->data.p_string->i_length = i_read;
-    p_box->data.p_string->psz_text = malloc( p_box->i_size + 1 - 8 ); /* +\0, -name, -size */
-    if( p_box->data.p_string->psz_text == NULL )
-        MP4_READBOX_EXIT( 0 );
-
-    memcpy( p_box->data.p_string->psz_text, p_peek, p_box->i_size - 8 );
-    p_box->data.p_string->psz_text[p_box->i_size - 8] = '\0';
-
-#ifdef MP4_VERBOSE
-        msg_Dbg( p_stream, "read box: \"%4.4s\" text=`%s'", (char *) & p_box->i_type,
-                 p_box->data.p_string->psz_text );
-#endif
-    MP4_READBOX_EXIT( 1 );
-}
-
 static void MP4_FreeBox_Binary( MP4_Box_t *p_box )
 {
     FREENULL( p_box->data.p_binary->p_blob );
@@ -4358,62 +4331,62 @@ static const struct
     { ATOM_gstd,    MP4_ReadBox_Metadata,    ATOM_ilst },
 
     /* udta */
-    { ATOM_0x40PRM, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0x40PRQ, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9ART, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9alb, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9ard, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9arg, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9aut, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9cak, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9cmt, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9con, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9com, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9cpy, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9day, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9des, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9dir, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9dis, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9dsa, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9fmt, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9gen, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9grp, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9hst, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9inf, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9isr, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9lab, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9lal, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9lnt, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9lyr, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9mak, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9mal, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9mod, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9nam, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9ope, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9phg, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9PRD, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9prd, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9prf, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9pub, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9req, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9sne, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9snm, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9sol, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9src, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9st3, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9swr, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9thx, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9too, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9trk, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9url, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9wrn, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9xpd, MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_0xa9xyz, MP4_ReadBox_String,    ATOM_udta },
+    { ATOM_0x40PRM, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0x40PRQ, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9ART, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9alb, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9ard, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9arg, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9aut, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9cak, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9cmt, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9con, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9com, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9cpy, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9day, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9des, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9dir, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9dis, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9dsa, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9fmt, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9gen, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9grp, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9hst, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9inf, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9isr, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9lab, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9lal, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9lnt, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9lyr, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9mak, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9mal, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9mod, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9nam, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9ope, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9phg, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9PRD, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9prd, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9prf, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9pub, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9req, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9sne, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9snm, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9sol, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9src, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9st3, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9swr, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9thx, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9too, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9trk, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9url, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9wrn, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9xpd, MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_0xa9xyz, MP4_ReadBox_Binary,    ATOM_udta },
     { ATOM_chpl,    MP4_ReadBox_chpl,      ATOM_udta }, /* nero unlabeled chapters list */
-    { ATOM_MCPS,    MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_name,    MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_vndr,    MP4_ReadBox_String,    ATOM_udta },
-    { ATOM_SDLN,    MP4_ReadBox_String,    ATOM_udta },
+    { ATOM_MCPS,    MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_name,    MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_vndr,    MP4_ReadBox_Binary,    ATOM_udta },
+    { ATOM_SDLN,    MP4_ReadBox_Binary,    ATOM_udta },
     { ATOM_HMMT,    MP4_ReadBox_HMMT,      ATOM_udta }, /* GoPro HiLight tags */
 
     /* udta, non meta */

modules/demux/mp4/libmp4.h

@@ -1182,8 +1182,8 @@ typedef struct
 
 typedef struct
 {
-    uint8_t *p_blob;
-    uint32_t i_blob;
+    void  *p_blob;
+    size_t i_blob;
 } MP4_Box_data_binary_t;
 
 typedef struct
@@ -1652,7 +1652,6 @@ typedef union MP4_Box_data_s
     MP4_Box_data_360_t  *p_360;
 
     /* for generic handlers */
-    MP4_Box_data_string_t *p_string;
     MP4_Box_data_binary_t *p_binary;
     MP4_Box_data_data_t *p_data;
 

modules/demux/mp4/meta.c

@@ -167,9 +167,10 @@ static char * ExtractString( MP4_Box_t *p_box )
     MP4_Box_t *p_data = MP4_BoxGet( p_box, "data" );
     if ( p_data )
         return StringConvert( BOXDATA(p_data) );
-    else if ( p_box->data.p_string && p_box->data.p_string->psz_text )
+    else if ( p_box->data.p_binary && p_box->data.p_binary->p_blob )
     {
-        char *psz_utf = strdup( p_box->data.p_string->psz_text );
+        char *psz_utf = strndup( p_box->data.p_binary->p_blob,
+                                 p_box->data.p_binary->i_blob );
         if (likely( psz_utf ))
             EnsureUTF8( psz_utf );
         return psz_utf;
@@ -245,7 +246,7 @@ static int ExtractIntlStrings( vlc_meta_t *p_meta, MP4_Box_t *p_box )
     if( *(uint8_t*)&p_box->i_type != 0xa9 || MP4_BoxGet( p_box, "data" ) )
         return false;
 
-    if( p_box->data.p_string == NULL )
+    if( p_box->data.p_binary->p_blob == NULL )
         return false;
 
     vlc_meta_type_t const* meta_type;
@@ -259,8 +260,8 @@ static int ExtractIntlStrings( vlc_meta_t *p_meta, MP4_Box_t *p_box )
     if( unlikely( !p_meta_intl ) )
         return false;
 
-    char const* p_peek = p_box->data.p_string->psz_text;
-    uint64_t i_read = p_box->data.p_string->i_length;
+    char const* p_peek = p_box->data.p_binary->p_blob;
+    uint64_t i_read = p_box->data.p_binary->i_blob;
 
     while( i_read )
     {

modules/demux/mp4/mp4.c

@@ -3126,7 +3126,8 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track,
                 case ATOM_0xa9nam:
                 case ATOM_name:
                     p_track->fmt.psz_description =
-                        strdup( p_box_iter->data.p_string->psz_text );
+                        strndup( p_box_iter->data.p_binary->p_blob,
+                                 p_box_iter->data.p_binary->i_blob );
                 default:
                     break;
             }