November 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

Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'
by git＠videolan.org 23 Dec '15

23 Dec '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Wed Oct 14 13:48:22 2015 +0200| [64ceeac26a441ede6eaf4bb99a5c3224b1803745] | committer: Hendrik Leppkes Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c' * commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c': nullenc: Use the wrapped avframe pseudo-encoder Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64ceeac26a441ede6… ---

2 2

qsvenc: write a53 caption data to SEI
by git＠videolan.org 30 Nov '15

30 Nov '15

ffmpeg | branch: master | Will Kelleher <wkelleher(a)gogoair.com> | Tue Oct 27 12:08:45 2015 -0500| [0eac93da0fd5baa400ee0a4a6dd8334202e8ada9] | committer: Michael Niedermayer qsvenc: write a53 caption data to SEI Signed-off-by: Will Kelleher <wkelleher(a)gogoair.com> Previous version reviewed-by: Ivan Uskov <ivan.uskov(a)nablet.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0eac93da0fd5baa40… --- libavcodec/qsv_internal.h | 3 +++ libavcodec/qsvenc.c | 39 ++++++++++++++++++++++++--- libavcodec/qsvenc.h | 4 +++ libavcodec/qsvenc_h264.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+), 4 deletions(-) diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index b9ad199..c235e07 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -45,6 +45,8 @@ #define ASYNC_DEPTH_DEFAULT 4 // internal parallelism +#define QSV_MAX_ENC_PAYLOAD 2 // # of mfxEncodeCtrl payloads supported + #define QSV_VERSION_ATLEAST(MAJOR, MINOR) \ (MFX_VERSION_MAJOR > (MAJOR) || \ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR)) @@ -52,6 +54,7 @@ typedef struct QSVFrame { AVFrame *frame; mfxFrameSurface1 *surface; + mfxEncodeCtrl enc_ctrl; mfxFrameSurface1 surface_internal; diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 25a57f4..d00fdff 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -30,6 +30,7 @@ #include "libavutil/log.h" #include "libavutil/time.h" #include "libavutil/imgutils.h" +#include "libavcodec/bytestream.h" #include "avcodec.h" #include "internal.h" @@ -753,12 +754,26 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) return 0; } +static void free_encoder_ctrl_payloads(mfxEncodeCtrl* enc_ctrl) +{ + if (enc_ctrl) { + int i; + for (i = 0; i < enc_ctrl->NumPayload && i < QSV_MAX_ENC_PAYLOAD; i++) { + mfxPayload* pay = enc_ctrl->Payload[i]; + av_free(enc_ctrl->Payload[i]->Data); + av_free(pay); + } + enc_ctrl->NumPayload = 0; + } +} + static void clear_unused_frames(QSVEncContext *q) { QSVFrame *cur = q->work_frames; while (cur) { if (cur->surface && !cur->surface->Data.Locked) { cur->surface = NULL; + free_encoder_ctrl_payloads(&cur->enc_ctrl); av_frame_unref(cur->frame); } cur = cur->next; @@ -791,6 +806,11 @@ static int get_free_frame(QSVEncContext *q, QSVFrame **f) av_freep(&frame); return AVERROR(ENOMEM); } + frame->enc_ctrl.Payload = av_mallocz(sizeof(mfxPayload*) * QSV_MAX_ENC_PAYLOAD); + if (!frame->enc_ctrl.Payload) { + av_freep(&frame); + return AVERROR(ENOMEM); + } *last = frame; *f = frame; @@ -799,7 +819,7 @@ static int get_free_frame(QSVEncContext *q, QSVFrame **f) } static int submit_frame(QSVEncContext *q, const AVFrame *frame, - mfxFrameSurface1 **surface) + QSVFrame **new_frame) { QSVFrame *qf; int ret; @@ -860,7 +880,7 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame, qf->surface->Data.TimeStamp = av_rescale_q(frame->pts, q->avctx->time_base, (AVRational){1, 90000}); - *surface = qf->surface; + *new_frame = qf; return 0; } @@ -885,15 +905,21 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, mfxFrameSurface1 *surf = NULL; mfxSyncPoint sync = NULL; + QSVFrame *qsv_frame = NULL; + mfxEncodeCtrl* enc_ctrl = NULL; int ret; if (frame) { - ret = submit_frame(q, frame, &surf); + ret = submit_frame(q, frame, &qsv_frame); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error submitting the frame for encoding.\n"); return ret; } } + if (qsv_frame) { + surf = qsv_frame->surface; + enc_ctrl = &qsv_frame->enc_ctrl; + } ret = av_new_packet(&new_pkt, q->packet_size); if (ret < 0) { @@ -909,8 +935,12 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, bs->Data = new_pkt.data; bs->MaxLength = new_pkt.size; + if (q->set_encode_ctrl_cb) { + q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); + } + do { - ret = MFXVideoENCODE_EncodeFrameAsync(q->session, NULL, surf, bs, &sync); + ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, bs, &sync); if (ret == MFX_WRN_DEVICE_BUSY) { av_usleep(500); continue; @@ -1010,6 +1040,7 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) while (cur) { q->work_frames = cur->next; av_frame_free(&cur->frame); + av_free(cur->enc_ctrl.Payload); av_freep(&cur); cur = q->work_frames; } diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 2fe46b0..8627570 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -69,6 +69,8 @@ { "adaptive_i", "Adaptive I-frame placement", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "adaptive_b", "Adaptive B-frame placement", OFFSET(qsv.adaptive_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ +typedef int SetEncodeCtrlCB (AVCodecContext *avctx, + const AVFrame *frame, mfxEncodeCtrl* enc_ctrl); typedef struct QSVEncContext { AVCodecContext *avctx; @@ -131,7 +133,9 @@ typedef struct QSVEncContext { int int_ref_qp_delta; int recovery_point_sei; + int a53_cc; char *load_plugins; + SetEncodeCtrlCB *set_encode_ctrl_cb; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q); diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 043f4d3..4600831 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -40,10 +40,75 @@ typedef struct QSVH264EncContext { QSVEncContext qsv; } QSVH264EncContext; +static int qsv_h264_set_encode_ctrl(AVCodecContext *avctx, + const AVFrame *frame, mfxEncodeCtrl* enc_ctrl) +{ + AVFrameSideData *side_data = NULL; + QSVH264EncContext *qh264 = avctx->priv_data; + QSVEncContext *q = &qh264->qsv; + + if (q->a53_cc && frame) { + side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_A53_CC); + if (side_data) { + + int sei_payload_size = 0; + mfxU8* sei_data = NULL; + mfxPayload* payload = NULL; + + sei_payload_size = side_data->size + 13; + + sei_data = av_mallocz(sei_payload_size); + if (!sei_data) { + av_log(avctx, AV_LOG_ERROR, "No memory for CC, skipping...\n"); + return AVERROR(ENOMEM); + } + + // SEI header + sei_data[0] = 4; + sei_data[1] = sei_payload_size - 2; // size of SEI data + + // country code + sei_data[2] = 181; + sei_data[3] = 0; + sei_data[4] = 49; + + // ATSC_identifier - using 'GA94' only + AV_WL32(sei_data + 5, + MKTAG('G', 'A', '9', '4')); + sei_data[9] = 3; + sei_data[10] = + ((side_data->size/3) & 0x1f) | 0xC0; + + sei_data[11] = 0xFF; // reserved + + memcpy(sei_data + 12, side_data->data, side_data->size); + + sei_data[side_data->size+12] = 255; + + payload = av_mallocz(sizeof(mfxPayload)); + if (!payload) { + av_log(avctx, AV_LOG_ERROR, "No memory, skipping captions\n"); + av_freep(&sei_data); + return AVERROR(ENOMEM); + } + payload->BufSize = side_data->size + 13; + payload->NumBit = payload->BufSize * 8; + payload->Type = 4; + payload->Data = sei_data; + + enc_ctrl->NumExtParam = 0; + enc_ctrl->NumPayload = 1; + enc_ctrl->Payload[0] = payload; + } + } + return 0; +} + static av_cold int qsv_enc_init(AVCodecContext *avctx) { QSVH264EncContext *q = avctx->priv_data; + q->qsv.set_encode_ctrl_cb = qsv_h264_set_encode_ctrl; return ff_qsv_enc_init(avctx, &q->qsv); } @@ -103,6 +168,7 @@ static const AVOption options[] = { { "main" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_AVC_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, { "high" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_AVC_HIGH }, INT_MIN, INT_MAX, VE, "profile" }, + { "a53cc" , "Use A53 Closed Captions (if available)", OFFSET(qsv.a53_cc), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, VE}, { NULL }, };

