December 2015 - ffmpeg-cvslog

lavf/mov: add support for sidx fragment indexes
by git＠videolan.org 04 Jan '16

04 Jan '16

ffmpeg | branch: release/2.8 | Rodger Combs <rodger.combs(a)gmail.com> | Mon Jul 20 15:00:35 2015 -0500| [edf5e88eac83807f6f80b1d18c57810c31c4d6fa] | committer: Michael Niedermayer lavf/mov: add support for sidx fragment indexes Fixes trac #3842 (cherry picked from commit 4ab56667594842283dc5ae07f0daba2a2cb4d3af) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edf5e88eac83807f6… --- libavformat/isom.h | 2 + libavformat/mov.c | 245 +++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 208 insertions(+), 39 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index aee9d6e..6e921c0 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -103,6 +103,7 @@ typedef struct MOVSbgp { typedef struct MOVFragmentIndexItem { int64_t moof_offset; int64_t time; + int headers_read; } MOVFragmentIndexItem; typedef struct MOVFragmentIndex { @@ -197,6 +198,7 @@ typedef struct MOVContext { int has_looked_for_mfra; MOVFragmentIndex** fragment_index_data; unsigned fragment_index_count; + int fragment_index_complete; int atom_depth; unsigned int aax_mode; ///< 'aax' file has been detected uint8_t file_key[20]; diff --git a/libavformat/mov.c b/libavformat/mov.c index a8d72b4..735e956 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3294,7 +3294,7 @@ static int mov_read_tfhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) MOVFragment *frag = &c->fragment; MOVTrackExt *trex = NULL; MOVFragmentIndex* index = NULL; - int flags, track_id, i; + int flags, track_id, i, found = 0; avio_r8(pb); /* version */ flags = avio_rb24(pb); @@ -3312,15 +3312,6 @@ static int mov_read_tfhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_ERROR, "could not find corresponding trex\n"); return AVERROR_INVALIDDATA; } - for (i = 0; i < c->fragment_index_count; i++) { - MOVFragmentIndex* candidate = c->fragment_index_data[i]; - if (candidate->track_id == frag->track_id) { - av_log(c->fc, AV_LOG_DEBUG, - "found fragment index for track %u\n", frag->track_id); - index = candidate; - break; - } - } frag->base_data_offset = flags & MOV_TFHD_BASE_DATA_OFFSET ? avio_rb64(pb) : flags & MOV_TFHD_DEFAULT_BASE_IS_MOOF ? @@ -3334,24 +3325,33 @@ static int mov_read_tfhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) frag->flags = flags & MOV_TFHD_DEFAULT_FLAGS ? avio_rb32(pb) : trex->flags; frag->time = AV_NOPTS_VALUE; - if (index) { - int i, found = 0; - for (i = index->current_item; i < index->item_count; i++) { - if (frag->implicit_offset == index->items[i].moof_offset) { - av_log(c->fc, AV_LOG_DEBUG, "found fragment index entry " - "for track %u and moof_offset %"PRId64"\n", - frag->track_id, index->items[i].moof_offset); - frag->time = index->items[i].time; - index->current_item = i + 1; - found = 1; + for (i = 0; i < c->fragment_index_count; i++) { + int j; + MOVFragmentIndex* candidate = c->fragment_index_data[i]; + if (candidate->track_id == frag->track_id) { + av_log(c->fc, AV_LOG_DEBUG, + "found fragment index for track %u\n", frag->track_id); + index = candidate; + for (j = index->current_item; j < index->item_count; j++) { + if (frag->implicit_offset == index->items[j].moof_offset) { + av_log(c->fc, AV_LOG_DEBUG, "found fragment index entry " + "for track %u and moof_offset %"PRId64"\n", + frag->track_id, index->items[j].moof_offset); + frag->time = index->items[j].time; + index->current_item = j + 1; + found = 1; + break; + } } - } - if (!found) { - av_log(c->fc, AV_LOG_WARNING, "track %u has a fragment index " - "but it doesn't have an (in-order) entry for moof_offset " - "%"PRId64"\n", frag->track_id, frag->implicit_offset); + if (found) + break; } } + if (index && !found) { + av_log(c->fc, AV_LOG_DEBUG, "track %u has a fragment index but " + "it doesn't have an (in-order) entry for moof_offset " + "%"PRId64"\n", frag->track_id, frag->implicit_offset); + } av_log(c->fc, AV_LOG_TRACE, "frag flags 0x%x\n", frag->flags); return 0; } @@ -3541,7 +3541,106 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) return AVERROR_EOF; frag->implicit_offset = offset; - st->duration = sc->track_end = dts + sc->time_offset; + + sc->track_end = dts + sc->time_offset; + if (st->duration < sc->track_end) + st->duration = sc->track_end; + + return 0; +} + +static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + int64_t offset = avio_tell(pb) + atom.size, pts; + uint8_t version; + unsigned i, track_id; + AVStream *st = NULL; + MOVStreamContext *sc; + MOVFragmentIndex *index = NULL; + MOVFragmentIndex **tmp; + AVRational timescale; + + version = avio_r8(pb); + if (version > 1) { + avpriv_request_sample(c->fc, "sidx version %u", version); + return AVERROR_PATCHWELCOME; + } + + avio_rb24(pb); // flags + + track_id = avio_rb32(pb); // Reference ID + for (i = 0; i < c->fc->nb_streams; i++) { + if (c->fc->streams[i]->id == track_id) { + st = c->fc->streams[i]; + break; + } + } + if (!st) { + av_log(c->fc, AV_LOG_ERROR, "could not find corresponding track id %d\n", track_id); + return AVERROR_INVALIDDATA; + } + + sc = st->priv_data; + + timescale = av_make_q(1, avio_rb32(pb)); + + if (version == 0) { + pts = avio_rb32(pb); + offset += avio_rb32(pb); + } else { + pts = avio_rb64(pb); + offset += avio_rb64(pb); + } + + avio_rb16(pb); // reserved + + index = av_mallocz(sizeof(MOVFragmentIndex)); + if (!index) + return AVERROR(ENOMEM); + + index->track_id = track_id; + + index->item_count = avio_rb16(pb); + index->items = av_mallocz_array(index->item_count, sizeof(MOVFragmentIndexItem)); + + if (!index->items) { + av_freep(&index); + return AVERROR(ENOMEM); + } + + for (i = 0; i < index->item_count; i++) { + uint32_t size = avio_rb32(pb); + uint32_t duration = avio_rb32(pb); + if (size & 0x80000000) { + avpriv_request_sample(c->fc, "sidx reference_type 1"); + av_freep(&index->items); + av_freep(&index); + return AVERROR_PATCHWELCOME; + } + avio_rb32(pb); // sap_flags + index->items[i].moof_offset = offset; + index->items[i].time = av_rescale_q(pts, st->time_base, timescale); + offset += size; + pts += duration; + } + + st->duration = sc->track_end = pts; + + tmp = av_realloc_array(c->fragment_index_data, + c->fragment_index_count + 1, + sizeof(MOVFragmentIndex*)); + if (!tmp) { + av_freep(&index->items); + av_freep(&index); + return AVERROR(ENOMEM); + } + + c->fragment_index_data = tmp; + c->fragment_index_data[c->fragment_index_count++] = index; + + if (offset == avio_size(pb)) + c->fragment_index_complete = 1; + return 0; } @@ -3799,6 +3898,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('a','l','a','c'), mov_read_alac }, /* alac specific atom */ { MKTAG('a','v','c','C'), mov_read_glbl }, { MKTAG('p','a','s','p'), mov_read_pasp }, +{ MKTAG('s','i','d','x'), mov_read_sidx }, { MKTAG('s','t','b','l'), mov_read_default }, { MKTAG('s','t','c','o'), mov_read_stco }, { MKTAG('s','t','p','s'), mov_read_stps }, @@ -3922,9 +4022,9 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) return err; } if (c->found_moov && c->found_mdat && - ((!pb->seekable || c->fc->flags & AVFMT_FLAG_IGNIDX) || + ((!pb->seekable || c->fc->flags & AVFMT_FLAG_IGNIDX || c->fragment_index_complete) || start_pos + a.size == avio_size(pb))) { - if (!pb->seekable || c->fc->flags & AVFMT_FLAG_IGNIDX) + if (!pb->seekable || c->fc->flags & AVFMT_FLAG_IGNIDX || c->fragment_index_complete) c->next_root_atom = start_pos + a.size; c->atom_depth --; return 0; @@ -4529,6 +4629,52 @@ static int should_retry(AVIOContext *pb, int error_code) { return 1; } +static int mov_switch_root(AVFormatContext *s, int64_t target) +{ + MOVContext *mov = s->priv_data; + int i, j; + int already_read = 0; + + if (avio_seek(s->pb, target, SEEK_SET) != target) { + av_log(mov->fc, AV_LOG_ERROR, "root atom offset 0x%"PRIx64": partial file\n", target); + return AVERROR_INVALIDDATA; + } + + mov->next_root_atom = 0; + + for (i = 0; i < mov->fragment_index_count; i++) { + MOVFragmentIndex *index = mov->fragment_index_data[i]; + int found = 0; + for (j = 0; j < index->item_count; j++) { + MOVFragmentIndexItem *item = &index->items[j]; + if (found) { + mov->next_root_atom = item->moof_offset; + break; // Advance to next index in outer loop + } else if (item->moof_offset == target) { + index->current_item = FFMIN(j, index->current_item); + if (item->headers_read) + already_read = 1; + item->headers_read = 1; + found = 1; + } + } + if (!found) + index->current_item = 0; + } + + if (already_read) + return 0; + + mov->found_mdat = 0; + + if (mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }) < 0 || + avio_feof(s->pb)) + return AVERROR_EOF; + av_log(s, AV_LOG_TRACE, "read fragments, offset 0x%"PRIx64"\n", avio_tell(s->pb)); + + return 1; +} + static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) { MOVContext *mov = s->priv_data; @@ -4539,19 +4685,11 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) mov->fc = s; retry: sample = mov_find_next_sample(s, &st); - if (!sample) { - mov->found_mdat = 0; + if (!sample || (mov->next_root_atom && sample->pos > mov->next_root_atom)) { if (!mov->next_root_atom) return AVERROR_EOF; - if (avio_seek(s->pb, mov->next_root_atom, SEEK_SET) != mov->next_root_atom) { - av_log(mov->fc, AV_LOG_ERROR, "next root atom offset 0x%"PRIx64": partial file\n", mov->next_root_atom); - return AVERROR_INVALIDDATA; - } - mov->next_root_atom = 0; - if (mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }) < 0 || - avio_feof(s->pb)) - return AVERROR_EOF; - av_log(s, AV_LOG_TRACE, "read fragments, offset 0x%"PRIx64"\n", avio_tell(s->pb)); + if ((ret = mov_switch_root(s, mov->next_root_atom)) < 0) + return ret; goto retry; } sc = st->priv_data; @@ -4629,12 +4767,41 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } +static int mov_seek_fragment(AVFormatContext *s, AVStream *st, int64_t timestamp) +{ + MOVContext *mov = s->priv_data; + int i, j; + + if (!mov->fragment_index_complete) + return 0; + + for (i = 0; i < mov->fragment_index_count; i++) { + if (mov->fragment_index_data[i]->track_id == st->id) { + MOVFragmentIndex *index = index = mov->fragment_index_data[i]; + for (j = index->item_count - 1; j >= 0; j--) { + if (index->items[j].time <= timestamp) { + if (index->items[j].headers_read) + return 0; + + return mov_switch_root(s, index->items[j].moof_offset); + } + } + } + } + + return 0; +} + static int mov_seek_stream(AVFormatContext *s, AVStream *st, int64_t timestamp, int flags) { MOVStreamContext *sc = st->priv_data; int sample, time_sample; int i; + int ret = mov_seek_fragment(s, st, timestamp); + if (ret < 0) + return ret; + sample = av_index_search_timestamp(st, timestamp, flags); av_log(s, AV_LOG_TRACE, "stream %d, timestamp %"PRId64", sample %d\n", st->index, timestamp, sample); if (sample < 0 && st->nb_index_entries && timestamp < st->index_entries[0].timestamp)

