October 2016 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] avformat/matroskaenc: fix targets for attachment tags
by James Almer 04 Oct '16

04 Oct '16

Attachment tags were being written targetting non-existent streams in the output file. Also filter "filename" and "mimetype" entries, as they are standard elements in the Attachment master. Signed-off-by: James Almer <jamrial(a)gmail.com> --- The fileuid is changed to be four bytes long instead of eight, because the mkv_write_tag*() functions pass that value as unsigned int. If preferred i can change them to pass uint64_t and keep the current huge fileuids. libavformat/matroskaenc.c | 66 ++++++++++++++++++++++++++++++++++++++++++----- tests/ref/lavf/mkv | 4 +-- 2 files changed, 61 insertions(+), 9 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3eeb09b..4561db7 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -95,6 +95,16 @@ typedef struct mkv_track { int64_t ts_offset; } mkv_track; +typedef struct mkv_attachment { + int stream_idx; + uint32_t fileuid; +} mkv_attachment; + +typedef struct mkv_attachments { + mkv_attachment *entries; + int num_entries; +} mkv_attachments; + #define MODE_MATROSKAv2 0x01 #define MODE_WEBM 0x02 @@ -116,6 +126,7 @@ typedef struct MatroskaMuxContext { mkv_seekhead *main_seekhead; mkv_cues *cues; mkv_track *tracks; + mkv_attachments *attachments; AVPacket cur_audio_pkt; @@ -323,6 +334,10 @@ static void mkv_free(MatroskaMuxContext *mkv) { av_freep(&mkv->cues->entries); av_freep(&mkv->cues); } + if (mkv->attachments) { + av_freep(&mkv->attachments->entries); + av_freep(&mkv->attachments); + } av_freep(&mkv->tracks); av_freep(&mkv->stream_durations); av_freep(&mkv->stream_duration_offsets); @@ -1316,7 +1331,10 @@ static int mkv_check_tag_name(const char *name, unsigned int elementid) av_strcasecmp(name, "encoding_tool") && av_strcasecmp(name, "duration") && (elementid != MATROSKA_ID_TAGTARGETS_TRACKUID || - av_strcasecmp(name, "language")); + av_strcasecmp(name, "language")) && + (elementid != MATROSKA_ID_TAGTARGETS_ATTACHUID || + (av_strcasecmp(name, "filename") && + av_strcasecmp(name, "mimetype"))); } static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int elementid, @@ -1369,6 +1387,9 @@ static int mkv_write_tags(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; + if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) + continue; + if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID)) continue; @@ -1378,9 +1399,13 @@ static int mkv_write_tags(AVFormatContext *s) if (!mkv->is_live) { for (i = 0; i < s->nb_streams; i++) { + AVStream *st = s->streams[i]; ebml_master tag_target; ebml_master tag; + if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) + continue; + mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &tags, &tag_target); tag = start_ebml_master(s->pb, MATROSKA_ID_SIMPLETAG, 0); @@ -1405,6 +1430,20 @@ static int mkv_write_tags(AVFormatContext *s) if (ret < 0) return ret; } + if (mkv->have_attachments) { + for (i = 0; i < mkv->attachments->num_entries; i++) { + mkv_attachment *attachment = &mkv->attachments->entries[i]; + AVStream *st = s->streams[attachment->stream_idx]; + + if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID)) + continue; + + ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID, attachment->fileuid, &tags); + if (ret < 0) + return ret; + } + } + if (tags.pos) end_ebml_master(s->pb, tags); return 0; @@ -1421,6 +1460,10 @@ static int mkv_write_attachments(AVFormatContext *s) if (!mkv->have_attachments) return 0; + mkv->attachments = av_mallocz(sizeof(*mkv->attachments)); + if (!mkv->attachments) + return ret; + av_lfg_init(&c, av_get_random_seed()); ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_ATTACHMENTS, avio_tell(pb)); @@ -1431,13 +1474,19 @@ static int mkv_write_attachments(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; ebml_master attached_file; + mkv_attachment *attachment = mkv->attachments->entries; AVDictionaryEntry *t; const char *mimetype = NULL; - uint64_t fileuid; + uint32_t fileuid; if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT) continue; + attachment = av_realloc_array(attachment, mkv->attachments->num_entries + 1, sizeof(mkv_attachment)); + if (!attachment) + return AVERROR(ENOMEM); + mkv->attachments->entries = attachment; + attached_file = start_ebml_master(pb, MATROSKA_ID_ATTACHEDFILE, 0); if (t = av_dict_get(st->metadata, "title", NULL, 0)) @@ -1477,17 +1526,20 @@ static int mkv_write_attachments(AVFormatContext *s) av_sha_update(sha, st->codecpar->extradata, st->codecpar->extradata_size); av_sha_final(sha, digest); av_free(sha); - fileuid = AV_RL64(digest); + fileuid = AV_RL32(digest); } else { fileuid = av_lfg_get(&c); } - av_log(s, AV_LOG_VERBOSE, "Using %.16"PRIx64" for attachment %d\n", - fileuid, i); + av_log(s, AV_LOG_VERBOSE, "Using %.8"PRIx32" for attachment %d\n", + fileuid, mkv->attachments->num_entries); put_ebml_string(pb, MATROSKA_ID_FILEMIMETYPE, mimetype); put_ebml_binary(pb, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size); put_ebml_uint(pb, MATROSKA_ID_FILEUID, fileuid); end_ebml_master(pb, attached_file); + + mkv->attachments->entries[mkv->attachments->num_entries].stream_idx = i; + mkv->attachments->entries[mkv->attachments->num_entries++].fileuid = fileuid; } end_ebml_master(pb, attachments); @@ -1659,11 +1711,11 @@ static int mkv_write_header(AVFormatContext *s) if (ret < 0) goto fail; - ret = mkv_write_tags(s); + ret = mkv_write_attachments(s); if (ret < 0) goto fail; - ret = mkv_write_attachments(s); + ret = mkv_write_tags(s); if (ret < 0) goto fail; } diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 5b0d386..1fa591a 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,5 +1,5 @@ -5b982c8dfbadc71f51b206cbd10b9a71 *./tests/data/lavf/lavf.mkv -472875 ./tests/data/lavf/lavf.mkv +6ba4c26f1c59cbe9be0f23e965b5df97 *./tests/data/lavf/lavf.mkv +472701 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 b4a295bae8e6cf536563cb840386f3a4 *./tests/data/lavf/lavf.mkv 320551 ./tests/data/lavf/lavf.mkv -- 2.9.1

