May 2016 - ffmpeg-cvslog - lists.ffmpeg.org

avocdec: add MagicYUV decoder
by git＠videolan.org 31 May '16

31 May '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun May 22 15:18:30 2016 +0200| [77f9c4b7aa9eb793b3019025e177245896821816] | committer: Paul B Mahol avocdec: add MagicYUV decoder Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77f9c4b7aa9eb793b… --- Changelog | 1 + configure | 1 + doc/general.texi | 1 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 + libavcodec/magicyuv.c | 465 +++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- libavformat/riff.c | 1 + 10 files changed, 480 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 697b430..d5228b2 100644 --- a/Changelog +++ b/Changelog @@ -37,6 +37,7 @@ version <next>: - Direct Stream Transfer (DST) decoder - loudnorm filter - MTAF demuxer and decoder +- MagicYUV decoder version 3.0: - Common Encryption (CENC) MP4 encoding and decoding support diff --git a/configure b/configure index cc2c9e7..cd67f05 100755 --- a/configure +++ b/configure @@ -2387,6 +2387,7 @@ jv_decoder_select="blockdsp" lagarith_decoder_select="huffyuvdsp" ljpeg_encoder_select="aandcttables idctdsp jpegtables" loco_decoder_select="golomb" +magicyuv_decoder_select="huffyuvdsp" mdec_decoder_select="blockdsp idctdsp mpegvideo" metasound_decoder_select="lsp mdct sinewin" mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" diff --git a/doc/general.texi b/doc/general.texi index 2d3dd0b..b0cf738 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -744,6 +744,7 @@ following image formats are supported: @item LucasArts SANM/Smush @tab @tab X @tab Used in LucasArts games / SMUSH animations. @item lossless MJPEG @tab X @tab X +@item MagicYUV Lossless Video @tab @tab X @item Microsoft ATC Screen @tab @tab X @tab Also known as Microsoft Screen 3. @item Microsoft Expression Encoder Screen @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0645f21..6e26aad 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -348,6 +348,7 @@ OBJS-$(CONFIG_LOCO_DECODER) += loco.o OBJS-$(CONFIG_M101_DECODER) += m101.o OBJS-$(CONFIG_MACE3_DECODER) += mace.o OBJS-$(CONFIG_MACE6_DECODER) += mace.o +OBJS-$(CONFIG_MAGICYUV_DECODER) += magicyuv.o OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \ twinvq.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 6d0a7e7..7aa54ee 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -219,6 +219,7 @@ void avcodec_register_all(void) REGISTER_ENCODER(LJPEG, ljpeg); REGISTER_DECODER(LOCO, loco); REGISTER_DECODER(M101, m101); + REGISTER_DECODER(MAGICYUV, magicyuv); REGISTER_DECODER(MDEC, mdec); REGISTER_DECODER(MIMIC, mimic); REGISTER_ENCDEC (MJPEG, mjpeg); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 00d0ef8..339a1b2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -406,6 +406,7 @@ enum AVCodecID { AV_CODEC_ID_CFHD, AV_CODEC_ID_TRUEMOTION2RT, AV_CODEC_ID_M101, + AV_CODEC_ID_MAGICYUV, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 077b2d4..5fd946e 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1542,6 +1542,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0 Real Time"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_MAGICYUV, + .type = AVMEDIA_TYPE_VIDEO, + .name = "magicyuv", + .long_name = NULL_IF_CONFIG_SMALL("MagicYUV Lossless Video"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, /* various PCM "codecs" */ { diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c new file mode 100644 index 0000000..1af7671 --- /dev/null +++ b/libavcodec/magicyuv.c @@ -0,0 +1,465 @@ +/* + * MagicYUV decoder + * Copyright (c) 2016 Paul B Mahol + * + * 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 <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "libavutil/qsort.h" +#include "avcodec.h" +#include "bytestream.h" +#include "get_bits.h" +#include "huffyuvdsp.h" +#include "internal.h" +#include "thread.h" + +typedef struct Slice { + uint32_t start; + uint32_t size; +} Slice; + +typedef enum Prediction { + LEFT = 1, + GRADIENT, + MEDIAN, +} Prediction; + +typedef struct MagicYUVContext { + AVFrame *p; + int slice_height; + int nb_slices; + int planes; // number of encoded planes in bitstream + int decorrelate; // postprocessing work + int interlaced; // video is interlaced + uint8_t *buf; // pointer to AVPacket->data + int hshift[4]; + int vshift[4]; + Slice *slices[4]; // slice positions and size in bitstream for each plane + int slices_size[4]; + uint8_t len[4][256]; // table of code lengths for each plane + VLC vlc[4]; // VLC for each plane + HuffYUVDSPContext hdsp; +} MagicYUVContext; + +static av_cold int decode_init(AVCodecContext *avctx) +{ + MagicYUVContext *s = avctx->priv_data; + ff_huffyuvdsp_init(&s->hdsp); + return 0; +} + +typedef struct HuffEntry { + uint8_t sym; + uint8_t len; + uint32_t code; +} HuffEntry; + +static int ff_magy_huff_cmp_len(const void *a, const void *b) +{ + const HuffEntry *aa = a, *bb = b; + return (aa->len - bb->len) * 256 + aa->sym - bb->sym; +} + +static int build_huff(VLC *vlc, uint8_t *len) +{ + HuffEntry he[256]; + uint32_t codes[256]; + uint8_t bits[256]; + uint8_t syms[256]; + uint32_t code; + int i; + + for (i = 0; i < 256; i++) { + he[i].sym = 255 - i; + he[i].len = len[i]; + } + AV_QSORT(he, 256, HuffEntry, ff_magy_huff_cmp_len); + + code = 1; + for (i = 255; i >= 0; i--) { + codes[i] = code >> (32 - he[i].len); + bits[i] = he[i].len; + syms[i] = he[i].sym; + code += 0x80000000u >> (he[i].len - 1); + } + + ff_free_vlc(vlc); + return ff_init_vlc_sparse(vlc, FFMIN(he[255].len, 12), 256, + bits, sizeof(*bits), sizeof(*bits), + codes, sizeof(*codes), sizeof(*codes), + syms, sizeof(*syms), sizeof(*syms), 0); +} + +static int decode_slice(AVCodecContext *avctx, void *tdata, + int j, int threadnr) +{ + MagicYUVContext *s = avctx->priv_data; + int interlaced = s->interlaced; + AVFrame *p = s->p; + int i, k, x, ret; + GetBitContext b; + uint8_t *dst; + + for (i = 0; i < s->planes; i++) { + int height = AV_CEIL_RSHIFT(FFMIN(s->slice_height, avctx->coded_height - j * s->slice_height), s->vshift[i]); + int width = AV_CEIL_RSHIFT(avctx->coded_width, s->hshift[i]); + int sheight = AV_CEIL_RSHIFT(s->slice_height, s->vshift[i]); + int fake_stride = p->linesize[i] * (1 + interlaced); + int stride = p->linesize[i]; + int pred; + + if ((ret = init_get_bits8(&b, s->buf + s->slices[i][j].start, s->slices[i][j].size)) < 0) + return ret; + + pred = get_bits(&b, 16); + dst = p->data[i] + j * sheight * stride; + for (k = 0; k < height; k++) { + for (x = 0; x < width; x++) { + int pix; + if (get_bits_left(&b) <= 0) { + return AVERROR_INVALIDDATA; + } + pix = get_vlc2(&b, s->vlc[i].table, s->vlc[i].bits, 3); + if (pix < 0) { + return AVERROR_INVALIDDATA; + } + dst[x] = 255 - pix; + } + dst += stride; + } + + if (pred == LEFT) { + dst = p->data[i] + j * sheight * stride; + s->hdsp.add_hfyu_left_pred(dst, dst, width, 0); + dst += stride; + if (interlaced) { + s->hdsp.add_hfyu_left_pred(dst, dst, width, 0); + dst += stride; + } + for (k = 1 + interlaced; k < height; k++) { + s->hdsp.add_hfyu_left_pred(dst, dst, width, dst[-fake_stride]); + dst += stride; + } + } else if (pred == GRADIENT) { + int left, lefttop, top; + + dst = p->data[i] + j * sheight * stride; + s->hdsp.add_hfyu_left_pred(dst, dst, width, 0); + left = lefttop = 0; + dst += stride; + if (interlaced) { + s->hdsp.add_hfyu_left_pred(dst, dst, width, 0); + left = lefttop = 0; + dst += stride; + } + for (k = 1 + interlaced; k < height; k++) { + top = dst[-fake_stride]; + left = top + dst[0]; + dst[0] = left; + for (x = 1; x < width; x++) { + top = dst[x - fake_stride]; + lefttop = dst[x - (fake_stride + 1)]; + left += top - lefttop + dst[x]; + dst[x] = left; + } + dst += stride; + } + } else if (pred == MEDIAN) { + int left, lefttop; + + dst = p->data[i] + j * sheight * stride; + lefttop = left = dst[0]; + s->hdsp.add_hfyu_left_pred(dst, dst, width, 0); + dst += stride; + if (interlaced) { + lefttop = left = dst[0]; + s->hdsp.add_hfyu_left_pred(dst, dst, width, 0); + dst += stride; + } + for (k = 1 + interlaced; k < height; k++) { + s->hdsp.add_hfyu_median_pred(dst, dst - fake_stride, dst, width, &left, &lefttop); + lefttop = left = dst[0]; + dst += stride; + } + } else { + avpriv_request_sample(avctx, "unknown prediction: %d", pred); + } + } + + if (s->decorrelate) { + int height = FFMIN(s->slice_height, avctx->coded_height - j * s->slice_height); + int width = avctx->coded_width; + uint8_t *b = p->data[0] + j * s->slice_height * p->linesize[0]; + uint8_t *g = p->data[1] + j * s->slice_height * p->linesize[1]; + uint8_t *r = p->data[2] + j * s->slice_height * p->linesize[2]; + + for (i = 0; i < height; i++) { + s->hdsp.add_bytes(b, g, width); + s->hdsp.add_bytes(r, g, width); + b += p->linesize[0]; + g += p->linesize[1]; + r += p->linesize[2]; + } + } + + return 0; +} + +static int decode_frame(AVCodecContext *avctx, + void *data, int *got_frame, + AVPacket *avpkt) +{ + uint32_t first_offset, offset, next_offset, header_size, slice_width; + int ret, format, version, table_size; + MagicYUVContext *s = avctx->priv_data; + ThreadFrame frame = { .f = data }; + AVFrame *p = data; + GetByteContext gb; + GetBitContext b; + int i, j, k; + + bytestream2_init(&gb, avpkt->data, avpkt->size); + if (bytestream2_get_le32(&gb) != MKTAG('M','A','G','Y')) + return AVERROR_INVALIDDATA; + + header_size = bytestream2_get_le32(&gb); + if (header_size < 32 || header_size >= avpkt->size) + return AVERROR_INVALIDDATA; + + version = bytestream2_get_byte(&gb); + if (version != 7) { + avpriv_request_sample(avctx, "unsupported version: %d", version); + return AVERROR_PATCHWELCOME; + } + + s->hshift[1] = s->vshift[1] = 0; + s->hshift[2] = s->vshift[2] = 0; + s->decorrelate = 0; + + format = bytestream2_get_byte(&gb); + switch (format) { + case 0x65: + avctx->pix_fmt = AV_PIX_FMT_GBRP; + s->decorrelate = 1; + s->planes = 3; + break; + case 0x66: + avctx->pix_fmt = AV_PIX_FMT_GBRAP; + s->decorrelate = 1; + s->planes = 4; + break; + case 0x67: + avctx->pix_fmt = AV_PIX_FMT_YUV444P; + s->planes = 3; + break; + case 0x68: + avctx->pix_fmt = AV_PIX_FMT_YUV422P; + s->planes = 3; + s->hshift[1] = s->hshift[2] = 1; + break; + case 0x69: + avctx->pix_fmt = AV_PIX_FMT_YUV420P; + s->planes = 3; + s->hshift[1] = s->vshift[1] = 1; + s->hshift[2] = s->vshift[2] = 1; + break; + case 0x6a: + avctx->pix_fmt = AV_PIX_FMT_YUVA444P; + s->planes = 4; + break; + case 0x6b: + avctx->pix_fmt = AV_PIX_FMT_GRAY8; + s->planes = 1; + break; + default: + avpriv_request_sample(avctx, "unsupported format: 0x%X", format); + return AVERROR_PATCHWELCOME; + } + + bytestream2_skip(&gb, 2); + s->interlaced = !!(bytestream2_get_byte(&gb) & 2); + bytestream2_skip(&gb, 3); + + avctx->coded_width = bytestream2_get_le32(&gb); + avctx->coded_height = bytestream2_get_le32(&gb); + slice_width = bytestream2_get_le32(&gb); + if (slice_width != avctx->coded_width) { + avpriv_request_sample(avctx, "unsupported slice width: %d", slice_width); + return AVERROR_PATCHWELCOME; + } + s->slice_height = bytestream2_get_le32(&gb); + if ((s->slice_height <= 0) || (s->slice_height > INT_MAX - avctx->coded_height)) { + av_log(avctx, AV_LOG_ERROR, "invalid slice height: %d\n", s->slice_height); + return AVERROR_INVALIDDATA; + } + + bytestream2_skip(&gb, 4); + + s->nb_slices = (avctx->coded_height + s->slice_height - 1) / s->slice_height; + if (s->nb_slices > INT_MAX / sizeof(Slice)) { + av_log(avctx, AV_LOG_ERROR, "invalid number of slices: %d\n", s->nb_slices); + return AVERROR_INVALIDDATA; + } + + for (i = 0; i < s->planes; i++) { + av_fast_malloc(&s->slices[i], &s->slices_size[i], s->nb_slices * sizeof(Slice)); + if (!s->slices[i]) + return AVERROR(ENOMEM); + + offset = bytestream2_get_le32(&gb); + if (offset >= avpkt->size - header_size) + return AVERROR_INVALIDDATA; + + if (i == 0) + first_offset = offset; + + for (j = 0; j < s->nb_slices - 1; j++) { + s->slices[i][j].start = offset + header_size; + next_offset = bytestream2_get_le32(&gb); + s->slices[i][j].size = next_offset - offset; + offset = next_offset; + + if (offset >= avpkt->size - header_size) + return AVERROR_INVALIDDATA; + } + + s->slices[i][j].start = offset + header_size; + s->slices[i][j].size = avpkt->size - offset; + } + + if (bytestream2_get_byte(&gb) != s->planes) + return AVERROR_INVALIDDATA; + + bytestream2_skip(&gb, s->nb_slices * s->planes); + + table_size = header_size + first_offset - bytestream2_tell(&gb); + if (table_size < 2) + return AVERROR_INVALIDDATA; + + if ((ret = init_get_bits8(&b, avpkt->data + bytestream2_tell(&gb), table_size)) < 0) + return ret; + + memset(s->len, 0, sizeof(s->len)); + j = i = 0; + while (get_bits_left(&b) >= 8) { + int l = get_bits(&b, 4); + int x = get_bits(&b, 4); + int L = get_bitsz(&b, l) + 1; + + for (k = 0; k < L; k++) { + if (j + k < 256) + s->len[i][j + k] = x; + } + + j += L; + if (j == 256) { + j = 0; + if (build_huff(&s->vlc[i], s->len[i])) { + av_log(avctx, AV_LOG_ERROR, "Cannot build Huffman codes\n"); + return AVERROR_INVALIDDATA; + } + i++; + if (i == s->planes) { + break; + } + } else if (j > 256) { + return AVERROR_INVALIDDATA; + } + } + + if (i != s->planes) { + av_log(avctx, AV_LOG_ERROR, "Huffman tables too short\n"); + return AVERROR_INVALIDDATA; + } + + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; + + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) + return ret; + + s->buf = avpkt->data; + s->p = p; + avctx->execute2(avctx, decode_slice, NULL, NULL, s->nb_slices); + + if (avctx->pix_fmt == AV_PIX_FMT_GBRP || + avctx->pix_fmt == AV_PIX_FMT_GBRAP) { + FFSWAP(uint8_t*, p->data[0], p->data[1]); + FFSWAP(int, p->linesize[0], p->linesize[1]); + } + + *got_frame = 1; + + if (ret < 0) + return ret; + return avpkt->size; +} + +#if HAVE_THREADS +static int decode_init_thread_copy(AVCodecContext *avctx) +{ + MagicYUVContext *s = avctx->priv_data; + + s->slices[0] = 0; + s->slices[1] = 0; + s->slices[2] = 0; + s->slices[3] = 0; + s->slices_size[0] = 0; + s->slices_size[1] = 0; + s->slices_size[2] = 0; + s->slices_size[3] = 0; + + return 0; +} +#endif + +static av_cold int decode_end(AVCodecContext *avctx) +{ + MagicYUVContext * const s = avctx->priv_data; + + av_freep(&s->slices[0]); + av_freep(&s->slices[1]); + av_freep(&s->slices[2]); + av_freep(&s->slices[3]); + s->slices_size[0] = 0; + s->slices_size[1] = 0; + s->slices_size[2] = 0; + s->slices_size[3] = 0; + ff_free_vlc(&s->vlc[0]); + ff_free_vlc(&s->vlc[1]); + ff_free_vlc(&s->vlc[2]); + ff_free_vlc(&s->vlc[3]); + + return 0; +} + +AVCodec ff_magicyuv_decoder = { + .name = "magicyuv", + .long_name = NULL_IF_CONFIG_SMALL("MagicYUV Lossless Video"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MAGICYUV, + .priv_data_size = sizeof(MagicYUVContext), + .init = decode_init, + .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), + .close = decode_end, + .decode = decode_frame, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index ee3006c..b7de26a 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 43 +#define LIBAVCODEC_VERSION_MINOR 44 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavformat/riff.c b/libavformat/riff.c index 6280e90..5311b54 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -421,6 +421,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_CFHD, MKTAG('C', 'F', 'H', 'D') }, { AV_CODEC_ID_M101, MKTAG('M', '1', '0', '1') }, { AV_CODEC_ID_M101, MKTAG('M', '1', '0', '2') }, + { AV_CODEC_ID_MAGICYUV, MKTAG('M', 'A', 'G', 'Y') }, { AV_CODEC_ID_NONE, 0 } };