3 2

mjpegdec: extend check for incompatible values of s->rgb and s->ls
by git＠videolan.org 31 Dec '15

31 Dec '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Thu Dec 31 16:55:43 2015 +0100| [7ea2db6eafa0a8a9497aab20be2cfc8742a59072] | committer: Andreas Cadhalpun mjpegdec: extend check for incompatible values of s->rgb and s->ls This can happen if s->ls changes from 0 to 1, but picture allocation is skipped due to s->interlaced. In that case ff_jpegls_decode_picture could be called even though the s->picture_ptr frame has the wrong pixel format and thus a wrong linesize, which results in a too small zero buffer being allocated. This fixes an out-of-bounds read in ls_decode_line. Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ea2db6eafa0a8a94… --- libavcodec/mjpegdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c812b86..c730e05 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -632,7 +632,8 @@ unk_pixfmt: av_log(s->avctx, AV_LOG_DEBUG, "decode_sof0: error, len(%d) mismatch\n", len); } - if (s->rgb && !s->lossless && !s->ls) { + if ((s->rgb && !s->lossless && !s->ls) || + (!s->rgb && s->ls && s->nb_components > 1)) { av_log(s->avctx, AV_LOG_ERROR, "Unsupported coding and pixel format combination\n"); return AVERROR_PATCHWELCOME; }