1 0

[PATCH 3/3] avformat/hlsenc: support multi level path in m3u8 with filename
by Steven Liu 03 Oct '16

03 Oct '16

1 2

lurking bugs in the mmx-related assembler code (?)
by u-h8zb＠aetey.se 03 Oct '16

03 Oct '16

Hello, Would someone familiar with the mmx assembler parts of ffmpeg look over and check that the fp-state is restored as needed? This is crucial with musl libc which uses floating point in its malloc() implementation. My troubleshooting strongly suggests that it is the mmx code which is the culprit of ffmpeg misbehavior (the same issue has been recently fixed in libtheora). Ffmpeg built against musl behaves erratically on certain combinations of inputs and outputs, which may also depend on other settings. Most often ffmpeg hangs forever quite early while beginning the conversion (at "frame= 0 fps...." or even before showing this) but sometimes it segfaults at that point or while being manually interrupted. At least the internal theora decoder is affected but there may be other misbehaving decoders or encoders. I think I observed similar breakage with other file types than ogg/theora but did not document all the tested combinations. Affected ffmpeg versions: tested 2.8.8, 3.0.2, 3.1.3, same behaviour, also when building with various gcc versions (4.x, 5.x, 6.x). Disabling assembler in ffmpeg gets rid of the problem. Given patches/fixes I will be glad to test them and report here. Regards, Rune P.S. an attempt to report via trac did not succeed, that's why posting to the list

11 40

[PATCH] aacenc: WIP support for PCEs
by Rostislav Pehlivanov 03 Oct '16

03 Oct '16

