• Steven Robertson's avatar
    libavformat/mov: Accept known codepoints in 'colr' · a3cab3d4
    Steven Robertson authored
    This change relaxes the whitelist on reading color metadata in MOV/BMFF
    containers. The whitelist on writing values is still in place.
    
    As a consequence it also fixes an apparent bug in reading 'nclc' values.
    The 'nclc' spec [1] is in harmony with ISO 23001-8 for the values it
    lists, but the code getting removed was remapping 5->6 and 6->7 for
    primaries, which is incorrect, and was remapping 6->5 for color matrix
    ("colorspace" in the code), which is equivalent but an unnecessary
    inconsistency. This logic error doesn't appear in movenc.
    
    Removing the whitelist allows proper conversion when the source codec
    relies on the container for proper signaling of newer codepoints, such
    as DNxHR and VP9. If converting to a codec or container that has updated
    its spec to include the new codepoints, the metadata will be preserved.
    If going back to MOV/BMFF, the output whitelist will still kick in, so
    this won't result in out-of-spec files being created.
    
    [1] https://developer.apple.com/library/mac/technotes/tn2162/_index.htmlSigned-off-by: 's avatarSteven Robertson <steven@strobe.cc>
    Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
    a3cab3d4
mov.c 187 KB