1 0

avformat/mov: support cenc (common encryption)
by git＠videolan.org 31 Dec '15

31 Dec '15

ffmpeg | branch: master | erankor <eran.kornblau(a)kaltura.com> | Mon Dec 7 12:30:50 2015 +0200| [3f8564fe3c68a29a137ada2400bd9dcd3928bfb1] | committer: Michael Niedermayer avformat/mov: support cenc (common encryption) support reading encrypted mp4 using aes-ctr, conforming to ISO/IEC 23001-7. a new parameter was added: - decryption_key - 128 bit decryption key (hex) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f8564fe3c68a29a1… --- Changelog | 1 + libavformat/isom.h | 13 ++++ libavformat/mov.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+) diff --git a/Changelog b/Changelog index d9c2ea8..dbe7279 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version <next>: +- Common Encryption (CENC) MP4 decoding support - Common Encryption (CENC) MP4 encoding support - DXV decoding - extrastereo filter diff --git a/libavformat/isom.h b/libavformat/isom.h index 255efd1..e07dc0e9 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -37,6 +37,8 @@ extern const AVCodecTag ff_codec_movsubtitle_tags[]; int ff_mov_iso639_to_lang(const char lang[4], int mp4); int ff_mov_lang_to_iso639(unsigned code, char to[4]); +struct AVAESCTR; + /* the QuickTime file format is quite convoluted... * it has lots of index tables, each indexing something in another one... * Here we just use what is needed to read the chunks @@ -168,6 +170,15 @@ typedef struct MOVStreamContext { int64_t duration_for_fps; int32_t *display_matrix; + uint32_t format; + + struct { + int use_subsamples; + uint8_t* auxiliary_info; + uint8_t* auxiliary_info_end; + uint8_t* auxiliary_info_pos; + struct AVAESCTR* aes_ctr; + } cenc; } MOVStreamContext; typedef struct MOVContext { @@ -214,6 +225,8 @@ typedef struct MOVContext { void *audible_fixed_key; int audible_fixed_key_size; struct AVAES *aes_decrypt; + uint8_t *decryption_key; + int decryption_key_len; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); diff --git a/libavformat/mov.c b/libavformat/mov.c index 52717a4..78081ce 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -39,6 +39,7 @@ #include "libavutil/display.h" #include "libavutil/opt.h" #include "libavutil/aes.h" +#include "libavutil/aes_ctr.h" #include "libavutil/sha.h" #include "libavutil/timecode.h" #include "libavcodec/ac3tab.h" @@ -2172,6 +2173,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) sc->pseudo_stream_id = st->codec->codec_tag ? -1 : pseudo_stream_id; sc->dref_id= dref_id; + sc->format = format; id = mov_codec_id(st, format); @@ -3956,6 +3958,164 @@ static int mov_read_free(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_frma(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + uint32_t format = avio_rl32(pb); + MOVStreamContext *sc; + enum AVCodecID id; + AVStream *st; + + if (c->fc->nb_streams < 1) + return 0; + st = c->fc->streams[c->fc->nb_streams - 1]; + sc = st->priv_data; + + switch (sc->format) + { + case MKTAG('e','n','c','v'): // encrypted video + case MKTAG('e','n','c','a'): // encrypted audio + id = mov_codec_id(st, format); + if (st->codec->codec_id != AV_CODEC_ID_NONE && + st->codec->codec_id != id) { + av_log(c->fc, AV_LOG_WARNING, + "ignoring 'frma' atom of '%.4s', stream has codec id %d\n", + (char*)&format, st->codec->codec_id); + break; + } + + st->codec->codec_id = id; + sc->format = format; + break; + + default: + av_log(c->fc, AV_LOG_WARNING, + "ignoring 'frma' atom of '%.4s', stream format is '%.4s'\n", + (char*)&format, (char*)&sc->format); + break; + } + + return 0; +} + +static int mov_read_senc(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + AVStream *st; + MOVStreamContext *sc; + size_t auxiliary_info_size; + + if (c->decryption_key_len == 0 || c->fc->nb_streams < 1) + return 0; + + st = c->fc->streams[c->fc->nb_streams - 1]; + sc = st->priv_data; + + if (sc->cenc.aes_ctr) { + av_log(c->fc, AV_LOG_ERROR, "duplicate senc atom\n"); + return AVERROR_INVALIDDATA; + } + + avio_r8(pb); /* version */ + sc->cenc.use_subsamples = avio_rb24(pb) & 0x02; /* flags */ + + avio_rb32(pb); /* entries */ + + if (atom.size < 8) { + av_log(c->fc, AV_LOG_ERROR, "senc atom size %"PRId64" too small\n", atom.size); + return AVERROR_INVALIDDATA; + } + + /* save the auxiliary info as is */ + auxiliary_info_size = atom.size - 8; + + sc->cenc.auxiliary_info = av_malloc(auxiliary_info_size); + if (!sc->cenc.auxiliary_info) { + return AVERROR(ENOMEM); + } + + sc->cenc.auxiliary_info_end = sc->cenc.auxiliary_info + auxiliary_info_size; + + sc->cenc.auxiliary_info_pos = sc->cenc.auxiliary_info; + + if (avio_read(pb, sc->cenc.auxiliary_info, auxiliary_info_size) != auxiliary_info_size) { + av_log(c->fc, AV_LOG_ERROR, "failed to read the auxiliary info"); + return AVERROR_INVALIDDATA; + } + + /* initialize the cipher */ + sc->cenc.aes_ctr = av_aes_ctr_alloc(); + if (!sc->cenc.aes_ctr) { + return AVERROR(ENOMEM); + } + + return av_aes_ctr_init(sc->cenc.aes_ctr, c->decryption_key); +} + +static int cenc_filter(MOVContext *c, MOVStreamContext *sc, uint8_t *input, int size) +{ + uint32_t encrypted_bytes; + uint16_t subsample_count; + uint16_t clear_bytes; + uint8_t* input_end = input + size; + + /* read the iv */ + if (AES_CTR_IV_SIZE > sc->cenc.auxiliary_info_end - sc->cenc.auxiliary_info_pos) { + av_log(c->fc, AV_LOG_ERROR, "failed to read iv from the auxiliary info\n"); + return AVERROR_INVALIDDATA; + } + + av_aes_ctr_set_iv(sc->cenc.aes_ctr, sc->cenc.auxiliary_info_pos); + sc->cenc.auxiliary_info_pos += AES_CTR_IV_SIZE; + + if (!sc->cenc.use_subsamples) + { + /* decrypt the whole packet */ + av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, size); + return 0; + } + + /* read the subsample count */ + if (sizeof(uint16_t) > sc->cenc.auxiliary_info_end - sc->cenc.auxiliary_info_pos) { + av_log(c->fc, AV_LOG_ERROR, "failed to read subsample count from the auxiliary info\n"); + return AVERROR_INVALIDDATA; + } + + subsample_count = AV_RB16(sc->cenc.auxiliary_info_pos); + sc->cenc.auxiliary_info_pos += sizeof(uint16_t); + + for (; subsample_count > 0; subsample_count--) + { + if (6 > sc->cenc.auxiliary_info_end - sc->cenc.auxiliary_info_pos) { + av_log(c->fc, AV_LOG_ERROR, "failed to read subsample from the auxiliary info\n"); + return AVERROR_INVALIDDATA; + } + + /* read the number of clear / encrypted bytes */ + clear_bytes = AV_RB16(sc->cenc.auxiliary_info_pos); + sc->cenc.auxiliary_info_pos += sizeof(uint16_t); + encrypted_bytes = AV_RB32(sc->cenc.auxiliary_info_pos); + sc->cenc.auxiliary_info_pos += sizeof(uint32_t); + + if ((uint64_t)clear_bytes + encrypted_bytes > input_end - input) { + av_log(c->fc, AV_LOG_ERROR, "subsample size exceeds the packet size left\n"); + return AVERROR_INVALIDDATA; + } + + /* skip the clear bytes */ + input += clear_bytes; + + /* decrypt the encrypted bytes */ + av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, encrypted_bytes); + input += encrypted_bytes; + } + + if (input < input_end) { + av_log(c->fc, AV_LOG_ERROR, "leftover packet bytes after subsample processing\n"); + return AVERROR_INVALIDDATA; + } + + return 0; +} + static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('A','C','L','R'), mov_read_aclr }, { MKTAG('A','P','R','G'), mov_read_avid }, @@ -4030,6 +4190,9 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('C','i','n', 0x8e), mov_read_targa_y216 }, { MKTAG('f','r','e','e'), mov_read_free }, { MKTAG('-','-','-','-'), mov_read_custom }, +{ MKTAG('s','i','n','f'), mov_read_default }, +{ MKTAG('f','r','m','a'), mov_read_frma }, +{ MKTAG('s','e','n','c'), mov_read_senc }, { 0, NULL } }; @@ -4388,6 +4551,9 @@ static int mov_read_close(AVFormatContext *s) av_freep(&sc->elst_data); av_freep(&sc->rap_group); av_freep(&sc->display_matrix); + + av_freep(&sc->cenc.auxiliary_info); + av_aes_ctr_free(sc->cenc.aes_ctr); } if (mov->dv_demux) { @@ -4565,6 +4731,12 @@ static int mov_read_header(AVFormatContext *s) MOVAtom atom = { AV_RL32("root") }; int i; + if (mov->decryption_key_len != 0 && mov->decryption_key_len != AES_CTR_KEY_SIZE) { + av_log(s, AV_LOG_ERROR, "Invalid decryption key len %d expected %d\n", + mov->decryption_key_len, AES_CTR_KEY_SIZE); + return AVERROR(EINVAL); + } + mov->fc = s; mov->trak_index = -1; /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ @@ -4882,6 +5054,13 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) if (mov->aax_mode) aax_filter(pkt->data, pkt->size, mov); + if (sc->cenc.aes_ctr) { + ret = cenc_filter(mov, sc, pkt->data, pkt->size); + if (ret) { + return ret; + } + } + return 0; } @@ -5032,6 +5211,8 @@ static const AVOption mov_options[] = { "Fixed key used for handling Audible AAX files", OFFSET(audible_fixed_key), AV_OPT_TYPE_BINARY, {.str="77214d4b196a87cd520045fd20a51d67"}, .flags = AV_OPT_FLAG_DECODING_PARAM }, + { "decryption_key", "The media decryption key (hex)", OFFSET(decryption_key), AV_OPT_TYPE_BINARY, .flags = AV_OPT_FLAG_DECODING_PARAM }, + { NULL }, };

