• Stefano Sabatini's avatar
    ffprobe: fix XML rendering, review XML layout · 2b0973de
    Stefano Sabatini authored
    Fix rendering of int values within a side data element, which was
    broken since commit d2d3a83a, where the side data element was
    correctly marked as a variable fields element. Logic to render a
    string variable was implemented already, but it was not implemented
    for the int fields path, which was enabled by that commit.
    
    Also, code and schema is changed in order to account for multiple
    variable-fields elements - such as side data, contained within the
    same parent. Previously it was assumed that a single variable-fields
    element was contained within the parent, which was the case for tags,
    but is not the case for side-data.
    
    Previously data was rendered as:
    <side_data_list>
        <side_data side_data_type="CPB properties" max_bitrate="0" min_bitrate="0" avg_bitrate="0" buffer_size="327680" vbv_delay="-1"/>
    </side_data_list>
    
    Now as:
    <side_data_list>
       <side_data type="CPB properties">
           <side_datum key="side_data_type" value="CPB properties"/>
           <side_datum key="max_bitrate" value="0"/>
           <side_datum key="min_bitrate" value="0"/>
           <side_datum key="avg_bitrate" value="0"/>
           <side_datum key="buffer_size" value="49152"/>
           <side_datum key="vbv_delay" value="-1"/>
       </side_data>
    </side_data_list>
    
    Variable-fields elements are rendered as a containing element wrapping
    generic key/values elements, enabling use of strict XML schema.
    
    Fix trac issue:
    https://trac.ffmpeg.org/ticket/10613
    2b0973de
To find the state of this project's repository at the time of any of these versions, check out the tags.