1 0

avcodec/bmp_parser: Fix state
by git＠videolan.org 31 May '16

31 May '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Tue May 31 22:01:13 2016 +0200| [d0388bd32e1c84a9ef87ba6c448c7fffb6a9f259] | committer: Michael Niedermayer avcodec/bmp_parser: Fix state Fixes Ticket5598 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0388bd32e1c84a9e… --- libavcodec/bmp_parser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c index 7ab32a0..b06e3e8 100644 --- a/libavcodec/bmp_parser.c +++ b/libavcodec/bmp_parser.c @@ -67,6 +67,8 @@ restart: if (bpc->pc.index + i > 17) { next = i - 17; + state = 0; + break; } else goto restart; } else if (bpc->pc.frame_start_found)

1 0

avcodec/nvenc: Refactor timestamp generation logic
by git＠videolan.org 31 May '16

31 May '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Tue May 31 18:59:35 2016 +0200| [e5babccfbcd83559247d28e215440a0e74060425] | committer: Timo Rothenpieler avcodec/nvenc: Refactor timestamp generation logic Directly adapted from libav > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5babccfbcd835592… --- libavcodec/nvenc.c | 47 +++++++++++++++++++++++++++++++++-------------- libavcodec/nvenc.h | 5 ++++- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 2fdfdcf..4be0405 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -828,8 +828,6 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) int res = 0; int dw, dh; - ctx->last_dts = AV_NOPTS_VALUE; - ctx->encode_config.version = NV_ENC_CONFIG_VER; ctx->init_encode_params.version = NV_ENC_INITIALIZE_PARAMS_VER; @@ -897,9 +895,8 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) ctx->encode_config.gopLength = 1; } - /* when there're b frames, set dts offset */ - if (ctx->encode_config.frameIntervalP >= 2) - ctx->last_dts = -2; + ctx->initial_pts[0] = AV_NOPTS_VALUE; + ctx->initial_pts[1] = AV_NOPTS_VALUE; nvenc_setup_rate_control(avctx); @@ -1419,19 +1416,30 @@ static int nvenc_set_timestamp(AVCodecContext *avctx, pkt->pts = params->outputTimeStamp; pkt->duration = params->outputDuration; - pkt->dts = timestamp_queue_dequeue(ctx->timestamp_list); - /* when there're b frame(s), set dts offset */ - if (ctx->encode_config.frameIntervalP >= 2) - pkt->dts -= 1; + /* generate the first dts by linearly extrapolating the + * first two pts values to the past */ + if (avctx->max_b_frames > 0 && !ctx->first_packet_output && + ctx->initial_pts[1] != AV_NOPTS_VALUE) { + int64_t ts0 = ctx->initial_pts[0], ts1 = ctx->initial_pts[1]; + int64_t delta; + + if ((ts0 < 0 && ts1 > INT64_MAX + ts0) || + (ts0 > 0 && ts1 < INT64_MIN + ts0)) + return AVERROR(ERANGE); + delta = ts1 - ts0; - if (pkt->dts > pkt->pts) - pkt->dts = pkt->pts; + if ((delta < 0 && ts0 > INT64_MAX + delta) || + (delta > 0 && ts0 < INT64_MIN + delta)) + return AVERROR(ERANGE); + pkt->dts = ts0 - delta; + + ctx->first_packet_output = 1; + return 0; + } - if (ctx->last_dts != AV_NOPTS_VALUE && pkt->dts <= ctx->last_dts) - pkt->dts = ctx->last_dts + 1; + pkt->dts = timestamp_queue_dequeue(ctx->timestamp_list); - ctx->last_dts = pkt->dts; return 0; } @@ -1551,6 +1559,12 @@ static int output_ready(AVCodecContext *avctx, int flush) NvencContext *ctx = avctx->priv_data; int nb_ready, nb_pending; + /* when B-frames are enabled, we wait for two initial timestamps to + * calculate the first dts */ + if (!flush && avctx->max_b_frames > 0 && + (ctx->initial_pts[0] == AV_NOPTS_VALUE || ctx->initial_pts[1] == AV_NOPTS_VALUE)) + return 0; + nb_ready = av_fifo_size(ctx->output_surface_ready_queue) / sizeof(NvencSurface*); nb_pending = av_fifo_size(ctx->output_surface_queue) / sizeof(NvencSurface*); if (flush) @@ -1617,6 +1631,11 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (frame) { av_fifo_generic_write(ctx->output_surface_queue, &inSurf, sizeof(inSurf), NULL); timestamp_queue_enqueue(ctx->timestamp_list, frame->pts); + + if (ctx->initial_pts[0] == AV_NOPTS_VALUE) + ctx->initial_pts[0] = frame->pts; + else if (ctx->initial_pts[1] == AV_NOPTS_VALUE) + ctx->initial_pts[1] = frame->pts; } /* all the pending buffers are now ready for output */ diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 7abaf33..961cbc7 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -157,7 +157,10 @@ typedef struct NvencContext * AVCodecContext.pix_fmt when using hwaccel frames on input */ enum AVPixelFormat data_pix_fmt; - int64_t last_dts; + /* timestamps of the first two frames, for computing the first dts + * when B-frames are present */ + int64_t initial_pts[2]; + int first_packet_output; void *nvencoder;