1 0

avfilter/avf_showspectrum: add window overlap support
by git＠videolan.org 31 Dec '15

31 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Dec 29 16:52:16 2015 +0100| [15e1fd9883b4a2898635212b4e167823755d1653] | committer: Paul B Mahol avfilter/avf_showspectrum: add window overlap support Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15e1fd9883b4a2898… --- doc/filters.texi | 5 ++++ libavfilter/avf_showspectrum.c | 58 +++++++++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 92931aa..8aa3b47 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14677,6 +14677,11 @@ Default value is @code{hann}. @item orientation Set orientation of time vs frequency axis. Can be @code{vertical} or @code{horizontal}. Default is @code{vertical}. + +@item overlap +Set ratio of overlap window. Default value is @code{0}. +When value is @code{1} overlap is set to recommended size for specific +window function currently used. @end table The usage is very similar to the showwaves filter; see the examples in that diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index d1ac560..5380994 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2012-2013 Clément Bœsch * Copyright (c) 2013 Rudolf Polzer <divverent(a)xonotic.org> + * Copyright (c) 2015 Paul B Mahol * * This file is part of FFmpeg. * @@ -28,9 +29,12 @@ #include <math.h> #include "libavcodec/avfft.h" +#include "libavutil/audio_fifo.h" #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" +#include "audio.h" +#include "video.h" #include "avfilter.h" #include "internal.h" #include "window_func.h" @@ -62,7 +66,10 @@ typedef struct { int win_func; double win_scale; float overlap; + int skip_samples; float *combine_buffer; ///< color combining buffer (3 * h items) + AVAudioFifo *fifo; + int64_t pts; } ShowSpectrumContext; #define OFFSET(x) offsetof(ShowSpectrumContext, x) @@ -111,6 +118,7 @@ static const AVOption showspectrum_options[] = { { "orientation", "set orientation", OFFSET(orientation), AV_OPT_TYPE_INT, {.i64=VERTICAL}, 0, NB_ORIENTATIONS-1, FLAGS, "orientation" }, { "vertical", NULL, 0, AV_OPT_TYPE_CONST, {.i64=VERTICAL}, 0, 0, FLAGS, "orientation" }, { "horizontal", NULL, 0, AV_OPT_TYPE_CONST, {.i64=HORIZONTAL}, 0, 0, FLAGS, "orientation" }, + { "overlap", "set window overlap", OFFSET(overlap), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0, 1, FLAGS }, { NULL } }; @@ -178,6 +186,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->rdft_data); av_freep(&s->window_func_lut); av_frame_free(&s->outpicref); + av_audio_fifo_free(s->fifo); } static int query_formats(AVFilterContext *ctx) @@ -217,6 +226,7 @@ static int config_output(AVFilterLink *outlink) AVFilterLink *inlink = ctx->inputs[0]; ShowSpectrumContext *s = ctx->priv; int i, rdft_bits, win_size, h, w; + float overlap; outlink->w = s->w; outlink->h = s->h; @@ -271,7 +281,14 @@ static int config_output(AVFilterLink *outlink) sizeof(*s->window_func_lut)); if (!s->window_func_lut) return AVERROR(ENOMEM); - ff_generate_window_func(s->window_func_lut, win_size, s->win_func, &s->overlap); + ff_generate_window_func(s->window_func_lut, win_size, s->win_func, &overlap); + if (s->overlap == 1) + s->overlap = overlap; + s->skip_samples = (1. - s->overlap) * win_size; + if (s->skip_samples < 1) { + av_log(ctx, AV_LOG_ERROR, "overlap %f too big\n", s->overlap); + return AVERROR(EINVAL); + } for (s->win_scale = 0, i = 0; i < win_size; i++) { s->win_scale += s->window_func_lut[i] * s->window_func_lut[i]; @@ -296,15 +313,12 @@ static int config_output(AVFilterLink *outlink) (s->orientation == HORIZONTAL && s->xpos >= outlink->h)) s->xpos = 0; - outlink->frame_rate = av_make_q(inlink->sample_rate, win_size); + outlink->frame_rate = av_make_q(inlink->sample_rate, win_size * (1.-s->overlap)); if (s->orientation == VERTICAL && s->sliding == FULLFRAME) outlink->frame_rate.den *= outlink->w; if (s->orientation == HORIZONTAL && s->sliding == FULLFRAME) outlink->frame_rate.den *= outlink->h; - inlink->min_samples = inlink->max_samples = inlink->partial_buf_size = - win_size; - if (s->orientation == VERTICAL) { s->combine_buffer = av_realloc_f(s->combine_buffer, outlink->h * 3, @@ -317,6 +331,11 @@ static int config_output(AVFilterLink *outlink) av_log(ctx, AV_LOG_VERBOSE, "s:%dx%d RDFT window size:%d\n", s->w, s->h, win_size); + + av_audio_fifo_free(s->fifo); + s->fifo = av_audio_fifo_alloc(inlink->format, inlink->channels, win_size); + if (!s->fifo) + return AVERROR(ENOMEM); return 0; } @@ -516,6 +535,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) } } + av_frame_make_writable(s->outpicref); /* copy to output */ if (s->orientation == VERTICAL) { if (s->sliding == SCROLL) { @@ -598,13 +618,33 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) AVFilterContext *ctx = inlink->dst; ShowSpectrumContext *s = ctx->priv; unsigned win_size = 1 << s->rdft_bits; + AVFrame *fin = NULL; int ret = 0; - av_assert0(insamples->nb_samples <= win_size); - if (insamples->nb_samples == win_size) - ret = plot_spectrum_column(inlink, insamples); - + av_audio_fifo_write(s->fifo, (void **)insamples->extended_data, insamples->nb_samples); av_frame_free(&insamples); + while (av_audio_fifo_size(s->fifo) >= win_size) { + fin = ff_get_audio_buffer(inlink, win_size); + if (!fin) { + ret = AVERROR(ENOMEM); + goto fail; + } + + fin->pts = s->pts; + s->pts += s->skip_samples; + ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, win_size); + if (ret < 0) + goto fail; + + ret = plot_spectrum_column(inlink, fin); + av_frame_free(&fin); + av_audio_fifo_drain(s->fifo, s->skip_samples); + if (ret < 0) + goto fail; + } + +fail: + av_frame_free(&fin); return ret; }

