quietvoid:
> To avoid duplicating code. The implementation in dovi_isom is identical.
>
> Signed-off-by: quietvoid <tcchlis...@gmail.com>
> ---
> libavformat/mov.c | 52 ++++++++---------------------------------------
> 1 file changed, 9 insertions(+), 43 deletions(-)
>
> diff --git a/libavformat/mov.c b/libavformat/mov.c
> index 9ebfa0bcc7..e3c80c399c 100644
> --- a/libavformat/mov.c
> +++ b/libavformat/mov.c
> @@ -55,6 +55,7 @@
> #include "avformat.h"
> #include "internal.h"
> #include "avio_internal.h"
> +#include "dovi_isom.h"
> #include "riff.h"
> #include "isom.h"
> #include "libavcodec/get_bits.h"
> @@ -7056,58 +7057,23 @@ static int mov_read_dmlp(MOVContext *c, AVIOContext
> *pb, MOVAtom atom)
> static int mov_read_dvcc_dvvc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
> {
> AVStream *st;
> - uint32_t buf;
> - AVDOVIDecoderConfigurationRecord *dovi;
> - size_t dovi_size;
> + uint8_t buf[ISOM_DVCC_DVVC_SIZE];
> int ret;
> + int64_t read_size = atom.size;
>
> if (c->fc->nb_streams < 1)
> return 0;
> st = c->fc->streams[c->fc->nb_streams-1];
>
> - if ((uint64_t)atom.size > (1<<30) || atom.size < 4)
> - return AVERROR_INVALIDDATA;
> -
> - dovi = av_dovi_alloc(&dovi_size);
> - if (!dovi)
> - return AVERROR(ENOMEM);
> -
> - dovi->dv_version_major = avio_r8(pb);
> - dovi->dv_version_minor = avio_r8(pb);
> -
> - buf = avio_rb16(pb);
> - dovi->dv_profile = (buf >> 9) & 0x7f; // 7 bits
> - dovi->dv_level = (buf >> 3) & 0x3f; // 6 bits
> - dovi->rpu_present_flag = (buf >> 2) & 0x01; // 1 bit
> - dovi->el_present_flag = (buf >> 1) & 0x01; // 1 bit
> - dovi->bl_present_flag = buf & 0x01; // 1 bit
> - if (atom.size >= 24) { // 4 + 4 + 4 * 4
> - buf = avio_r8(pb);
> - dovi->dv_bl_signal_compatibility_id = (buf >> 4) & 0x0f; // 4 bits
> - } else {
> - // 0 stands for None
> - // Dolby Vision V1.2.93 profiles and levels
> - dovi->dv_bl_signal_compatibility_id = 0;
> + // At most 24 bytes
> + if (read_size > ISOM_DVCC_DVVC_SIZE) {
> + read_size = ISOM_DVCC_DVVC_SIZE;
> }
Unnecessary parentheses. (Could even be made to read_size =
FFMIN(read_size, ISOM_DVCC_DVVC_SIZE); to save another line.)
>
> - ret = av_stream_add_side_data(st, AV_PKT_DATA_DOVI_CONF,
> - (uint8_t *)dovi, dovi_size);
> - if (ret < 0) {
> - av_free(dovi);
> - return ret;
> - }
> + if ((ret = avio_read(pb, buf, read_size)) != read_size)
Could use ffio_read_size() (a wrapper around avio_read() that returns an
error if the desired amount of data could not be read completely).
> + return ret < 0 ? ret : AVERROR(EIO);
>
> - av_log(c, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d,
> profile: %d, level: %d, "
> - "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n",
> - dovi->dv_version_major, dovi->dv_version_minor,
> - dovi->dv_profile, dovi->dv_level,
> - dovi->rpu_present_flag,
> - dovi->el_present_flag,
> - dovi->bl_present_flag,
> - dovi->dv_bl_signal_compatibility_id
> - );
> -
> - return 0;
> + return ff_isom_parse_dvcc_dvvc(c->fc, st, buf, read_size);
> }
>
> static int mov_read_kind(MOVContext *c, AVIOContext *pb, MOVAtom atom)
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