1 0

avcodec/nvenc: forward frame duration
by git＠videolan.org 31 May '16

31 May '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Tue May 31 18:39:28 2016 +0200| [69c25c0ad7e4b6802ed7b6c3ff0a5a45bf8f8492] | committer: Timo Rothenpieler avcodec/nvenc: forward frame duration > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69c25c0ad7e4b6802… --- libavcodec/nvenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 409a7b7..2fdfdcf 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1418,6 +1418,7 @@ static int nvenc_set_timestamp(AVCodecContext *avctx, NvencContext *ctx = avctx->priv_data; pkt->pts = params->outputTimeStamp; + pkt->duration = params->outputDuration; pkt->dts = timestamp_queue_dequeue(ctx->timestamp_list); /* when there're b frame(s), set dts offset */ @@ -1601,7 +1602,7 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, pic_params.encodePicFlags = 0; pic_params.inputTimeStamp = frame->pts; - pic_params.inputDuration = 0; + pic_params.inputDuration = av_frame_get_pkt_duration(frame); nvenc_codec_specific_pic_params(avctx, &pic_params); } else {

1 0

avcodec/nvenc: twopass mode works in all modes
by git＠videolan.org 31 May '16

31 May '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Tue May 31 16:55:24 2016 +0200| [eae4eba9cbe1b5ffc97b92e671bd7cd024839322] | committer: Timo Rothenpieler avcodec/nvenc: twopass mode works in all modes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eae4eba9cbe1b5ffc… --- libavcodec/nvenc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 14ed0d2..f440f5a 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -598,15 +598,9 @@ static void nvenc_override_rate_control(AVCodecContext *avctx) set_vbr(avctx); break; case NV_ENC_PARAMS_RC_CBR: - break; case NV_ENC_PARAMS_RC_2_PASS_QUALITY: case NV_ENC_PARAMS_RC_2_PASS_FRAMESIZE_CAP: - if (!(ctx->flags & NVENC_LOWLATENCY)) { - av_log(avctx, AV_LOG_WARNING, - "The multipass rate-control requires " - "a low-latency preset.\n"); - return; - } + break; } rc->rateControlMode = ctx->rc;

1 0

avcodec/nvenc: Handle minqp-only case in set_vbr
by git＠videolan.org 31 May '16

31 May '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Tue May 31 17:00:07 2016 +0200| [971351b6642e9beb96db64f1fd627404ce9d72de] | committer: Timo Rothenpieler avcodec/nvenc: Handle minqp-only case in set_vbr > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=971351b6642e9beb9… --- libavcodec/nvenc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index f440f5a..409a7b7 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -531,6 +531,14 @@ static av_cold void set_vbr(AVCodecContext *avctx) rc->maxQP.qpIntra = avctx->qmax; qp_inter_p = (avctx->qmax + 3 * avctx->qmin) / 4; // biased towards Qmin + } else if (avctx->qmin >= 0) { + rc->enableMinQP = 1; + + rc->minQP.qpInterB = avctx->qmin; + rc->minQP.qpInterP = avctx->qmin; + rc->minQP.qpIntra = avctx->qmin; + + qp_inter_p = avctx->qmin; } else { qp_inter_p = 26; // default to 26 }

1 0

avcodec/nvenc: Fix forcing constqp rc mode
by git＠videolan.org 31 May '16

31 May '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Tue May 31 16:53:38 2016 +0200| [1330a0f31f373f3b9f1ea53d48b94edc47759b76] | committer: Timo Rothenpieler avcodec/nvenc: Fix forcing constqp rc mode The CONSTQP enum value is 0, so this check failed for it. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1330a0f31f373f3b9… --- libavcodec/nvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index e8b57e4..14ed0d2 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -651,7 +651,7 @@ static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) if (ctx->flags & NVENC_LOSSLESS) { set_lossless(avctx); - } else if (ctx->rc > 0) { + } else if (ctx->rc >= 0) { nvenc_override_rate_control(avctx); } else { ctx->encode_config.rcParams.rateControlMode = NV_ENC_PARAMS_RC_VBR;

1 0

avcodec/nvenc: don't enqueue timestamps until a frame was accepted
by git＠videolan.org 31 May '16

31 May '16

ffmpeg | branch: master | Andrey Turkin <andrey.turkin(a)gmail.com> | Sun May 29 15:51:36 2016 +0300| [58c6dcb4b7e77ca87d6b4bd869b098603b5b11f1] | committer: Timo Rothenpieler avcodec/nvenc: don't enqueue timestamps until a frame was accepted Otherwise timestamps/pending FIFOs would go out of sync if nvEncodePicture ever fails. Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58c6dcb4b7e77ca87… --- libavcodec/nvenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index a31c6e8..e8b57e4 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1602,8 +1602,6 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, pic_params.inputDuration = 0; nvenc_codec_specific_pic_params(avctx, &pic_params); - - timestamp_queue_enqueue(ctx->timestamp_list, frame->pts); } else { pic_params.encodePicFlags = NV_ENC_PIC_FLAG_EOS; } @@ -1613,8 +1611,10 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, nv_status != NV_ENC_ERR_NEED_MORE_INPUT) return nvenc_print_error(avctx, nv_status, "EncodePicture failed!"); - if (frame) + if (frame) { av_fifo_generic_write(ctx->output_surface_queue, &inSurf, sizeof(inSurf), NULL); + timestamp_queue_enqueue(ctx->timestamp_list, frame->pts); + } /* all the pending buffers are now ready for output */ if (nv_status == NV_ENC_SUCCESS) {

1 0

avcodec/nvenc: refactor encode_frame a bit
by git＠videolan.org 31 May '16

31 May '16

ffmpeg | branch: master | Andrey Turkin <andrey.turkin(a)gmail.com> | Sun May 29 15:50:06 2016 +0300| [2f53b5b74b658583be39d3c805024c4d93f67f6b] | committer: Timo Rothenpieler avcodec/nvenc: refactor encode_frame a bit Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f53b5b74b658583b… --- libavcodec/nvenc.c | 83 ++++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index b302b5c..a31c6e8 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -141,20 +141,6 @@ static int nvenc_print_error(void *log_ctx, NVENCSTATUS err, return ret; } -static void timestamp_queue_enqueue(AVFifoBuffer* queue, int64_t timestamp) -{ - av_fifo_generic_write(queue, &timestamp, sizeof(timestamp), NULL); -} - -static int64_t timestamp_queue_dequeue(AVFifoBuffer* queue) -{ - int64_t timestamp = AV_NOPTS_VALUE; - if (av_fifo_size(queue) > 0) - av_fifo_generic_read(queue, &timestamp, sizeof(timestamp), NULL); - - return timestamp; -} - static av_cold int nvenc_load_libraries(AVCodecContext *avctx) { NvencContext *ctx = avctx->priv_data; @@ -1389,22 +1375,40 @@ static int nvenc_upload_frame(AVCodecContext *avctx, const AVFrame *frame, } static void nvenc_codec_specific_pic_params(AVCodecContext *avctx, - NV_ENC_PIC_PARAMS *params) + NV_ENC_PIC_PARAMS *params) { NvencContext *ctx = avctx->priv_data; switch (avctx->codec->id) { case AV_CODEC_ID_H264: - params->codecPicParams.h264PicParams.sliceMode = ctx->encode_config.encodeCodecConfig.h264Config.sliceMode; - params->codecPicParams.h264PicParams.sliceModeData = ctx->encode_config.encodeCodecConfig.h264Config.sliceModeData; - break; - case AV_CODEC_ID_H265: - params->codecPicParams.hevcPicParams.sliceMode = ctx->encode_config.encodeCodecConfig.hevcConfig.sliceMode; - params->codecPicParams.hevcPicParams.sliceModeData = ctx->encode_config.encodeCodecConfig.hevcConfig.sliceModeData; + params->codecPicParams.h264PicParams.sliceMode = + ctx->encode_config.encodeCodecConfig.h264Config.sliceMode; + params->codecPicParams.h264PicParams.sliceModeData = + ctx->encode_config.encodeCodecConfig.h264Config.sliceModeData; break; + case AV_CODEC_ID_HEVC: + params->codecPicParams.hevcPicParams.sliceMode = + ctx->encode_config.encodeCodecConfig.hevcConfig.sliceMode; + params->codecPicParams.hevcPicParams.sliceModeData = + ctx->encode_config.encodeCodecConfig.hevcConfig.sliceModeData; + break; } } +static inline void timestamp_queue_enqueue(AVFifoBuffer* queue, int64_t timestamp) +{ + av_fifo_generic_write(queue, &timestamp, sizeof(timestamp), NULL); +} + +static inline int64_t timestamp_queue_dequeue(AVFifoBuffer* queue) +{ + int64_t timestamp = AV_NOPTS_VALUE; + if (av_fifo_size(queue) > 0) + av_fifo_generic_read(queue, &timestamp, sizeof(timestamp), NULL); + + return timestamp; +} + static int nvenc_set_timestamp(AVCodecContext *avctx, NV_ENC_LOCK_BITSTREAM *params, AVPacket *pkt) @@ -1539,17 +1543,20 @@ error2: return res; } -static int output_ready(NvencContext *ctx, int flush) +static int output_ready(AVCodecContext *avctx, int flush) { + NvencContext *ctx = avctx->priv_data; int nb_ready, nb_pending; nb_ready = av_fifo_size(ctx->output_surface_ready_queue) / sizeof(NvencSurface*); nb_pending = av_fifo_size(ctx->output_surface_queue) / sizeof(NvencSurface*); - return nb_ready > 0 && (flush || nb_ready + nb_pending >= ctx->async_depth); + if (flush) + return nb_ready > 0; + return (nb_ready > 0) && (nb_ready + nb_pending >= ctx->async_depth); } int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - const AVFrame *frame, int *got_packet) + const AVFrame *frame, int *got_packet) { NVENCSTATUS nv_status; NvencSurface *tmpoutsurf, *inSurf; @@ -1564,7 +1571,10 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (frame) { inSurf = get_free_frame(ctx); - av_assert0(inSurf); + if (!inSurf) { + av_log(avctx, AV_LOG_ERROR, "No free surfaces\n"); + return AVERROR_BUG; + } res = nvenc_upload_frame(avctx, frame, inSurf); if (res) { @@ -1577,14 +1587,12 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, pic_params.inputWidth = avctx->width; pic_params.inputHeight = avctx->height; pic_params.outputBitstream = inSurf->output_surface; - pic_params.completionEvent = 0; if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { - if (frame->top_field_first) { + if (frame->top_field_first) pic_params.pictureStruct = NV_ENC_PIC_STRUCT_FIELD_TOP_BOTTOM; - } else { + else pic_params.pictureStruct = NV_ENC_PIC_STRUCT_FIELD_BOTTOM_TOP; - } } else { pic_params.pictureStruct = NV_ENC_PIC_STRUCT_FRAME; } @@ -1601,25 +1609,22 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, } nv_status = p_nvenc->nvEncEncodePicture(ctx->nvencoder, &pic_params); + if (nv_status != NV_ENC_SUCCESS && + nv_status != NV_ENC_ERR_NEED_MORE_INPUT) + return nvenc_print_error(avctx, nv_status, "EncodePicture failed!"); - if (frame && nv_status == NV_ENC_ERR_NEED_MORE_INPUT) + if (frame) av_fifo_generic_write(ctx->output_surface_queue, &inSurf, sizeof(inSurf), NULL); - if (nv_status != NV_ENC_SUCCESS && nv_status != NV_ENC_ERR_NEED_MORE_INPUT) { - return nvenc_print_error(avctx, nv_status, "EncodePicture failed!"); - } - - if (nv_status != NV_ENC_ERR_NEED_MORE_INPUT) { + /* all the pending buffers are now ready for output */ + if (nv_status == NV_ENC_SUCCESS) { while (av_fifo_size(ctx->output_surface_queue) > 0) { av_fifo_generic_read(ctx->output_surface_queue, &tmpoutsurf, sizeof(tmpoutsurf), NULL); av_fifo_generic_write(ctx->output_surface_ready_queue, &tmpoutsurf, sizeof(tmpoutsurf), NULL); } - - if (frame) - av_fifo_generic_write(ctx->output_surface_ready_queue, &inSurf, sizeof(inSurf), NULL); } - if (output_ready(ctx, !frame)) { + if (output_ready(avctx, !frame)) { av_fifo_generic_read(ctx->output_surface_ready_queue, &tmpoutsurf, sizeof(tmpoutsurf), NULL); res = process_output_surface(avctx, pkt, tmpoutsurf);

1 0

avcodec/dca_parser: skip initial padding
by git＠videolan.org 31 May '16

31 May '16

ffmpeg | branch: master | foo86 <foobaz86(a)gmail.com> | Tue May 31 14:46:14 2016 +0300| [214e63f8511330e8da8d69b5ea402ff0a4f17316] | committer: James Almer avcodec/dca_parser: skip initial padding Padding before the first sync word can be very large for DTS-in-WAV streams. There is no reason to include this padding in parsed packet. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=214e63f8511330e8d… --- libavcodec/dca_parser.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c index 1521a5b..e5bea33 100644 --- a/libavcodec/dca_parser.c +++ b/libavcodec/dca_parser.c @@ -33,6 +33,7 @@ typedef struct DCAParseContext { uint32_t lastmarker; int size; int framesize; + unsigned int startpos; DCAExssParser exss; unsigned int sr_code; } DCAParseContext; @@ -75,20 +76,27 @@ static int dca_find_frame_end(DCAParseContext *pc1, const uint8_t *buf, i = 0; if (!start_found) { - for (i = 0; i < buf_size; i++) { + for (; i < buf_size; i++) { + size++; state = (state << 8) | buf[i]; - if (IS_MARKER(state)) { - if (!pc1->lastmarker || - pc1->lastmarker == CORE_MARKER(state) || - pc1->lastmarker == DCA_SYNCWORD_SUBSTREAM) { - start_found = 1; - if (IS_EXSS_MARKER(state)) - pc1->lastmarker = EXSS_MARKER(state); - else - pc1->lastmarker = CORE_MARKER(state); - i++; - break; - } + + if (IS_MARKER(state) && + (!pc1->lastmarker || + pc1->lastmarker == CORE_MARKER(state) || + pc1->lastmarker == DCA_SYNCWORD_SUBSTREAM)) { + if (!pc1->lastmarker) + pc1->startpos = IS_EXSS_MARKER(state) ? size - 4 : size - 6; + + if (IS_EXSS_MARKER(state)) + pc1->lastmarker = EXSS_MARKER(state); + else + pc1->lastmarker = CORE_MARKER(state); + + start_found = 1; + size = 0; + + i++; + break; } } } @@ -284,6 +292,13 @@ static int dca_parse(AVCodecParserContext *s, AVCodecContext *avctx, *poutbuf_size = 0; return buf_size; } + + /* skip initial padding */ + if (buf_size > pc1->startpos) { + buf += pc1->startpos; + buf_size -= pc1->startpos; + } + pc1->startpos = 0; } /* read the duration and sample rate from the frame header */

1 0