1 0

avfilter/avf_showspectrum: add fire color map
by git＠videolan.org 31 Dec '15

31 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Dec 31 11:15:10 2015 +0100| [b98c58573b0ecdbfe72059debbf26c53a7cfcfe5] | committer: Paul B Mahol avfilter/avf_showspectrum: add fire color map Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b98c58573b0ecdbfe… --- doc/filters.texi | 2 ++ libavfilter/avf_showspectrum.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 2e52c44..92931aa 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14621,6 +14621,8 @@ each channel is displayed using the rainbow color scheme each channel is displayed using the moreland color scheme @item nebulae each channel is displayed using the nebulae color scheme +@item fire +each channel is displayed using the fire color scheme @end table Default value is @samp{channel}. diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 227aff8..d1ac560 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -37,7 +37,7 @@ enum DisplayMode { COMBINED, SEPARATE, NB_MODES }; enum DisplayScale { LINEAR, SQRT, CBRT, LOG, NB_SCALES }; -enum ColorMode { CHANNEL, INTENSITY, RAINBOW, MORELAND, NEBULAE, NB_CLMODES }; +enum ColorMode { CHANNEL, INTENSITY, RAINBOW, MORELAND, NEBULAE, FIRE, NB_CLMODES }; enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES }; enum Orientation { VERTICAL, HORIZONTAL, NB_ORIENTATIONS }; @@ -85,6 +85,7 @@ static const AVOption showspectrum_options[] = { { "rainbow", "rainbow based coloring", 0, AV_OPT_TYPE_CONST, {.i64=RAINBOW}, 0, 0, FLAGS, "color" }, { "moreland", "moreland based coloring", 0, AV_OPT_TYPE_CONST, {.i64=MORELAND}, 0, 0, FLAGS, "color" }, { "nebulae", "nebulae based coloring", 0, AV_OPT_TYPE_CONST, {.i64=NEBULAE}, 0, 0, FLAGS, "color" }, + { "fire", "fire based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FIRE}, 0, 0, FLAGS, "color" }, { "scale", "set display scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64=SQRT}, LINEAR, NB_SCALES-1, FLAGS, "scale" }, { "sqrt", "square root", 0, AV_OPT_TYPE_CONST, {.i64=SQRT}, 0, 0, FLAGS, "scale" }, { "cbrt", "cubic root", 0, AV_OPT_TYPE_CONST, {.i64=CBRT}, 0, 0, FLAGS, "scale" }, @@ -154,6 +155,15 @@ static const struct ColorTable { { 0.77, 120/256., (105-128)/256., (188-128)/256. }, { 0.87, 140/256., (105-128)/256., (188-128)/256. }, { 1, 1, 0, 0 }}, + [FIRE] = { + { 0, 0, 0, 0 }, + { 0.23, 44/256., (132-128)/256., (127-128)/256. }, + { 0.45, 62/256., (116-128)/256., (140-128)/256. }, + { 0.57, 75/256., (105-128)/256., (152-128)/256. }, + { 0.67, 95/256., (91-128)/256., (166-128)/256. }, + { 0.77, 126/256., (74-128)/256., (172-128)/256. }, + { 0.87, 164/256., (73-128)/256., (162-128)/256. }, + { 1, 1, 0, 0 }}, }; static av_cold void uninit(AVFilterContext *ctx) @@ -403,6 +413,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) case RAINBOW: case MORELAND: case NEBULAE: + case FIRE: case INTENSITY: uf = yf; vf = yf;