1 0

ffserver: Clear avio context after closing it in rtp_new_av_stream()
by git＠videolan.org 30 Nov '15

30 Nov '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Nov 30 22:53:47 2015 +0100| [a00cc2e40d40c06e867ab4a07afbbbb3df565b02] | committer: Michael Niedermayer ffserver: Clear avio context after closing it in rtp_new_av_stream() Suggested-by: "Reynaldo H. Verdejo Pinochet" <reynaldo(a)osg.samsung.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a00cc2e40d40c06e8… --- ffserver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ffserver.c b/ffserver.c index d3fcb82..029771c 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3413,6 +3413,7 @@ static int rtp_new_av_stream(HTTPContext *c, return -1; } avio_close_dyn_buf(ctx->pb, &dummy_buf); + ctx->pb = NULL; av_free(dummy_buf); c->rtp_ctx[stream_index] = ctx;

1 0

ffserver: Clear avio context after closing it
by git＠videolan.org 30 Nov '15

30 Nov '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Nov 1 18:34:44 2015 +0100| [40063a900b6d5e39d3fab8ec9890cf8af02f8268] | committer: Michael Niedermayer ffserver: Clear avio context after closing it Fixes: ==13287== Invalid read of size 4 ==13287== at 0x45161A: flush_buffer (aviobuf.c:143) ==13287== by 0x451971: avio_flush (aviobuf.c:200) ==13287== by 0x512CCF: av_write_trailer (mux.c:1016) ==13287== by 0x41A5E0: close_connection (ffserver.c:853) ==13287== by 0x421EDC: rtsp_cmd_interrupt (ffserver.c:3245) ==13287== by 0x420B9C: rtsp_parse_request (ffserver.c:2854) ==13287== by 0x41A9C2: handle_connection (ffserver.c:930) ==13287== by 0x41A04B: http_server (ffserver.c:700) ==13287== by 0x423A60: main (ffserver.c:3897) ==13287== Address 0xb6cd258 is 88 bytes inside a block of size 192 free'd ==13287== at 0x4C2B5D9: free (vg_replace_malloc.c:446) ==13287== by 0x1004DAC: av_free (mem.c:239) ==13287== by 0x454835: avio_close_dyn_buf (aviobuf.c:1170) ==13287== by 0x41F385: http_prepare_data (ffserver.c:2368) ==13287== by 0x41F59B: http_send_data (ffserver.c:2416) ==13287== by 0x41ABE2: handle_connection (ffserver.c:986) ==13287== by 0x41A04B: http_server (ffserver.c:700) ==13287== by 0x423A60: main (ffserver.c:3897) Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo(a)osg.samsung.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40063a900b6d5e39d… --- ffserver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ffserver.c b/ffserver.c index 65ae431..d3fcb82 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2370,6 +2370,7 @@ static int http_prepare_data(HTTPContext *c) av_freep(&c->pb_buffer); len = avio_close_dyn_buf(ctx->pb, &c->pb_buffer); + ctx->pb = NULL; c->cur_frame_bytes = len; c->buffer_ptr = c->pb_buffer; c->buffer_end = c->pb_buffer + len;