Hopefully whoever wants to have support for crazy formats can help. The table in aacenc.h (temporary position) tells the encoder what to put in the bitstream and how to encode. Problem is, the specifications dont specify anything. Thats because I've not been able to find any bloody specifications and had to work with what the decoder does. And there was plenty of guessing there because the decoder does some magic on layout_map which I can't even figure out nor even know if its correct (it seems to be for the formats I've tested). Then there's the problem with the exact order that the channels have to be in. Again a guessing game, since you essentially have no idea what the index part of the map is supposed to be, whether it has to be incremented starting from the first channel or reset upon every front/side/back channel groups. At least the map to instruct the encoder's straightforward. Anyway, help appreciated. Applies cleanly on 543142990b6f7b8757753c13ea6dbc56275c5c7e, but should work fine with newer versions. --- libavcodec/aacenc.c | 69 +++++++++++++++++++++++++++++++++++++++++++++----- libavcodec/aacenc.h | 50 +++++++++++++++++++++++++++++++++++- libavcodec/aacenctab.h | 13 +++++++++- 3 files changed, 124 insertions(+), 8 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 2653cef..c138699 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -50,6 +50,40 @@ static AVOnce aac_table_init = AV_ONCE_INIT; +static void put_pce(PutBitContext *pb, AVCodecContext *avctx) +{ + int i, j; + AACEncContext *s = avctx->priv_data; + AACPCEInfo *pce = &s->pce; + + put_bits(pb, 4, 0); + + put_bits(pb, 2, avctx->profile); + put_bits(pb, 4, s->samplerate_index); + + put_bits(pb, 4, pce->num_ele[0]); /* Front */ + put_bits(pb, 4, pce->num_ele[1]); /* Side */ + put_bits(pb, 4, pce->num_ele[2]); /* Back */ + put_bits(pb, 2, pce->num_ele[3]); /* LFE */ + put_bits(pb, 3, 0); /* Assoc data */ + put_bits(pb, 4, 0); /* CCs */ + + put_bits(pb, 1, 0); /* Stereo mixdown */ + put_bits(pb, 1, 0); /* Mono mixdown */ + put_bits(pb, 1, 0); /* Something else */ + + for (i = 0; i < 4; i++) { + for (j = 0; j < pce->num_ele[i]; j++) { + if (i < 3) + put_bits(pb, 1, pce->pairing[i][j]); + put_bits(pb, 4, pce->index[i][j]); + } + } + + avpriv_align_put_bits(pb); + put_bits(pb, 8, 0); +} + /** * Make AAC audio config object. * @see 1.6.2.1 "Syntax - AudioSpecificConfig" @@ -58,7 +92,7 @@ static void put_audio_specific_config(AVCodecContext *avctx) { PutBitContext pb; AACEncContext *s = avctx->priv_data; - int channels = s->channels - (s->channels == 8 ? 1 : 0); + int channels = (!s->needs_pce)*(s->channels - (s->channels == 8 ? 1 : 0)); init_put_bits(&pb, avctx->extradata, avctx->extradata_size); put_bits(&pb, 5, s->profile+1); //profile @@ -68,6 +102,8 @@ static void put_audio_specific_config(AVCodecContext *avctx) put_bits(&pb, 1, 0); //frame length - 1024 samples put_bits(&pb, 1, 0); //does not depend on core coder put_bits(&pb, 1, 0); //is not extension + if (s->needs_pce) + put_pce(&pb, avctx); //Explicitly Mark SBR absent put_bits(&pb, 11, 0x2b7); //sync extension @@ -488,7 +524,7 @@ static void copy_input_samples(AACEncContext *s, const AVFrame *frame) { int ch; int end = 2048 + (frame ? frame->nb_samples : 0); - const uint8_t *channel_map = aac_chan_maps[s->channels - 1]; + const uint8_t *channel_map = s->reorder_map; /* copy and remap input samples */ for (ch = 0; ch < s->channels; ch++) { @@ -923,16 +959,36 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) /* Constants */ s->last_frame_pb_count = 0; - avctx->extradata_size = 5; + avctx->extradata_size = 20; avctx->frame_size = 1024; avctx->initial_padding = 1024; s->lambda = avctx->global_quality > 0 ? avctx->global_quality : 120; /* Channel map and unspecified bitrate guessing */ s->channels = avctx->channels; - ERROR_IF(s->channels > AAC_MAX_CHANNELS || s->channels == 7, - "Unsupported number of channels: %d\n", s->channels); - s->chan_map = aac_chan_configs[s->channels-1]; + + s->needs_pce = 1; + for (i = 0; i < FF_ARRAY_ELEMS(aac_normal_chan_layouts); i++) { + if (avctx->channel_layout == aac_normal_chan_layouts[i]) { + s->needs_pce = s->options.pce; + break; + } + } + + if (s->needs_pce) { + for (i = 0; i < FF_ARRAY_ELEMS(aac_pce_configs); i++) + if (avctx->channel_layout == aac_pce_configs[i].layout) + break; + ERROR_IF(i == FF_ARRAY_ELEMS(aac_pce_configs), "Unsupported channel layout\n"); + WARN_IF(1, "Using a PCE!\n"); + s->pce = aac_pce_configs[i]; + s->reorder_map = s->pce.reorder_map; + s->chan_map = s->pce.config_map; + } else { + s->reorder_map = aac_chan_maps[s->channels - 1]; + s->chan_map = aac_chan_configs[s->channels - 1]; + } + if (!avctx->bit_rate) { for (i = 1; i <= s->chan_map[0]; i++) { avctx->bit_rate += s->chan_map[i] == TYPE_CPE ? 128000 : /* Pair */ @@ -1059,6 +1115,7 @@ static const AVOption aacenc_options[] = { {"aac_tns", "Temporal noise shaping", offsetof(AACEncContext, options.tns), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, AACENC_FLAGS}, {"aac_ltp", "Long term prediction", offsetof(AACEncContext, options.ltp), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, AACENC_FLAGS}, {"aac_pred", "AAC-Main prediction", offsetof(AACEncContext, options.pred), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, AACENC_FLAGS}, + {"aac_pce", "Forces the use of PCEs", offsetof(AACEncContext, options.pce), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, AACENC_FLAGS}, {NULL} }; diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 63e7893..9441f29 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -46,6 +46,7 @@ typedef struct AACEncOptions { int pns; int tns; int ltp; + int pce; int pred; int mid_side; int intensity_stereo; @@ -90,6 +91,50 @@ typedef struct AACQuantizeBandCostCacheEntry { uint16_t generation; } AACQuantizeBandCostCacheEntry; +typedef struct AACPCEInfo { + int64_t layout; + int num_ele[4]; ///< front, side, back, lfe + int pairing[3][8]; ///< front, side, back + int index[4][8]; ///< front, side, back, lfe + uint8_t config_map[16]; ///< configs the encoder's channel specific settings + uint8_t reorder_map[16]; ///< maps channels from lavc to aac order +} AACPCEInfo; + +static const AACPCEInfo aac_pce_configs[] = { + { + .layout = AV_CH_LAYOUT_MONO, + .num_ele = { 1, 0, 0, 0 }, + .pairing = { { 0 }, }, + .index = { { 0 }, }, + .config_map = { 1, TYPE_SCE, }, + .reorder_map = { 0 }, + }, + { + .layout = AV_CH_LAYOUT_STEREO, + .num_ele = { 1, 0, 0, 0 }, + .pairing = { { 1 }, }, + .index = { { 0 }, }, + .config_map = { 1, TYPE_CPE, }, + .reorder_map = { 0, 1 }, + }, + { + .layout = AV_CH_LAYOUT_SURROUND, + .num_ele = { 2, 0, 0, 0 }, + .pairing = { { 1, 0 }, }, + .index = { { 0, 1 }, }, + .config_map = { 2, TYPE_SCE, TYPE_CPE }, + .reorder_map = { 2, 0, 1 }, + }, + { + .layout = AV_CH_LAYOUT_4POINT0, + .num_ele = { 2, 0, 1, 0 }, + .pairing = { { 1, 0 }, { 0 }, { 0 }, }, + .index = { { 0, 1 }, { 0 }, { 0 } }, + .config_map = { 3, TYPE_SCE, TYPE_CPE, TYPE_SCE }, + .reorder_map = { 2, 0, 1, 3 }, + }, +}; + /** * AAC encoder context */ @@ -101,12 +146,15 @@ typedef struct AACEncContext { FFTContext mdct128; ///< short (128 samples) frame transform context AVFloatDSPContext *fdsp; AVLFG lfg; ///< PRNG needed for PNS - float *planar_samples[8]; ///< saved preprocessed input + AACPCEInfo pce; ///< PCE data, if needed + float *planar_samples[16]; ///< saved preprocessed input int profile; ///< copied from avctx + int needs_pce; ///< flag for non-standard layout LPCContext lpc; ///< used by TNS int samplerate_index; ///< MPEG-4 samplerate index int channels; ///< channel count + const uint8_t *reorder_map; ///< lavc to aac reorder map const uint8_t *chan_map; ///< channel configuration map ChannelElement *cpe; ///< channel elements diff --git a/libavcodec/aacenctab.h b/libavcodec/aacenctab.h index 5fc9411..c852a29 100644 --- a/libavcodec/aacenctab.h +++ b/libavcodec/aacenctab.h @@ -36,13 +36,24 @@ /** Total number of codebooks, including special ones **/ #define CB_TOT_ALL 15 -#define AAC_MAX_CHANNELS 8 +#define AAC_MAX_CHANNELS 16 extern const uint8_t *ff_aac_swb_size_1024[]; extern const int ff_aac_swb_size_1024_len; extern const uint8_t *ff_aac_swb_size_128[]; extern const int ff_aac_swb_size_128_len; +/* Supported layouts without using a PCE */ +static const int64_t aac_normal_chan_layouts[7] = { + AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_SURROUND, + AV_CH_LAYOUT_4POINT0, + AV_CH_LAYOUT_5POINT0, + AV_CH_LAYOUT_5POINT1, + AV_CH_LAYOUT_7POINT1, +}; + /** default channel configurations */ static const uint8_t aac_chan_configs[AAC_MAX_CHANNELS][6] = { {1, TYPE_SCE}, // 1 channel - single channel element -- 2.9.3

2 1

[PATCH] lavf/aviobuf.c: Adapt avio_accept and avio_handshake to new AVIOContext API
by Stephan Holljes 03 Oct '16

03 Oct '16

Signed-off-by: Stephan Holljes <klaxa1337(a)googlemail.com> --- libavformat/aviobuf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) This fixes doc/examples/http_multiclient.c from segfaulting. Seems like these functions were forgotten during the white- and blacklisting update. diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index f3acb32..134d627 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1156,7 +1156,8 @@ int avio_read_to_bprint(AVIOContext *h, AVBPrint *pb, size_t max_size) int avio_accept(AVIOContext *s, AVIOContext **c) { int ret; - URLContext *sc = s->opaque; + AVIOInternal *internal = s->opaque; + URLContext *sc = internal->h; URLContext *cc = NULL; ret = ffurl_accept(sc, &cc); if (ret < 0) @@ -1166,7 +1167,8 @@ int avio_accept(AVIOContext *s, AVIOContext **c) int avio_handshake(AVIOContext *c) { - URLContext *cc = c->opaque; + AVIOInternal *internal = c->opaque; + URLContext *cc = internal->h; return ffurl_handshake(cc); } -- 2.5.5

2 1

[PATCH 1/3] lavc/utils: disallow zero sized packets with data set in avcodec_send_packet
by Marton Balint 03 Oct '16

03 Oct '16

Signed-off-by: Marton Balint <cus(a)passwd.hu> --- libavcodec/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index cf85300..d0a6817 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2813,6 +2813,9 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke if (avctx->internal->draining) return AVERROR_EOF; + if (avpkt && !avpkt->size && avpkt->data) + return AVERROR(EINVAL); + if (!avpkt || !avpkt->size) { avctx->internal->draining = 1; avpkt = NULL; -- 2.6.6

4 13

[PATCH]doc/platform: Mention musl where x86_32 is not supported
by Carl Eugen Hoyos 03 Oct '16

03 Oct '16

Hi! Attached patch adds a musl section to doc/platform. Please comment, Carl Eugen

9 25

[PATCH] libavformat/bink.c: fix warning due to misleading indentation
by Adriano Pallavicino 03 Oct '16

03 Oct '16

2 3

[PATCH 1/2] avutil/hwcontext_cuda: align allocated frames
by Timo Rothenpieler 03 Oct '16

03 Oct '16

--- libavutil/hwcontext_cuda.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c index 40d2971..706d195 100644 --- a/libavutil/hwcontext_cuda.c +++ b/libavutil/hwcontext_cuda.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/intmath.h" + #include "buffer.h" #include "common.h" #include "hwcontext.h" @@ -35,6 +37,14 @@ static const enum AVPixelFormat supported_formats[] = { AV_PIX_FMT_YUV444P, }; +static unsigned int next_pow2(unsigned int a) +{ + if (a <= 1) + return 1; + a = 1 << (sizeof(a) * 8 - ff_clz(a - 1)); + return FFALIGN(a, 256); +} + static void cuda_buffer_free(void *opaque, uint8_t *data) { AVHWFramesContext *ctx = opaque; @@ -83,6 +93,7 @@ fail: static int cuda_frames_init(AVHWFramesContext *ctx) { CUDAFramesContext *priv = ctx->internal->priv; + int aligned_width = next_pow2(ctx->width); int i; for (i = 0; i < FF_ARRAY_ELEMS(supported_formats); i++) { @@ -103,10 +114,10 @@ static int cuda_frames_init(AVHWFramesContext *ctx) switch (ctx->sw_format) { case AV_PIX_FMT_NV12: case AV_PIX_FMT_YUV420P: - size = ctx->width * ctx->height * 3 / 2; + size = aligned_width * ctx->height * 3 / 2; break; case AV_PIX_FMT_YUV444P: - size = ctx->width * ctx->height * 3; + size = aligned_width * ctx->height * 3; break; } @@ -120,6 +131,8 @@ static int cuda_frames_init(AVHWFramesContext *ctx) static int cuda_get_buffer(AVHWFramesContext *ctx, AVFrame *frame) { + int aligned_width = next_pow2(ctx->width); + frame->buf[0] = av_buffer_pool_get(ctx->pool); if (!frame->buf[0]) return AVERROR(ENOMEM); @@ -127,25 +140,25 @@ static int cuda_get_buffer(AVHWFramesContext *ctx, AVFrame *frame) switch (ctx->sw_format) { case AV_PIX_FMT_NV12: frame->data[0] = frame->buf[0]->data; - frame->data[1] = frame->data[0] + ctx->width * ctx->height; - frame->linesize[0] = ctx->width; - frame->linesize[1] = ctx->width; + frame->data[1] = frame->data[0] + aligned_width * ctx->height; + frame->linesize[0] = aligned_width; + frame->linesize[1] = aligned_width; break; case AV_PIX_FMT_YUV420P: frame->data[0] = frame->buf[0]->data; - frame->data[2] = frame->data[0] + ctx->width * ctx->height; - frame->data[1] = frame->data[2] + ctx->width * ctx->height / 4; - frame->linesize[0] = ctx->width; - frame->linesize[1] = ctx->width / 2; - frame->linesize[2] = ctx->width / 2; + frame->data[2] = frame->data[0] + aligned_width * ctx->height; + frame->data[1] = frame->data[2] + aligned_width * ctx->height / 4; + frame->linesize[0] = aligned_width; + frame->linesize[1] = aligned_width / 2; + frame->linesize[2] = aligned_width / 2; break; case AV_PIX_FMT_YUV444P: frame->data[0] = frame->buf[0]->data; - frame->data[1] = frame->data[0] + ctx->width * ctx->height; - frame->data[2] = frame->data[1] + ctx->width * ctx->height; - frame->linesize[0] = ctx->width; - frame->linesize[1] = ctx->width; - frame->linesize[2] = ctx->width; + frame->data[1] = frame->data[0] + aligned_width * ctx->height; + frame->data[2] = frame->data[1] + aligned_width * ctx->height; + frame->linesize[0] = aligned_width; + frame->linesize[1] = aligned_width; + frame->linesize[2] = aligned_width; break; default: av_frame_unref(frame); -- 2.10.0

4 10

[PATCH] libswscale/swscale_unscaled.c: UHD Resolution Performance Increase for Color Space Convertions / NVENC Related
by Ali KIZIL 03 Oct '16

03 Oct '16

Hello, This patch is done for performance increase on UHD or above resolution color space convertions. Some SDI sources provide yuv422p10 for 10bit source and uyvy422 for 8 bit source. To encode these sources with NVENC 10 bits, there is a need to convert these color spaces to P010. Before patch for UHD and above resolutions, convertion could not exceed ~25-30 fps, which can not be used for a 50 fps encoding. This patch fixes this problem. Also, color space convertion speed for 10bit YUV422P to 8bit YUV420P is having the same problem. If anybody wants to encode 10 bits source in 8 bits for UHD or above resolutions could not achive high frame rate ratio as well. This patch also fixes this problem. I think it will be good to apply this patch to avoid performance loss in high resolutions. Kind Regards,

4 10