1 0

avfilter/trim: support all channel numbers in atrim filter
by git＠videolan.org 31 Dec '15

31 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Dec 30 09:16:54 2015 +0100| [416090089909d19f2f6b80a15d6588242b7b8aa4] | committer: Paul B Mahol avfilter/trim: support all channel numbers in atrim filter Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=416090089909d19f2… --- libavfilter/trim.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/trim.c b/libavfilter/trim.c index b2d9c6f..9141ac5 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -381,6 +381,7 @@ AVFilter ff_af_atrim = { .name = "atrim", .description = NULL_IF_CONFIG_SMALL("Pick one continuous section from the input, drop the rest."), .init = init, + .query_formats = ff_query_formats_all, .priv_size = sizeof(TrimContext), .priv_class = &atrim_class, .inputs = atrim_inputs,

1 0

lavc/dsd_tablegen: always generate tables at runtime
by git＠videolan.org 31 Dec '15

31 Dec '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Tue Dec 29 08:50:43 2015 -0800| [b492fbcc6e87094804fdf71308dc500976c6b165] | committer: Ganesh Ajjanagadde lavc/dsd_tablegen: always generate tables at runtime Commit b272c3a5aa has sped up dsd_tablegen, and now table generation takes ~ 40k cycles. Thus, these tables can always be generated at runtime. Tested with/without --enable-hardcoded-tables. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b492fbcc6e8709480… --- libavcodec/Makefile | 4 +--- libavcodec/dsd_tablegen.c | 38 -------------------------------------- libavcodec/dsd_tablegen.h | 5 ----- 3 files changed, 1 insertion(+), 46 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1c7568b..0717d0a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -975,7 +975,6 @@ HOSTPROGS = aacps_tablegen \ cbrt_tablegen \ cbrt_fixed_tablegen \ cos_tablegen \ - dsd_tablegen \ dv_tablegen \ motionpixels_tablegen \ mpegaudio_tablegen \ @@ -1002,7 +1001,7 @@ $(SUBDIR)%_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DCONFIG_SMALL=0 endif GEN_HEADERS = cbrt_tables.h cbrt_fixed_tables.h aacps_tables.h aacps_fixed_tables.h \ - dsd_tables.h dv_tables.h \ + dv_tables.h \ sinewin_tables.h sinewin_fixed_tables.h mpegaudio_tables.h motionpixels_tables.h \ pcm_tables.h qdm2_tables.h GEN_HEADERS := $(addprefix $(SUBDIR), $(GEN_HEADERS)) @@ -1016,7 +1015,6 @@ $(SUBDIR)aacdec_fixed.o: $(SUBDIR)cbrt_fixed_tables.h $(SUBDIR)aacps_float.o: $(SUBDIR)aacps_tables.h $(SUBDIR)aacps_fixed.o: $(SUBDIR)aacps_fixed_tables.h $(SUBDIR)aactab_fixed.o: $(SUBDIR)aac_fixed_tables.h -$(SUBDIR)dsddec.o: $(SUBDIR)dsd_tables.h $(SUBDIR)dvenc.o: $(SUBDIR)dv_tables.h $(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h $(SUBDIR)sinewin_fixed.o: $(SUBDIR)sinewin_fixed_tables.h diff --git a/libavcodec/dsd_tablegen.c b/libavcodec/dsd_tablegen.c deleted file mode 100644 index dbeb9fe..0000000 --- a/libavcodec/dsd_tablegen.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Generate a header file for hardcoded DSD tables - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdlib.h> -#define CONFIG_HARDCODED_TABLES 0 -#include "dsd_tablegen.h" -#include "tableprint.h" -#include <inttypes.h> - -int main(void) -{ - dsd_ctables_tableinit(); - - write_fileheader(); - - printf("static const double ctables[CTABLES][256] = {\n"); - write_float_2d_array(ctables, CTABLES, 256); - printf("};\n"); - - return 0; -} diff --git a/libavcodec/dsd_tablegen.h b/libavcodec/dsd_tablegen.h index d4ef302..990d57a 100644 --- a/libavcodec/dsd_tablegen.h +++ b/libavcodec/dsd_tablegen.h @@ -29,10 +29,6 @@ #define HTAPS 48 /** number of FIR constants */ #define CTABLES ((HTAPS + 7) / 8) /** number of "8 MACs" lookup tables */ -#if CONFIG_HARDCODED_TABLES -#define dsd_ctables_tableinit() -#include "libavcodec/dsd_tables.h" -#else #include "libavutil/common.h" /* @@ -91,6 +87,5 @@ static av_cold void dsd_ctables_tableinit(void) ctables[CTABLES - 1 - t][e] = acc[t]; } } -#endif /* CONFIG_HARDCODED_TABLES */ #endif /* AVCODEC_DSD_TABLEGEN_H */

1 0

avfilter/vf_scale: set proper out frame color range
by git＠videolan.org 31 Dec '15

31 Dec '15

ffmpeg | branch: master | Thomas Mundt <loudmax(a)yahoo.de> | Thu Dec 31 00:01:21 2015 +0100| [73ce8162f3499cf0e86d1d80dea53324bd62bcb3] | committer: Michael Niedermayer avfilter/vf_scale: set proper out frame color range Prevents that following scalers in the filter chain will do unintentional color range conversions. Fixes Ticket #5096 Signed-off-by: Thomas Mundt <loudmax(a)yahoo.de> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73ce8162f3499cf0e… --- libavfilter/vf_scale.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index ce410e9..7eabe00 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -567,6 +567,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) sws_setColorspaceDetails(scale->isws[1], inv_table, in_full, table, out_full, brightness, contrast, saturation); + + av_frame_set_color_range(out, out_full ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG); } av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den,

1 0

dirac_dwt: remove unnecessary undefs
by git＠videolan.org 31 Dec '15

31 Dec '15

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Thu Dec 31 00:35:06 2015 +0000| [8de5b0d96664abfb45212a5f0962ac9b1d452a55] | committer: Rostislav Pehlivanov dirac_dwt: remove unnecessary undefs They're all undefined within the template file. Signed-off-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8de5b0d96664abfb4… --- libavcodec/dirac_dwt.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c index ae847f7..6cf32ae 100644 --- a/libavcodec/dirac_dwt.c +++ b/libavcodec/dirac_dwt.c @@ -27,15 +27,12 @@ #define TEMPLATE_8bit #include "dirac_dwt_template.c" -#undef TEMPLATE_8bit #define TEMPLATE_10bit #include "dirac_dwt_template.c" -#undef TEMPLATE_10bit #define TEMPLATE_12bit #include "dirac_dwt_template.c" -#undef TEMPLATE_12bit int ff_spatial_idwt_init2(DWTContext *d, uint8_t *buffer, int width, int height, int stride, enum dwt_type type, int decomposition_count,

1 0

configure: support --cpu=host and Clang
by git＠videolan.org 30 Dec '15

30 Dec '15

ffmpeg | branch: master | yukari yakumo <yukariin(a)yandex.ru> | Mon Dec 14 18:11:00 2015 +0300| [f87e29a61587558e441dea3511db76611de9d92e] | committer: Michael Niedermayer configure: support --cpu=host and Clang Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f87e29a61587558e4… --- configure | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/configure b/configure index 7fee737..da74ccd 100755 --- a/configure +++ b/configure @@ -3981,6 +3981,17 @@ if test "$cpu" = host; then } cpu=$(check_native -march || check_native -mcpu) ;; + clang) + check_native(){ + $cc $1=native -v -c -o $TMPO $TMPC >$TMPE 2>&1 || return + sed -n "/cc1.*-target-cpu /{ + s/.*-target-cpu \$[^ ]*\$.*/\\1/ + p + q + }" $TMPE + } + cpu=$(check_native -march) + ;; esac test "${cpu:-host}" = host &&

1 0