1 0

avfilter/af_sidechaincompress: add level_in and level_sc options
by git＠videolan.org 30 Nov '15

30 Nov '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Nov 30 12:16:57 2015 +0100| [376a3bdb7bbe16a6f0835010c9e85f6837f000a7] | committer: Paul B Mahol avfilter/af_sidechaincompress: add level_in and level_sc options Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=376a3bdb7bbe16a6f… --- doc/filters.texi | 9 ++++++++ libavfilter/af_sidechaincompress.c | 41 +++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 0395c7a..fc71a99 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -350,6 +350,9 @@ hard edge at the threshold in the range of the chosen decibels. The filter accepts the following options: @table @option +@item level_in +Set input gain. Default is 1. Range is between 0.015625 and 64. + @item threshold If a signal of second stream rises above this level it will affect the gain reduction of the first stream. @@ -2479,6 +2482,9 @@ processing. See @ref{pan} and @ref{amerge} filter. The filter accepts the following options: @table @option +@item level_in +Set input gain. Default is 1. Range is between 0.015625 and 64. + @item threshold If a signal of second stream raises above this level it will affect the gain reduction of first stream. @@ -2514,6 +2520,9 @@ reduction. Default is @code{average}. Should the exact signal be taken in case of @code{peak} or an RMS one in case of @code{rms}. Default is @code{rms} which is mainly smoother. +@item level_sc +Set sidechain gain. Default is 1. Range is between 0.015625 and 64. + @item mix How much to use compressed signal in output. Default is 1. Range is between 0 and 1. diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index 3af49ad..3862bf8 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -38,6 +38,8 @@ typedef struct SidechainCompressContext { const AVClass *class; + double level_in; + double level_sc; double attack, attack_coeff; double release, release_coeff; double lin_slope; @@ -63,19 +65,21 @@ typedef struct SidechainCompressContext { #define F AV_OPT_FLAG_FILTERING_PARAM static const AVOption options[] = { - { "threshold", "set threshold", OFFSET(threshold), AV_OPT_TYPE_DOUBLE, {.dbl=0.125}, 0.000976563, 1, A|F }, - { "ratio", "set ratio", OFFSET(ratio), AV_OPT_TYPE_DOUBLE, {.dbl=2}, 1, 20, A|F }, - { "attack", "set attack", OFFSET(attack), AV_OPT_TYPE_DOUBLE, {.dbl=20}, 0.01, 2000, A|F }, - { "release", "set release", OFFSET(release), AV_OPT_TYPE_DOUBLE, {.dbl=250}, 0.01, 9000, A|F }, - { "makeup", "set make up gain", OFFSET(makeup), AV_OPT_TYPE_DOUBLE, {.dbl=2}, 1, 64, A|F }, - { "knee", "set knee", OFFSET(knee), AV_OPT_TYPE_DOUBLE, {.dbl=2.82843}, 1, 8, A|F }, - { "link", "set link type", OFFSET(link), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, A|F, "link" }, - { "average", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, A|F, "link" }, - { "maximum", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, A|F, "link" }, - { "detection", "set detection", OFFSET(detection), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, A|F, "detection" }, - { "peak", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, A|F, "detection" }, - { "rms", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, A|F, "detection" }, - { "mix", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, A|F }, + { "level_in", "set input gain", OFFSET(level_in), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.015625, 64, A|F }, + { "threshold", "set threshold", OFFSET(threshold), AV_OPT_TYPE_DOUBLE, {.dbl=0.125}, 0.000976563, 1, A|F }, + { "ratio", "set ratio", OFFSET(ratio), AV_OPT_TYPE_DOUBLE, {.dbl=2}, 1, 20, A|F }, + { "attack", "set attack", OFFSET(attack), AV_OPT_TYPE_DOUBLE, {.dbl=20}, 0.01, 2000, A|F }, + { "release", "set release", OFFSET(release), AV_OPT_TYPE_DOUBLE, {.dbl=250}, 0.01, 9000, A|F }, + { "makeup", "set make up gain", OFFSET(makeup), AV_OPT_TYPE_DOUBLE, {.dbl=2}, 1, 64, A|F }, + { "knee", "set knee", OFFSET(knee), AV_OPT_TYPE_DOUBLE, {.dbl=2.82843}, 1, 8, A|F }, + { "link", "set link type", OFFSET(link), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, A|F, "link" }, + { "average", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, A|F, "link" }, + { "maximum", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, A|F, "link" }, + { "detection", "set detection", OFFSET(detection), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, A|F, "detection" }, + { "peak", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, A|F, "detection" }, + { "rms", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, A|F, "detection" }, + { "level_sc", "set sidechain gain", OFFSET(level_sc), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.015625, 64, A|F }, + { "mix", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, A|F }, { NULL } }; @@ -142,6 +146,7 @@ static int compressor_config_output(AVFilterLink *outlink) static void compressor(SidechainCompressContext *s, double *sample, const double *scsrc, int nb_samples, + double level_in, double level_sc, AVFilterLink *inlink, AVFilterLink *sclink) { const double makeup = s->makeup; @@ -151,14 +156,14 @@ static void compressor(SidechainCompressContext *s, for (i = 0; i < nb_samples; i++) { double abs_sample, gain = 1.0; - abs_sample = fabs(scsrc[0]); + abs_sample = fabs(scsrc[0] * level_sc); if (s->link == 1) { for (c = 1; c < sclink->channels; c++) - abs_sample = FFMAX(fabs(scsrc[c]), abs_sample); + abs_sample = FFMAX(fabs(scsrc[c] * level_sc), abs_sample); } else { for (c = 1; c < sclink->channels; c++) - abs_sample += fabs(scsrc[c]); + abs_sample += fabs(scsrc[c] * level_sc); abs_sample /= sclink->channels; } @@ -174,7 +179,7 @@ static void compressor(SidechainCompressContext *s, s->compressed_knee_stop, s->detection); for (c = 0; c < inlink->channels; c++) - sample[c] *= (gain * makeup * mix + (1. - mix)); + sample[c] *= level_in * (gain * makeup * mix + (1. - mix)); sample += inlink->channels; scsrc += sclink->channels; @@ -208,6 +213,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) scsrc = (const double *)s->input_frame[1]->data[0]; compressor(s, sample, scsrc, nb_samples, + s->level_in, s->level_sc, ctx->inputs[0], ctx->inputs[1]); ret = ff_filter_frame(outlink, s->input_frame[0]); @@ -343,6 +349,7 @@ static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *frame) sample = (double *)frame->data[0]; compressor(s, sample, sample, frame->nb_samples, + s->level_in, s->level_in, inlink, inlink); return ff_filter_frame(outlink, frame);

1 0

avfilter/af_sidechaincompress: do not require writable input frames for acompressor filter
by git＠videolan.org 30 Nov '15

30 Nov '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Nov 30 12:25:32 2015 +0100| [6b978dadc654906130de46a8b83b6f67f90d3e17] | committer: Paul B Mahol avfilter/af_sidechaincompress: do not require writable input frames for acompressor filter Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b978dadc65490613… --- libavfilter/af_sidechaincompress.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index 3862bf8..717ddcf 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -145,7 +145,7 @@ static int compressor_config_output(AVFilterLink *outlink) } static void compressor(SidechainCompressContext *s, - double *sample, const double *scsrc, int nb_samples, + const double *src, double *dst, const double *scsrc, int nb_samples, double level_in, double level_sc, AVFilterLink *inlink, AVFilterLink *sclink) { @@ -179,9 +179,10 @@ static void compressor(SidechainCompressContext *s, s->compressed_knee_stop, s->detection); for (c = 0; c < inlink->channels; c++) - sample[c] *= level_in * (gain * makeup * mix + (1. - mix)); + dst[c] = src[c] * level_in * (gain * makeup * mix + (1. - mix)); - sample += inlink->channels; + src += inlink->channels; + dst += inlink->channels; scsrc += sclink->channels; } } @@ -212,7 +213,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) sample = (double *)s->input_frame[0]->data[0]; scsrc = (const double *)s->input_frame[1]->data[0]; - compressor(s, sample, scsrc, nb_samples, + compressor(s, sample, sample, scsrc, nb_samples, s->level_in, s->level_sc, ctx->inputs[0], ctx->inputs[1]); ret = ff_filter_frame(outlink, s->input_frame[0]); @@ -340,19 +341,34 @@ AVFilter ff_af_sidechaincompress = { #endif /* CONFIG_SIDECHAINCOMPRESS_FILTER */ #if CONFIG_ACOMPRESSOR_FILTER -static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *frame) +static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *in) { + const double *src = (const double *)in->data[0]; AVFilterContext *ctx = inlink->dst; SidechainCompressContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; - double *sample; + AVFrame *out; + double *dst; + + if (av_frame_is_writable(in)) { + out = in; + } else { + out = ff_get_audio_buffer(inlink, in->nb_samples); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + av_frame_copy_props(out, in); + } + dst = (double *)out->data[0]; - sample = (double *)frame->data[0]; - compressor(s, sample, sample, frame->nb_samples, + compressor(s, src, dst, src, in->nb_samples, s->level_in, s->level_in, inlink, inlink); - return ff_filter_frame(outlink, frame); + if (out != in) + av_frame_free(&in); + return ff_filter_frame(outlink, out); } static int acompressor_query_formats(AVFilterContext *ctx) @@ -393,7 +409,6 @@ static const AVFilterPad acompressor_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, .filter_frame = acompressor_filter_frame, - .needs_writable = 1, }, { NULL } };

1 0

avcodec/vp3: always set pix_fmt in theora_decode_header()
by git＠videolan.org 30 Nov '15

30 Nov '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Nov 30 03:32:36 2015 +0100| [a814f1d364ba912adf61adef158168c5f7604e93] | committer: Michael Niedermayer avcodec/vp3: always set pix_fmt in theora_decode_header() Fixes assertion failure Fixes: d0bb0662da342ec65f8f2a081222e6b9/signal_sigabrt_7ffff6ae7cc9_5471_82964f0a9ac2f4d3d59390c15473f6f7.ogg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a814f1d364ba912ad… --- libavcodec/vp3.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 1d4c575..46c83aa 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2328,7 +2328,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) return AVERROR_INVALIDDATA; } skip_bits(gb, 3); /* reserved */ - } + } else + avctx->pix_fmt = AV_PIX_FMT_YUV420P; ret = ff_set_dimensions(avctx, s->width, s->height); if (ret < 0)

1 0

avcodec/mpeg4videodec: Check available data before reading custom matrix
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Nov 29 23:44:40 2015 +0100| [891dc8f87536ac2ec695c70d081345224524ad99] | committer: Michael Niedermayer avcodec/mpeg4videodec: Check available data before reading custom matrix Fixes: out of array read Fixes: 76c515fc3779d1b838667c61ea13ce92/asan_heap-oob_1fc0d07_8913_794a4629a264ebdb25b58d3a94ed1785.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=891dc8f87536ac2ec… --- libavcodec/mpeg4videodec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 5c388c4..87b6163 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1881,6 +1881,10 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) int last = 0; for (i = 0; i < 64; i++) { int j; + if (get_bits_left(gb) < 8) { + av_log(s->avctx, AV_LOG_ERROR, "insufficient data for custom matrix\n"); + return AVERROR_INVALIDDATA; + } v = get_bits(gb, 8); if (v == 0) break; @@ -1904,6 +1908,10 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) int last = 0; for (i = 0; i < 64; i++) { int j; + if (get_bits_left(gb) < 8) { + av_log(s->avctx, AV_LOG_ERROR, "insufficient data for custom matrix\n"); + return AVERROR_INVALIDDATA; + } v = get_bits(gb, 8); if (v == 0) break;

1 0

avcodec/dnxhddec: Disable 12bit by default
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Nov 28 12:41:19 2015 +0100| [55711e6fd0528f2cb17f1ce64c8da3f92bba14a4] | committer: Michael Niedermayer avcodec/dnxhddec: Disable 12bit by default The DC VLC table used is too small, fixing this requires a sample, thus request a sample. Some samples are said to work even though the table has the wrong size, thus this is left enabled if the user enables experimental features. Fixes: 2abd25478c62a675f335fac00b467023/asan_static-oob_10aff98_1227_8811480c6ef1e970a7977ceb7e5a9958.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Approved-by: kurosu Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55711e6fd0528f2cb… --- libavcodec/dnxhddec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index f0fdbb9..20ca262 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -118,6 +118,11 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid, int bitdepth) av_log(ctx->avctx, AV_LOG_ERROR, "bit depth mismatches %d %d\n", ff_dnxhd_cid_table[index].bit_depth, bitdepth); return AVERROR_INVALIDDATA; } + if (bitdepth > 10) { + avpriv_request_sample(ctx->avctx, "DNXHR 12-bit"); + if (ctx->avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) + return AVERROR_PATCHWELCOME; + } ctx->cid_table = &ff_dnxhd_cid_table[index]; av_log(ctx->avctx, AV_LOG_VERBOSE, "Profile cid %d.\n", cid);

1 0